Changeset 42daeb4 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Jan 13, 2022, 10:53:25 AM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

3eaa689

Parents:

3bb12921 (diff), 00f5fde (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/kernel.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -554 +554 @@
         /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
 
-        const bool local = thrd->state != Start;
         if (thrd->preempted == __NO_PREEMPTION) thrd->state = Ready;
 
@@ -737 +736 @@
 
         // Check if there is a sleeping processor
-        int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
+        // int fd = __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST);
+        int fd = 0;
+        if( __atomic_load_n(&this->procs.fd, __ATOMIC_SEQ_CST) != 0 ) {
+                fd = __atomic_exchange_n(&this->procs.fd, 0, __ATOMIC_RELAXED);
+        }
 
         // If no one is sleeping, we are done