Changeset 22f94a4 for libcfa/src/concurrency/preemption.cfa

Timestamp:

Aug 11, 2020, 4:40:15 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0d070ca

Parents:

07d867b (diff), 129674b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into new-ast

File:

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

libcfa/src/concurrency/preemption.cfa

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  5 16:34:05 2019
-// Update Count     : 43
+// Last Modified On : Wed Jun 17 11:36:25 2020
+// Update Count     : 46
 //
 
@@ -19 +19 @@
 #include <assert.h>
 
-extern "C" {
 #include <errno.h>
 #include <stdio.h>
@@ -25 +24 @@
 #include <unistd.h>
 #include <limits.h>                                                                             // PTHREAD_STACK_MIN
-}
 
 #include "bits/signal.hfa"
+#include "kernel_private.hfa"
 
 #if !defined(__CFA_DEFAULT_PREEMPTION__)
@@ -39 +38 @@
 // 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
@@ -90 +89 @@
 
 // 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
@@ -108 +107 @@
                 }
                 else {
-                        timeout( node->thrd );
+                        timeout( id, node->thrd );
                 }
 
@@ -121 +120 @@
         // 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);
@@ -188 +187 @@
         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 ){
@@ -268 +268 @@
 
 // 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 );
 }
 
@@ -291 +294 @@
 // Startup routine to activate preemption
 // Called from kernel_startup
-void kernel_start_preemption() {
+void __kernel_alarm_startup() {
         __cfaabi_dbg_print_safe( "Kernel : Starting preemption\n" );
 
@@ -313 +316 @@
 // Shutdown routine to deactivate preemption
 // Called from kernel_shutdown
-void kernel_stop_preemption() {
+void __kernel_alarm_shutdown() {
         __cfaabi_dbg_print_safe( "Kernel : Preemption stopping\n" );
 
@@ -405 +408 @@
 // 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;
@@ -449 +455 @@
                         // __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;
@@ -462 +468 @@
 EXIT:
         __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
+        unregister(&id);
         return 0p;
 }
@@ -475 +482 @@
         sigset_t oldset;
         int ret;
-        ret = pthread_sigmask(0, 0p, &oldset);
+        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
         if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }