Changes in libcfa/src/concurrency/preemption.cfa [4b30e8cc:e873838]

File:

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

libcfa/src/concurrency/preemption.cfa

@@ -38 +38 @@
 // FwdDeclarations : timeout handlers
 static void preempt( processor   * this );
-static void timeout( struct __processor_id_t * id, $thread * this );
+static void timeout( $thread * this );
 
 // FwdDeclarations : Signal handlers
@@ -91 +91 @@
 
 // Tick one frame of the Discrete Event Simulation for alarms
-static void tick_preemption( struct __processor_id_t * id ) {
+static void tick_preemption(void) {
         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
@@ -105 +105 @@
 
                 // Check if this is a kernel
-                if( node->type == Kernel ) {
+                if( node->kernel_alarm ) {
                         preempt( node->proc );
                 }
-                else if( node->type == User ) {
-                        timeout( id, node->thrd );
-                }
                 else {
-                        bool unpark_thd = node->callback(*node);
-                        if (unpark_thd) timeout( id, node->thrd );
+                        timeout( node->thrd );
                 }
 
@@ -274 +270 @@
 
 // reserved for future use
-static void timeout( struct __processor_id_t * id, $thread * this ) {
+static void timeout( $thread * this ) {
         #if !defined( __CFA_NO_STATISTICS__ )
                 kernelTLS.this_stats = this->curr_cluster->stats;
         #endif
-        __unpark( id, this );
+        unpark( this );
 }
 
@@ -417 +413 @@
         id.full_proc = false;
         id.id = doregister(&id);
+        kernelTLS.this_proc_id = &id;
 
         // Block sigalrms to control when they arrive
@@ -462 +459 @@
                         // __cfaabi_dbg_print_safe( "Kernel : Preemption thread tick\n" );
                         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
-                        tick_preemption( &id );
+                        tick_preemption();
                         unlock( event_kernel->lock );
                         break;