Changeset f80f840 for libcfa/src/concurrency/preemption.cfa

Timestamp:

Dec 10, 2019, 4:24:49 PM (4 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:

2a3d446

Parents:

b798713 (diff), e307e12 (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 relaxed_ready

File:

• libcfa/src/concurrency/preemption.cfa (modified) (14 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 : Tue Jun  5 17:35:49 2018
-// Update Count     : 37
+// Last Modified On : Thu Dec  5 16:34:05 2019
+// Update Count     : 43
 //
 
@@ -24 +24 @@
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>                                                                             // PTHREAD_STACK_MIN
 }
 
@@ -64 +65 @@
 event_kernel_t * event_kernel;                        // kernel public handle to even kernel
 static pthread_t alarm_thread;                        // pthread handle to alarm thread
+static void * alarm_stack;                                                        // pthread stack for alarm thread
 
 static void ?{}(event_kernel_t & this) with( this ) {
@@ -81 +83 @@
 // Get next expired node
 static inline alarm_node_t * get_expired( alarm_list_t * alarms, Time currtime ) {
-        if( !alarms->head ) return NULL;                          // If no alarms return null
-        if( alarms->head->alarm >= currtime ) return NULL;        // If alarms head not expired return null
-        return pop(alarms);                                       // Otherwise just pop head
+        if( !alarms->head ) return 0p;                                          // If no alarms return null
+        if( alarms->head->alarm >= currtime ) return 0p;        // If alarms head not expired return null
+        return pop(alarms);                                                                     // Otherwise just pop head
 }
 
 // Tick one frame of the Discrete Event Simulation for alarms
 static void tick_preemption() {
-        alarm_node_t * node = NULL;                     // 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
-        Time currtime = __kernel_get_time();                    // Check current time once so we everything "happens at once"
+        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
+        Time currtime = __kernel_get_time();                            // Check current time once so everything "happens at once"
 
         //Loop throught every thing expired
@@ -243 +245 @@
         sigaddset( &mask, sig );
 
-        if ( pthread_sigmask( SIG_UNBLOCK, &mask, NULL ) == -1 ) {
+        if ( pthread_sigmask( SIG_UNBLOCK, &mask, 0p ) == -1 ) {
             abort( "internal error, pthread_sigmask" );
         }
@@ -254 +256 @@
         sigaddset( &mask, sig );
 
-        if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
+        if ( pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
             abort( "internal error, pthread_sigmask" );
         }
@@ -301 +303 @@
 
         // Setup proper signal handlers
-        __cfaabi_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO | SA_RESTART );         // CtxSwitch handler
+        __cfaabi_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO | SA_RESTART ); // CtxSwitch handler
 
         signal_block( SIGALRM );
 
-        pthread_create( &alarm_thread, NULL, alarm_loop, NULL );
+        alarm_stack = create_pthread( &alarm_thread, alarm_loop, 0p );
 }
 
@@ -316 +318 @@
         sigset_t mask;
         sigfillset( &mask );
-        sigprocmask( SIG_BLOCK, &mask, NULL );
+        sigprocmask( SIG_BLOCK, &mask, 0p );
 
         // Notify the alarm thread of the shutdown
@@ -323 +325 @@
 
         // Wait for the preemption thread to finish
-        pthread_join( alarm_thread, NULL );
+
+        pthread_join( alarm_thread, 0p );
+        free( alarm_stack );
 
         // Preemption is now fully stopped
@@ -380 +384 @@
         static_assert( sizeof( sigset_t ) == sizeof( cxt->uc_sigmask ), "Expected cxt->uc_sigmask to be of sigset_t" );
         #endif
-        if ( pthread_sigmask( SIG_SETMASK, (sigset_t *)&(cxt->uc_sigmask), NULL ) == -1 ) {
+        if ( pthread_sigmask( SIG_SETMASK, (sigset_t *)&(cxt->uc_sigmask), 0p ) == -1 ) {
                 abort( "internal error, sigprocmask" );
         }
@@ -399 +403 @@
         sigset_t mask;
         sigfillset(&mask);
-        if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
+        if ( pthread_sigmask( SIG_BLOCK, &mask, 0p ) == -1 ) {
             abort( "internal error, pthread_sigmask" );
         }
@@ -420 +424 @@
                                         {__cfaabi_dbg_print_buffer_decl( " KERNEL: Spurious wakeup %d.\n", err );}
                                         continue;
-                        case EINVAL :
+                                case EINVAL :
                                         abort( "Timeout was invalid." );
                                 default:
@@ -453 +457 @@
 EXIT:
         __cfaabi_dbg_print_safe( "Kernel : Preemption thread stopping\n" );
-        return NULL;
+        return 0p;
 }
 
@@ -466 +470 @@
         sigset_t oldset;
         int ret;
-        ret = pthread_sigmask(0, NULL, &oldset);
+        ret = pthread_sigmask(0, 0p, &oldset);
         if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }