Changes in libcfa/src/concurrency/monitor.cfa [5afb49a:e235429]

File:

• libcfa/src/concurrency/monitor.cfa (modified) (1 diff)

libcfa/src/concurrency/monitor.cfa

@@ -281 +281 @@
 }
 
-void __thread_finish( $thread * thrd ) {
-        $monitor * this = &thrd->self_mon;
-
-        // Lock the monitor now
-        /* paranoid */ verify( this->lock.lock );
-        /* paranoid */ verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", thrd, this->owner, this->recursion, this );
-        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
-        /* paranoid */ verify( thrd->state == Halted );
-        /* paranoid */ verify( this->recursion == 1 );
-
-        // Leaving a recursion level, decrement the counter
-        this->recursion -= 1;
-        this->owner = 0p;
-
-        // Fetch the next thread, can be null
-        $thread * new_owner = next_thread( this );
-
-        // Release the monitor lock
-        unlock( this->lock );
-
-        // 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 );
-        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
-        /* paranoid */ verify( thrd->state == Halted );
-        unpark( new_owner );
+extern "C" {
+        // Leave the thread monitor
+        // last routine called by a thread.
+        // Should never return
+        void __cfactx_thrd_leave() {
+                $thread * thrd = TL_GET( this_thread );
+                $monitor * this = &thrd->self_mon;
+
+                // Lock the monitor now
+                lock( this->lock __cfaabi_dbg_ctx2 );
+
+                disable_interrupts();
+
+                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 );
+
+                // Leaving a recursion level, decrement the counter
+                this->recursion -= 1;
+
+                // If we haven't left the last level of recursion
+                // it must mean there is an error
+                if( this->recursion != 0) { abort( "Thread internal monitor has unbalanced recursion" ); }
+
+                // Fetch the next thread, can be null
+                $thread * new_owner = next_thread( this );
+
+                // Release the monitor lock
+                unlock( this->lock );
+
+                // 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 );
+                /* 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!
+        }
 }