Changeset b0c7419 for libcfa/src/concurrency/monitor.cfa

Timestamp:

Feb 14, 2020, 3:28:17 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8c50aed

Parents:

50b8885

Message:

Yield now uses force_yield instead of park/unpark.
Final ctxswitch of a thread now uses ad-hoc mechanism instead of park/unpark.

File:

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

libcfa/src/concurrency/monitor.cfa

@@ -277 +277 @@
                 disable_interrupts();
 
-                thrd->self_cor.state = Halted;
+                thrd->state = Halted;
 
                 /* paranoid */ verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", thrd, this->owner, this->recursion, this );
@@ -296 +296 @@
                 // Unpark the next owner if needed
                 /* paranoid */ verifyf( !new_owner || new_owner == this->owner, "Expected owner to be %p, got %p (m: %p)", new_owner, this->owner, this );
-                unpark( new_owner );
-
-                // Leave the thread, this will unlock the spinlock
-                // Use leave thread instead of park which is
-                // specialized for this case
-                LeaveThread();
+                /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+                /* paranoid */ verify( ! kernelTLS.this_processor->destroyer );
+                /* paranoid */ verify( thrd->state == Halted );
+
+                kernelTLS.this_processor->destroyer = new_owner;
+
+                // Leave the thread
+                __leave_thread();
 
                 // Control flow should never reach here!