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

Timestamp:

Jun 7, 2018, 1:29:41 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:

08b5a7e

Parents:

8551b859 (diff), a43c561 (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 plg2:software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/preemption.c

@@ -265 +265 @@
 // kill wrapper : signal a processor
 void terminate(processor * this) {
-        this->do_terminate = true;
-        wake(this);
+        disable_interrupts();
+        __atomic_store_n(&this->do_terminate, true, __ATOMIC_SEQ_CST);
+        wake( this );
         sigval_t value = { PREEMPT_TERMINATE };
+        enable_interrupts( __cfaabi_dbg_ctx );
         pthread_sigqueue( this->kernel_thread, SIGUSR1, value );
 }
@@ -369 +371 @@
         choose(sfp->si_value.sival_int) {
                 case PREEMPT_NORMAL   : ;// Normal case, nothing to do here
-                case PREEMPT_TERMINATE: verify( kernelTLS.this_processor->do_terminate);
+                case PREEMPT_TERMINATE: verify( __atomic_load_n( &kernelTLS.this_processor->do_terminate, __ATOMIC_SEQ_CST ) );
                 default:
                         abort( "internal error, signal value is %d", sfp->si_value.sival_int );
@@ -488 +490 @@
 }
 
+#ifdef __CFA_WITH_VERIFY__
+bool __cfaabi_dbg_in_kernel() {
+        return !kernelTLS.preemption_state.enabled;
+}
+#endif
+
 // Local Variables: //
 // mode: c //