Changeset 398e8e9 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Jul 1, 2020, 12:13:30 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:

8291293

Parents:

7812a7b5

Message:

Tentative deadlock fix

File:

• libcfa/src/concurrency/kernel.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -346 +346 @@
 
                 $thread * readyThread = 0p;
-                for( unsigned int spin_count = 0; ! __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST); spin_count++ ) {
+                for( unsigned int spin_count = 0;; spin_count++ ) {
                         // Try to get the next thread
                         readyThread = __next_thread( this->cltr );
@@ -362 +362 @@
                                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
                         }
-                        else {
+
+                        if(__atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST)) break;
+
+                        if( !readyThread ) {
                                 // Block until a thread is ready
                                 __halt(this);