Changeset cef7430 for libcfa/src/concurrency/stats.cfa

Timestamp:

Jan 28, 2022, 2:50:51 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

3e5db5b4

Parents:

6b2d444 (diff), e21f253 (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

File:

• libcfa/src/concurrency/stats.cfa (modified) (3 diffs)

libcfa/src/concurrency/stats.cfa

@@ -45 +45 @@
                         stats->io.submit.slow       = 0;
                         stats->io.flush.external    = 0;
+                        stats->io.flush.dirty       = 0;
+                        stats->io.flush.full        = 0;
+                        stats->io.flush.idle        = 0;
+                        stats->io.flush.eager       = 0;
                         stats->io.calls.flush       = 0;
                         stats->io.calls.submitted   = 0;
@@ -107 +111 @@
                         tally_one( &cltr->io.submit.slow      , &proc->io.submit.slow       );
                         tally_one( &cltr->io.flush.external   , &proc->io.flush.external    );
+                        tally_one( &cltr->io.flush.dirty      , &proc->io.flush.dirty       );
+                        tally_one( &cltr->io.flush.full       , &proc->io.flush.full        );
+                        tally_one( &cltr->io.flush.idle       , &proc->io.flush.idle        );
+                        tally_one( &cltr->io.flush.eager      , &proc->io.flush.eager       );
                         tally_one( &cltr->io.calls.flush      , &proc->io.calls.flush       );
                         tally_one( &cltr->io.calls.submitted  , &proc->io.calls.submitted   );
@@ -184 +192 @@
                                 if(io.alloc.fail || io.alloc.revoke || io.alloc.block)
                                         sstr | "-     failures      : " | eng3(io.alloc.fail) | "oom, " | eng3(io.alloc.revoke) | "rvk, " | eng3(io.alloc.block) | "blk";
-                                if(io.flush.external)
-                                        sstr | "- flush external    : " | eng3(io.flush.external);
+                                // if(io.flush.external)
+                                //      sstr | "- flush external    : " | eng3(io.flush.external);
 
                                 double avgsubs = ((double)io.calls.submitted) / io.calls.flush;
                                 double avgcomp = ((double)io.calls.completed) / io.calls.drain;
                                 sstr | "- syscll : "
-                                     |   " sub " | eng3(io.calls.flush) | "/" | eng3(io.calls.submitted) | "(" | ws(3, 3, avgsubs) | "/flush)"
-                                     | " - cmp " | eng3(io.calls.drain) | "/" | eng3(io.calls.completed) | "(" | ws(3, 3, avgcomp) | "/drain)"
+                                     |   " sub " | eng3(io.calls.submitted) | "/" | eng3(io.calls.flush) | "(" | ws(3, 3, avgsubs) | "/flush)"
+                                     | " - cmp " | eng3(io.calls.completed) | "/" | eng3(io.calls.drain) | "(" | ws(3, 3, avgcomp) | "/drain)"
                                      | " - " | 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 | "- ops blk: "
                                      |   " sk rd: " | eng3(io.ops.sockread)  | "epll: " | eng3(io.ops.epllread)