Changeset 5cb51502

Timestamp:

Apr 5, 2021, 3:18:12 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b0904bf

Parents:

c9ec301

Message:

Fix stats so they are correctly tallied when called from outside the cluster.

Location:

libcfa/src/concurrency

Files:

• kernel.cfa (modified) (3 diffs)
• kernel.hfa (modified) (1 diff)
• kernel/startup.cfa (modified) (1 diff)
• ready_queue.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -490 +490 @@
                         {
                                 /* paranoid */ verify( publicTLS_get(this_proc_id) );
-                                bool full = publicTLS_get(this_proc_id)->full_proc;
-                                if(full) disable_interrupts();
+                                disable_interrupts();
 
                                 /* paranoid */ verify( ! __preemption_enabled() );
@@ -500 +499 @@
                                 /* paranoid */ verify( ! __preemption_enabled() );
 
-                                if(full) enable_interrupts( __cfaabi_dbg_ctx );
+                                enable_interrupts_noPoll();
                                 /* paranoid */ verify( publicTLS_get(this_proc_id) );
                         }
@@ -609 +608 @@
 
         #if !defined(__CFA_NO_STATISTICS__)
-                __tls_stats()->ready.sleep.wakes++;
+                if( kernelTLS().this_stats ) {
+                        __tls_stats()->ready.sleep.wakes++;
+                }
+                else {
+                        __atomic_fetch_add(&this->stats->ready.sleep.wakes, 1, __ATOMIC_RELAXED);
+                }
         #endif
 

libcfa/src/concurrency/kernel.hfa

@@ -51 +51 @@
 struct __processor_id_t {
         unsigned id:24;
-        bool full_proc:1;
 
         #if !defined(__CFA_NO_STATISTICS__)

libcfa/src/concurrency/kernel/startup.cfa

@@ -455 +455 @@
         this.name = name;
         this.cltr = &_cltr;
-        full_proc = true;
         do_terminate = false;
         preemption_alarm = 0p;

libcfa/src/concurrency/ready_queue.cfa

@@ -245 +245 @@
         __cfadbg_print_safe(ready_queue, "Kernel : Pushing %p on cluster %p\n", thrd, cltr);
 
-        #if !defined(__CFA_NO_STATISTICS__)
-                const bool external = (!kernelTLS().this_proc_id->full_proc) || (cltr != kernelTLS().this_processor->cltr);
-        #endif
+        const bool external = (!kernelTLS().this_processor) || (cltr != kernelTLS().this_processor->cltr);
 
         // write timestamp
@@ -258 +256 @@
                 preferred =
                         //*
-                        kernelTLS().this_processor ? kernelTLS().this_processor->cltr_id : -1;
+                        external ? -1 : kernelTLS().this_processor->cltr_id;
                         /*/
                         thrd->link.preferred * 4;