Changeset 8464edf

Timestamp:

May 5, 2021, 4:53:25 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

938885d3

Parents:

45b9b21

Message:

'print_stats_now' now pulls stats from processors.

File:

• libcfa/src/concurrency/kernel.cfa (modified) (3 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) {
@@ -258 +256 @@
                         // 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) {
@@ -918 +908 @@
         }
 
+        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 );
         }