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

Timestamp:

Dec 6, 2019, 3:14:03 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

e1990f1

Parents:

c8c0c7c5 (diff), baf608a (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/preemption.cfa (modified) (4 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 : Sun Dec  1 22:22:56 2019
-// Update Count     : 41
+// Last Modified On : Thu Dec  5 16:34:05 2019
+// Update Count     : 43
 //
 
@@ -65 +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 ) {
@@ -306 +307 @@
         signal_block( SIGALRM );
 
-        kernelTLS.preemption_state.stack = create_pthread( &alarm_thread, alarm_loop, 0p );
+        alarm_stack = create_pthread( &alarm_thread, alarm_loop, 0p );
 }
 
@@ -326 +327 @@
 
         pthread_join( alarm_thread, 0p );
-        free( kernelTLS.preemption_state.stack );
+        free( alarm_stack );
 
         // Preemption is now fully stopped