Changes in libcfa/src/concurrency/kernel.cfa [34b2796:57f70ab]

File:

• libcfa/src/concurrency/kernel.cfa (modified) (12 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -171 +171 @@
                 preemption_scope scope = { this };
 
-                __STATS( unsigned long long last_tally = rdtscl(); )
-
                 // if we need to run some special setup, now is the time to do it.
                 if(this->init.thrd) {
@@ -184 +182 @@
                 MAIN_LOOP:
                 for() {
-                        #if 1
+                        #define OLD_MAIN 1
+                        #if OLD_MAIN
                         // Check if there is pending io
                         __maybe_io_drain( this );
@@ -259 +258 @@
                         if( __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST) ) break MAIN_LOOP;
 
-                        #if !defined(__CFA_NO_STATISTICS__)
-                                unsigned long long curr = rdtscl();
-                                if(curr > (last_tally + 500000000)) {
-                                        __tally_stats(this->cltr->stats, __cfaabi_tls.this_stats);
-                                        last_tally = curr;
-                                }
-                        #endif
-
                         if(this->io.pending && !this->io.dirty) {
                                 __cfa_io_flush( this );
@@ -272 +263 @@
 
                         #else
-
+                                #warning new kernel loop
                         SEARCH: {
                                 /* paranoid */ verify( ! __preemption_enabled() );
-                                /* paranoid */ verify( kernelTLS().this_proc_id );
 
                                 // First, lock the scheduler since we are searching for a thread
@@ -288 +278 @@
 
                                 // Spin a little on I/O, just in case
-                                for(25) {
+                                        for(5) {
                                         __maybe_io_drain( this );
                                         readyThread = pop_fast( this->cltr );
@@ -295 +285 @@
 
                                 // no luck, try stealing a few times
-                                for(25) {
+                                        for(5) {
                                         if( __maybe_io_drain( this ) ) {
                                                 readyThread = pop_fast( this->cltr );
@@ -333 +323 @@
                                 }
 
-                                __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->id, rdtscl()); )
+                                        __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->unique_id, rdtscl()); )
                                 __cfadbg_print_safe(runtime_core, "Kernel : core %p waiting on eventfd %d\n", this, this->idle);
 
@@ -341 +331 @@
                                 // __enable_interrupts_hard();
 
-                                __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 1\n", this->id, rdtscl()); )
+                                        __STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 1\n", this->unique_id, rdtscl()); )
 
                                 // We were woken up, remove self from idle
@@ -351 +341 @@
 
                 RUN_THREAD:
-                        /* paranoid */ verify( kernelTLS().this_proc_id );
                         /* paranoid */ verify( ! __preemption_enabled() );
                         /* paranoid */ verify( readyThread );
@@ -363 +352 @@
                         // Are we done?
                         if( __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST) ) break MAIN_LOOP;
-
-                        #if !defined(__CFA_NO_STATISTICS__)
-                                unsigned long long curr = rdtscl();
-                                if(curr > (last_tally + 500000000)) {
-                                        __tally_stats(this->cltr->stats, __cfaabi_tls.this_stats);
-                                        last_tally = curr;
-                                }
-                        #endif
 
                         if(this->io.pending && !this->io.dirty) {
@@ -887 +868 @@
                 unsigned tail = *ctx->cq.tail;
                 if(head == tail) return false;
+                #if OLD_MAIN
                 ready_schedule_lock();
                 ret = __cfa_io_drain( proc );
                 ready_schedule_unlock();
+                #else
+                        ret = __cfa_io_drain( proc );
+        #endif
         #endif
         return ret;
@@ -918 +903 @@
         }
 
+        static void crawl_list( cluster * cltr, dlist(processor, processor) & list, unsigned count ) {
+                /* paranoid */ verify( cltr->stats );
+
+                processor * it = &list`first;
+                for(unsigned i = 0; i < count; i++) {
+                        /* paranoid */ verifyf( it, "Unexpected null iterator, at index %u of %u\n", i, count);
+                        /* paranoid */ verify( it->local_data->this_stats );
+                        __tally_stats( cltr->stats, it->local_data->this_stats );
+                        it = &(*it)`next;
+                }
+        }
+
+        void crawl_cluster_stats( cluster & this ) {
+                // Stop the world, otherwise stats could get really messed-up
+                // this doesn't solve all problems but does solve many
+                // so it's probably good enough
+                uint_fast32_t last_size = ready_mutate_lock();
+
+                        crawl_list(&this, this.procs.actives, this.procs.total - this.procs.idle);
+                        crawl_list(&this, this.procs.idles  , this.procs.idle );
+
+                // Unlock the RWlock
+                ready_mutate_unlock( last_size );
+        }
+
+
         void print_stats_now( cluster & this, int flags ) {
+                crawl_cluster_stats( this );
                 __print_stats( this.stats, this.print_stats, "Cluster", this.name, (void*)&this );
         }