Changeset 17c6edeb for libcfa/src/concurrency/kernel.cfa

Timestamp:

Aug 16, 2022, 2:52:24 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

71cf630

Parents:

32d1383 (diff), e116db3 (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) (5 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -305 +305 @@
         RUNNING:  while(true) {
                 thrd_dst->preempted = __NO_PREEMPTION;
-                thrd_dst->state = Active;
 
                 // Update global state
                 kernelTLS().this_thread = thrd_dst;
+
+                // Update the state after setting this_thread
+                // so that the debugger can find all active threads
+                // in tls storage
+                thrd_dst->state = Active;
 
                 /* paranoid */ verify( ! __preemption_enabled() );
@@ -335 +339 @@
                 /* paranoid */ verify( ! __preemption_enabled() );
 
-                // Reset global state
-                kernelTLS().this_thread = 0p;
-
                 // We just finished running a thread, there are a few things that could have happened.
                 // 1 - Regular case : the thread has blocked and now one has scheduled it yet.
@@ -346 +347 @@
 
                 if(unlikely(thrd_dst->preempted != __NO_PREEMPTION)) {
+                        // Reset the this_thread now that we know
+                        // the state isn't active anymore
+                        kernelTLS().this_thread = 0p;
+
                         // The thread was preempted, reschedule it and reset the flag
                         schedule_thread$( thrd_dst, UNPARK_LOCAL );
@@ -352 +357 @@
 
                 if(unlikely(thrd_dst->state == Halting)) {
+                        // Reset the this_thread now that we know
+                        // the state isn't active anymore
+                        kernelTLS().this_thread = 0p;
+
                         // The thread has halted, it should never be scheduled/run again
                         // finish the thread
@@ -360 +369 @@
                 /* paranoid */ verify( thrd_dst->state == Active );
                 thrd_dst->state = Blocked;
+
+                // Reset the this_thread now that we know
+                // the state isn't active anymore
+                kernelTLS().this_thread = 0p;
 
                 // set state of processor coroutine to active and the thread to inactive