Changes in / [f5bace8:8631c84]

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (2 diffs)
• kernel.cfa (modified) (2 diffs)
• kernel/fwd.hfa (modified) (1 diff)
• stats.cfa (modified) (3 diffs)
• stats.hfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -111 +111 @@
                 // Drain the queue
                 if(!__atomic_try_acquire(&ctx->cq.lock)) {
-                        __STATS__( false, io.calls.locked++; )
                         return false;
                 }
@@ -192 +191 @@
                                         if(age > cutoff) {
                                                 remote = __cfa_do_drain( io.data[target], cltr );
-                                                if(remote) __STATS__( false, io.calls.helped++; )
                                         }
                                 }

libcfa/src/concurrency/kernel.cfa

@@ -684 +684 @@
 
 static void idle_sleep(processor * this, io_future_t & future, iovec & iov) {
-        /* paranoid */ verify( this->idle_wctx.evfd != 1 );
-        /* paranoid */ verify( this->idle_wctx.evfd != 2 );
-
         // Tell everyone we are ready to go do sleep
         for() {
@@ -904 +901 @@
         void print_stats_now( cluster & this, int flags ) {
                 crawl_cluster_stats( this );
-                __print_stats( this.stats, flags, "Cluster", this.name, (void*)&this );
+                __print_stats( this.stats, this.print_stats, "Cluster", this.name, (void*)&this );
         }
 #endif

libcfa/src/concurrency/kernel/fwd.hfa

@@ -248 +248 @@
                         // check if the future is available
                         bool available( future_t & this ) {
-                                while( this.ptr == 2p ) Pause();
                                 return this.ptr == 1p;
                         }

libcfa/src/concurrency/stats.cfa

@@ -55 +55 @@
                         stats->io.calls.drain       = 0;
                         stats->io.calls.completed   = 0;
-                        stats->io.calls.locked      = 0;
-                        stats->io.calls.helped      = 0;
                         stats->io.calls.errors.busy = 0;
                         stats->io.ops.sockread      = 0;
@@ -125 +123 @@
                         tally_one( &cltr->io.calls.drain      , &proc->io.calls.drain       );
                         tally_one( &cltr->io.calls.completed  , &proc->io.calls.completed   );
-                        tally_one( &cltr->io.calls.locked     , &proc->io.calls.locked      );
-                        tally_one( &cltr->io.calls.helped     , &proc->io.calls.helped      );
                         tally_one( &cltr->io.calls.errors.busy, &proc->io.calls.errors.busy );
                         tally_one( &cltr->io.ops.sockread     , &proc->io.ops.sockread      );
@@ -209 +205 @@
                                      |   " 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)"
-                                     | " - 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";

libcfa/src/concurrency/stats.hfa

@@ -103 +103 @@
                                 volatile uint64_t drain;
                                 volatile uint64_t completed;
-                                volatile uint64_t locked;
-                                volatile uint64_t helped;
                                 volatile uint64_t flush;
                                 volatile uint64_t submitted;