Changeset 4702a2c for libcfa/src/concurrency

Timestamp:

Nov 25, 2020, 3:14:30 AM (5 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

0292aa4, 1389810

Parents:

e5c3811 (diff), bb87dd0 (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) (1 diff)

libcfa/src/concurrency/kernel.cfa

@@ -379 +379 @@
 
         ready_schedule_lock();
-                push( thrd->curr_cluster, thrd );
-                __wake_one(thrd->curr_cluster);
+                // Dereference the thread now because once we push it, there is not guaranteed it's still valid.
+                struct cluster * cl = thrd->curr_cluster;
+
+                // push the thread to the cluster ready-queue
+                push( cl, thrd );
+
+                // variable thrd is no longer safe to use
+
+                // wake the cluster using the save variable.
+                __wake_one( cl );
         ready_schedule_unlock();