Changes in libcfa/src/concurrency/preemption.cfa [c1ee231:8e9e9a2]

File:

• libcfa/src/concurrency/preemption.cfa (modified) (9 diffs)

libcfa/src/concurrency/preemption.cfa

@@ -37 +37 @@
 // FwdDeclarations : timeout handlers
 static void preempt( processor   * this );
-static void timeout( $thread * this );
+static void timeout( struct __processor_id_t * id, $thread * this );
 
 // FwdDeclarations : Signal handlers
@@ -88 +88 @@
 
 // Tick one frame of the Discrete Event Simulation for alarms
-static void tick_preemption() {
+static void tick_preemption( struct __processor_id_t * id ) {
         alarm_node_t * node = 0p;                                                       // Used in the while loop but cannot be declared in the while condition
         alarm_list_t * alarms = &event_kernel->alarms;          // Local copy for ease of reading
@@ -106 +106 @@
                 }
                 else {
-                        timeout( node->thrd );
+                        timeout( id, node->thrd );
                 }
 
@@ -119 +119 @@
         // If there are still alarms pending, reset the timer
         if( & (*alarms)`first ) {
-                __cfaabi_dbg_print_buffer_decl( " KERNEL: @%ju(%ju) resetting alarm to %ju.\n", currtime.tv, __kernel_get_time().tv, (alarms->head->alarm - currtime).tv);
+                __cfadbg_print_buffer_decl(preemption, " KERNEL: @%ju(%ju) resetting alarm to %ju.\n", currtime.tv, __kernel_get_time().tv, (alarms->head->alarm - currtime).tv);
                 Duration delta = (*alarms)`first.alarm - currtime;
                 Duration capped = max(delta, 50`us);
@@ -186 +186 @@
         void enable_interrupts( __cfaabi_dbg_ctx_param ) {
                 processor   * proc = kernelTLS.this_processor; // Cache the processor now since interrupts can start happening after the atomic store
+                /* paranoid */ verify( proc );
 
                 with( kernelTLS.preemption_state ){
@@ -266 +267 @@
 
 // reserved for future use
-static void timeout( $thread * this ) {
-        __unpark( this __cfaabi_dbg_ctx2 );
+static void timeout( struct __processor_id_t * id, $thread * this ) {
+        #if !defined( __CFA_NO_STATISTICS__ )
+                kernelTLS.this_stats = this->curr_cluster->stats;
+        #endif
+        __unpark( id, this __cfaabi_dbg_ctx2 );
 }
 
@@ -403 +407 @@
 // Waits on SIGALRM and send SIGUSR1 to whom ever needs it
 static void * alarm_loop( __attribute__((unused)) void * args ) {
+        __processor_id_t id;
+        id.id = doregister(&id);
+
         // Block sigalrms to control when they arrive
         sigset_t mask;
@@ -447 +454 @@
                         // __cfaabi_dbg_print_safe( "Kernel : Preemption thread tick\n" );
                         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
-                        tick_preemption();
+                        tick_preemption( &id );
                         unlock( event_kernel->lock );
                         break;
@@ -460 +467 @@
 EXIT:
         __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
+        unregister(&id);
         return 0p;
 }