Changeset b10affd for src/libcfa/concurrency/preemption.c

Timestamp:

Mar 30, 2018, 7:21:28 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

273cde6

Parents:

fae90d5

Message:

thread-local storage converted to structure and thread-local macros for access

File:

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

src/libcfa/concurrency/preemption.c

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 27 11:28:51 2018
-// Update Count     : 24
+// Last Modified On : Fri Mar 30 17:27:43 2018
+// Update Count     : 31
 //
 
@@ -150 +150 @@
         // Disable interrupts by incrementing the counter
         void disable_interrupts() {
-                preemption_state.enabled = false;
-                __attribute__((unused)) unsigned short new_val = preemption_state.disable_count + 1;
-                preemption_state.disable_count = new_val;
+                TL_GET( preemption_state ).enabled = false;
+                __attribute__((unused)) unsigned short new_val = TL_GET( preemption_state ).disable_count + 1;
+                TL_GET( preemption_state ).disable_count = new_val;
                 verify( new_val < 65_000u );              // If this triggers someone is disabling interrupts without enabling them
         }
@@ -159 +159 @@
         // If counter reaches 0, execute any pending CtxSwitch
         void enable_interrupts( __cfaabi_dbg_ctx_param ) {
-                processor   * proc = this_processor;      // Cache the processor now since interrupts can start happening after the atomic add
-                thread_desc * thrd = this_thread;         // Cache the thread now since interrupts can start happening after the atomic add
-
-                unsigned short prev = preemption_state.disable_count;
-                preemption_state.disable_count -= 1;
+                processor   * proc = TL_GET( this_processor ); // Cache the processor now since interrupts can start happening after the atomic add
+                thread_desc * thrd = TL_GET( this_thread );       // Cache the thread now since interrupts can start happening after the atomic add
+
+                unsigned short prev = TL_GET( preemption_state ).disable_count;
+                TL_GET( preemption_state ).disable_count -= 1;
                 verify( prev != 0u );                     // If this triggers someone is enabled already enabled interruptsverify( prev != 0u );
 
                 // Check if we need to prempt the thread because an interrupt was missed
                 if( prev == 1 ) {
-                        preemption_state.enabled = true;
+                        TL_GET( preemption_state ).enabled = true;
                         if( proc->pending_preemption ) {
                                 proc->pending_preemption = false;
@@ -182 +182 @@
         // Don't execute any pending CtxSwitch even if counter reaches 0
         void enable_interrupts_noPoll() {
-                unsigned short prev = preemption_state.disable_count;
-                preemption_state.disable_count -= 1;
+                unsigned short prev = TL_GET( preemption_state ).disable_count;
+                TL_GET( preemption_state ).disable_count -= 1;
                 verifyf( prev != 0u, "Incremented from %u\n", prev );                     // If this triggers someone is enabled already enabled interrupts
                 if( prev == 1 ) {
-                        preemption_state.enabled = true;
+                        TL_GET( preemption_state ).enabled = true;
                 }
         }
@@ -236 +236 @@
 // If false : preemption is unsafe and marked as pending
 static inline bool preemption_ready() {
-        bool ready = preemption_state.enabled && !preemption_state.in_progress; // Check if preemption is safe
-        this_processor->pending_preemption = !ready;                        // Adjust the pending flag accordingly
+        bool ready = TL_GET( preemption_state ).enabled && !TL_GET( preemption_state ).in_progress; // Check if preemption is safe
+        TL_GET( this_processor )->pending_preemption = !ready;                  // Adjust the pending flag accordingly
         return ready;
 }
@@ -251 +251 @@
 
         // Start with preemption disabled until ready
-        preemption_state.enabled = false;
-        preemption_state.disable_count = 1;
+        TL_GET( preemption_state ).enabled = false;
+        TL_GET( preemption_state ).disable_count = 1;
 
         // Initialize the event kernel
@@ -317 +317 @@
         // before the kernel thread has even started running. When that happens an iterrupt
         // we a null 'this_processor' will be caught, just ignore it.
-        if(!this_processor) return;
+        if(!TL_GET( this_processor )) return;
 
         choose(sfp->si_value.sival_int) {
                 case PREEMPT_NORMAL   : ;// Normal case, nothing to do here
-                case PREEMPT_TERMINATE: verify(this_processor->do_terminate);
+                case PREEMPT_TERMINATE: verify(TL_GET( this_processor )->do_terminate);
                 default:
                         abort( "internal error, signal value is %d", sfp->si_value.sival_int );
@@ -331 +331 @@
         __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
 
-        preemption_state.in_progress = true;                      // Sync flag : prevent recursive calls to the signal handler
+        TL_GET( preemption_state ).in_progress = true;  // Sync flag : prevent recursive calls to the signal handler
         signal_unblock( SIGUSR1 );                          // We are about to CtxSwitch out of the signal handler, let other handlers in
-        preemption_state.in_progress = false;                     // Clear the in progress flag
+        TL_GET( preemption_state ).in_progress = false; // Clear the in progress flag
 
         // Preemption can occur here
 
-        BlockInternal( (thread_desc*)this_thread );         // Do the actual CtxSwitch
+        BlockInternal( (thread_desc*)TL_GET( this_thread ) ); // Do the actual CtxSwitch
 }