Changes in libcfa/src/concurrency/preemption.cfa [c457dc41:a3821fa]

File:

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

libcfa/src/concurrency/preemption.cfa

@@ -18 +18 @@
 
 #include "preemption.hfa"
-
 #include <assert.h>
 
@@ -27 +26 @@
 #include <limits.h>                                                                             // PTHREAD_STACK_MIN
 
-#include "bits/debug.hfa"
 #include "bits/signal.hfa"
 #include "kernel_private.hfa"
@@ -107 +105 @@
 static inline alarm_node_t * get_expired( alarm_list_t * alarms, Time currtime ) {
         if( ! & (*alarms)`first ) return 0p;                                            // If no alarms return null
-        if( (*alarms)`first.timeval >= currtime ) return 0p;    // If alarms head not expired return null
+        if( (*alarms)`first.alarm >= currtime ) return 0p;      // If alarms head not expired return null
         return pop(alarms);                                                                     // Otherwise just pop head
 }
@@ -143 +141 @@
                 if( period > 0 ) {
                         __cfadbg_print_buffer_local( preemption, " KERNEL: alarm period is %lu.\n", period`ns );
-                        node->timeval = currtime + period;  // Alarm is periodic, add currtime to it (used cached current time)
+                        node->alarm = currtime + period;    // Alarm is periodic, add currtime to it (used cached current time)
                         insert( alarms, node );             // Reinsert the node for the next time it triggers
                 }
@@ -150 +148 @@
         // If there are still alarms pending, reset the timer
         if( & (*alarms)`first ) {
-                Duration delta = (*alarms)`first.timeval - currtime;
-                __kernel_set_timer( delta );
+                Duration delta = (*alarms)`first.alarm - currtime;
+                Duration capped = max(delta, 50`us);
+                __kernel_set_timer( capped );
         }
 }
@@ -161 +160 @@
         // Alarms need to be enabled
         if ( duration > 0 && ! alarm->set ) {
-                alarm->initial = duration;
-                alarm->period  = duration;
+                alarm->alarm = __kernel_get_time() + duration;
+                alarm->period = duration;
                 register_self( alarm );
         }
@@ -168 +167 @@
         else if ( duration == 0 && alarm->set ) {
                 unregister_self( alarm );
-                alarm->initial = 0;
-                alarm->period  = 0;
+                alarm->alarm = 0;
+                alarm->period = 0;
         }
         // If alarm is different from previous, change it
         else if ( duration > 0 && alarm->period != duration ) {
                 unregister_self( alarm );
-                alarm->initial = duration;
-                alarm->period  = duration;
+                alarm->alarm = __kernel_get_time() + duration;
+                alarm->period = duration;
                 register_self( alarm );
         }
@@ -600 +599 @@
 
         // Notify the alarm thread of the shutdown
-        sigval val;
-        val.sival_int = 0;
+        sigval val = { 1 };
         pthread_sigqueue( alarm_thread, SIGALRM, val );
 
@@ -621 +619 @@
 // Used by thread to control when they want to receive preemption signals
 void ?{}( preemption_scope & this, processor * proc ) {
-        (this.alarm){ proc, 0`s, 0`s };
+        (this.alarm){ proc, (Time){ 0 }, 0`s };
         this.proc = proc;
         this.proc->preemption_alarm = &this.alarm;
@@ -689 +687 @@
 // Waits on SIGALRM and send SIGUSR1 to whom ever needs it
 static void * alarm_loop( __attribute__((unused)) void * args ) {
-        unsigned id = register_proc_id();
+        __processor_id_t id;
+        register_proc_id(&id);
+        __cfaabi_tls.this_proc_id = &id;
+
 
         // Block sigalrms to control when they arrive
@@ -706 +707 @@
                 siginfo_t info;
                 int sig = sigwaitinfo( &mask, &info );
-
-                __cfadbg_print_buffer_decl ( preemption, " KERNEL: sigwaitinfo returned %d, c: %d, v: %d\n", sig, info.si_code, info.si_value.sival_int );
-                __cfadbg_print_buffer_local( preemption, " KERNEL: SI_QUEUE %d, SI_TIMER %d, SI_KERNEL %d\n", SI_QUEUE, SI_TIMER, SI_KERNEL );
 
                 if( sig < 0 ) {
@@ -716 +714 @@
                                 case EAGAIN :
                                 case EINTR :
-                                        {__cfadbg_print_buffer_local( preemption, " KERNEL: Spurious wakeup %d.\n", err );}
+                                        {__cfaabi_dbg_print_buffer_decl( " KERNEL: Spurious wakeup %d.\n", err );}
                                         continue;
                                 case EINVAL :
@@ -728 +726 @@
                 assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int);
 
+                // __cfaabi_dbg_print_safe( "Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
                 // Switch on the code (a.k.a. the sender) to
                 switch( info.si_code )
                 {
-                // Signal was not sent by the kernel but by an other thread
-                case SI_QUEUE:
-                        // other threads may signal the alarm thread to shut it down
-                        // or to manual cause the preemption tick
-                        // use info.si_value and handle the case here
-                        switch( info.si_value.sival_int ) {
-                        case 0:
-                                goto EXIT;
-                        default:
-                                abort( "SI_QUEUE with val %d", info.si_value.sival_int);
-                        }
-                        // fallthrough
                 // Timers can apparently be marked as sent for the kernel
                 // In either case, tick preemption
@@ -752 +739 @@
                         unlock( event_kernel->lock );
                         break;
+                // Signal was not sent by the kernel but by an other thread
+                case SI_QUEUE:
+                        // For now, other thread only signal the alarm thread to shut it down
+                        // If this needs to change use info.si_value and handle the case here
+                        goto EXIT;
                 }
         }
@@ -757 +749 @@
 EXIT:
         __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
-        unregister_proc_id(id);
+        register_proc_id(&id);
 
         return 0p;