Changes in src/libcfa/concurrency/preemption.c [8cb529e:d6ff3ff]

File:

• src/libcfa/concurrency/preemption.c (modified) (4 diffs)

src/libcfa/concurrency/preemption.c

@@ -66 +66 @@
 
 void tick_preemption() {
+        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption\n" );
+
         alarm_list_t * alarms = &systemProcessor->alarms;
         __cfa_time_t currtime = __kernel_get_time();
-
-        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption @ %llu\n", currtime );
         while( alarms->head && alarms->head->alarm < currtime ) {
                 alarm_node_t * node = pop(alarms);
@@ -83 +83 @@
                 verify( validate( alarms ) );
 
-                __cfa_time_t period = node->period;
-                if( period > 0 ) {
-                        node->alarm = currtime + period;
-                        // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Reinsert %p @ %llu (%llu + %llu)\n", node, node->alarm, currtime, period );
+                if( node->period > 0 ) {
+                        node->alarm = currtime + node->period;
                         insert( alarms, node );
                 }
@@ -103 +101 @@
 
 void update_preemption( processor * this, __cfa_time_t duration ) {
-        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %llu\n", this, duration );
+        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %lu\n", this, duration );
 
         alarm_node_t * alarm = this->preemption_alarm;
@@ -275 +273 @@
                 siginfo_t info;
                 int sig = sigwaitinfo( &mask, &info );
-                assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int);
-
-                LIB_DEBUG_PRINT_SAFE("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
-                switch( info.si_code )
+                if( sig < 0 ) {
+                        abortf( "internal error, sigwait" );
+                }
+                else if( sig == SIGALRM )
                 {
-                case SI_TIMER:
-                case SI_KERNEL:
-                        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
-                        lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
-                        tick_preemption();
-                        unlock( &systemProcessor->alarm_lock );
-                        break;
-                case SI_QUEUE:
-                        goto EXIT;
-                }
-        }
-
-EXIT:
+                        LIB_DEBUG_PRINT_SAFE("Kernel : Caught signal %d (%d)\n", sig, info.si_value.sival_int );
+                        if( info.si_value.sival_int == 0 )
+                        {
+                                LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
+                                lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
+                                tick_preemption();
+                                unlock( &systemProcessor->alarm_lock );
+                        }
+                        else if( info.si_value.sival_int == 1 )
+                        {
+                                break;
+                        }
+                }
+                else
+                {
+                        LIB_DEBUG_PRINT_SAFE("Kernel : Unexpected signal %d (%d)\n", sig, info.si_value.sival_int);
+                }
+        }
+
         LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n");
         return NULL;