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

Timestamp:

Apr 24, 2021, 7:45:02 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

fb0be05

Parents:

89eff25 (diff), 254ad1b (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) (2 diffs)

libcfa/src/concurrency/preemption.cfa

@@ -315 +315 @@
         // Enable interrupts by decrementing the counter
         // If counter reaches 0, execute any pending __cfactx_switch
-        void enable_interrupts( __cfaabi_dbg_ctx_param ) {
+        void enable_interrupts( bool poll ) {
                 // Cache the processor now since interrupts can start happening after the atomic store
                 processor   * proc = __cfaabi_tls.this_processor;
-                /* paranoid */ verify( proc );
+                /* paranoid */ verify( !poll || proc );
 
                 with( __cfaabi_tls.preemption_state ){
@@ -340 +340 @@
                                 // Signal the compiler that a fence is needed but only for signal handlers
                                 __atomic_signal_fence(__ATOMIC_RELEASE);
-                                if( proc->pending_preemption ) {
+                                if( poll && proc->pending_preemption ) {
                                         proc->pending_preemption = false;
                                         force_yield( __POLL_PREEMPTION );
                                 }
                         }
-                }
-
-                // For debugging purposes : keep track of the last person to enable the interrupts
-                __cfaabi_dbg_debug_do( proc->last_enable = caller; )
-        }
-
-        // Disable interrupts by incrementint the counter
-        // Don't execute any pending __cfactx_switch even if counter reaches 0
-        void enable_interrupts_noPoll() {
-                unsigned short prev = __cfaabi_tls.preemption_state.disable_count;
-                __cfaabi_tls.preemption_state.disable_count -= 1;
-                // If this triggers someone is enabled already enabled interrupts
-                /* paranoid */ verifyf( prev != 0u, "Incremented from %u\n", prev );
-                if( prev == 1 ) {
-                        #if GCC_VERSION > 50000
-                                static_assert(__atomic_always_lock_free(sizeof(__cfaabi_tls.preemption_state.enabled), &__cfaabi_tls.preemption_state.enabled), "Must be lock-free");
-                        #endif
-                        // Set enabled flag to true
-                        // should be atomic to avoid preemption in the middle of the operation.
-                        // use memory order RELAXED since there is no inter-thread on this variable requirements
-                        __atomic_store_n(&__cfaabi_tls.preemption_state.enabled, true, __ATOMIC_RELAXED);
-
-                        // Signal the compiler that a fence is needed but only for signal handlers
-                        __atomic_signal_fence(__ATOMIC_RELEASE);
                 }
         }