Changes in src/libcfa/concurrency/alarm.c [e60e0dc:8cb529e]

File:

• src/libcfa/concurrency/alarm.c (modified) (2 diffs)

src/libcfa/concurrency/alarm.c

@@ -153 +153 @@
 
 void register_self( alarm_node_t * this ) {
-        alarm_list_t * alarms = &event_kernel->alarms;
+        disable_interrupts();
+        verify( !systemProcessor->pending_alarm );
+        lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
+        {
+                verify( validate( &systemProcessor->alarms ) );
+                bool first = !systemProcessor->alarms.head;
 
-        disable_interrupts();
-        lock( &event_kernel->lock DEBUG_CTX2 );
-        {
-                verify( validate( alarms ) );
-                bool first = !alarms->head;
-
-                insert( alarms, this );
+                insert( &systemProcessor->alarms, this );
+                if( systemProcessor->pending_alarm ) {
+                        tick_preemption();
+                }
                 if( first ) {
-                        __kernel_set_timer( alarms->head->alarm - __kernel_get_time() );
+                        __kernel_set_timer( systemProcessor->alarms.head->alarm - __kernel_get_time() );
                 }
         }
-        unlock( &event_kernel->lock );
+        unlock( &systemProcessor->alarm_lock );
         this->set = true;
         enable_interrupts( DEBUG_CTX );
@@ -172 +174 @@
 
 void unregister_self( alarm_node_t * this ) {
+        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : unregister %p start\n", this );
         disable_interrupts();
-        lock( &event_kernel->lock DEBUG_CTX2 );
+        lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
         {
-                verify( validate( &event_kernel->alarms ) );
-                remove( &event_kernel->alarms, this );
+                verify( validate( &systemProcessor->alarms ) );
+                remove( &systemProcessor->alarms, this );
         }
-        unlock( &event_kernel->lock );
+        unlock( &systemProcessor->alarm_lock );
         enable_interrupts( DEBUG_CTX );
         this->set = false;
+        // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Kernel : unregister %p end\n", this );
 }