Changeset 70cd431 for libcfa/src

Timestamp:

Dec 9, 2022, 5:11:38 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

3e5eeaf

Parents:

261e107 (diff), 74227c6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency

Files:

• stats.cfa (modified) (4 diffs)
• stats.hfa (modified) (1 diff)

libcfa/src/concurrency/stats.cfa

@@ -48 +48 @@
                         stats->io.submit.eagr       = 0;
                         stats->io.submit.nblk       = 0;
+                        stats->io.submit.extr       = 0;
                         stats->io.flush.external    = 0;
+                        stats->io.flush.signal      = 0;
                         stats->io.flush.dirty       = 0;
                         stats->io.flush.full        = 0;
@@ -120 +122 @@
                         tally_one( &cltr->io.submit.eagr      , &proc->io.submit.eagr       );
                         tally_one( &cltr->io.submit.nblk      , &proc->io.submit.nblk       );
+                        tally_one( &cltr->io.submit.extr      , &proc->io.submit.extr       );
                         tally_one( &cltr->io.flush.external   , &proc->io.flush.external    );
+                        tally_one( &cltr->io.flush.signal     , &proc->io.flush.signal      );
                         tally_one( &cltr->io.flush.dirty      , &proc->io.flush.dirty       );
                         tally_one( &cltr->io.flush.full       , &proc->io.flush.full        );
@@ -199 +203 @@
                                 if(io.alloc.slow) {
                                         double avgfasts = (100.0 * (double)io.submit.fast) / total_submits;
-                                        sstr | "fast," | eng3(io.submit.slow) | "slow (" | ws(3, 3, avgfasts) | "%)" | nonl;
+                                        sstr | "fast," | eng3(io.submit.slow) | "slow (" | ws(3, 3, avgfasts) | "%)," | eng3(io.submit.extr) | "external" | nonl;
                                 }
                                 sstr | " - eager" | eng3(io.submit.eagr) | nonl;
@@ -217 +221 @@
                                      | " - cmp " | eng3(io.calls.locked) | "locked, " | eng3(io.calls.helped) | "helped"
                                      | " - " | eng3(io.calls.errors.busy) | " EBUSY";
-                                sstr | " - sub: " | eng3(io.flush.full) | "full, " | eng3(io.flush.dirty) | "drty, " | eng3(io.flush.idle) | "idle, " | eng3(io.flush.eager) | "eagr, " | eng3(io.flush.external) | "ext";
+                                sstr | " - sub: " | eng3(io.flush.full) | "full, " | eng3(io.flush.dirty) | "drty, " | eng3(io.flush.idle) | "idle, " | eng3(io.flush.eager) | "eagr, " | eng3(io.flush.external) | '/' | eng3(io.flush.signal) | "ext";
                                 sstr | "- ops blk: "
                                      |   " sk rd: " | eng3(io.ops.sockread)  | "epll: " | eng3(io.ops.epllread)

libcfa/src/concurrency/stats.hfa

@@ -94 +94 @@
                                 volatile uint64_t eagr;
                                 volatile uint64_t nblk;
+                                volatile uint64_t extr;
                         } submit;
                         struct {
                                 volatile uint64_t external;
+                                volatile uint64_t signal;
                                 volatile uint64_t dirty;
                                 volatile uint64_t full;