Changes in libcfa/src/concurrency/monitor.cfa [8fc652e0:ab8c6a6]

File:

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

libcfa/src/concurrency/monitor.cfa

@@ -82 +82 @@
 // Enter single monitor
 static void __enter( $monitor * this, const __monitor_group_t & group ) {
-        $thread * thrd = active_thread();
-
         // Lock the monitor spinlock
         lock( this->lock __cfaabi_dbg_ctx2 );
+        // Interrupts disable inside critical section
+        $thread * thrd = kernelTLS.this_thread;
 
         __cfaabi_dbg_print_safe( "Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
@@ -126 +126 @@
                 __cfaabi_dbg_print_safe( "Kernel : %10p Entered  mon %p\n", thrd, this);
 
-                /* paranoid */ verifyf( active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+                /* paranoid */ verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
                 return;
         }
@@ -132 +132 @@
         __cfaabi_dbg_print_safe( "Kernel : %10p Entered  mon %p\n", thrd, this);
 
-        /* paranoid */ verifyf( active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+        /* paranoid */ verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
         /* paranoid */ verify( this->lock.lock );
 
@@ -141 +141 @@
 
 static void __dtor_enter( $monitor * this, fptr_t func, bool join ) {
-        $thread * thrd = active_thread();
-
         // Lock the monitor spinlock
         lock( this->lock __cfaabi_dbg_ctx2 );
+        // Interrupts disable inside critical section
+        $thread * thrd = kernelTLS.this_thread;
 
         __cfaabi_dbg_print_safe( "Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
@@ -155 +155 @@
                 __set_owner( this, thrd );
 
-                verifyf( active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+                verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
 
                 unlock( this->lock );
@@ -174 +174 @@
                 this->owner = thrd;
 
-                verifyf( active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+                verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
 
                 unlock( this->lock );
@@ -200 +200 @@
 
                 // Release the next thread
-                /* paranoid */ verifyf( urgent->owner->waiting_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+                /* paranoid */ verifyf( urgent->owner->waiting_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
                 unpark( urgent->owner->waiting_thread );
 
@@ -207 +207 @@
 
                 // Some one was waiting for us, enter
-                /* paranoid */ verifyf( active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+                /* paranoid */ verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
         }
         else {
@@ -224 +224 @@
                 park();
 
-                /* paranoid */ verifyf( active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+                /* paranoid */ verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
                 return;
         }
@@ -237 +237 @@
         lock( this->lock __cfaabi_dbg_ctx2 );
 
-        __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", active_thread(), this, this->owner);
-
-        /* paranoid */ verifyf( active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+        __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", kernelTLS.this_thread, this, this->owner);
+
+        /* paranoid */ verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
 
         // Leaving a recursion level, decrement the counter
@@ -270 +270 @@
 void __dtor_leave( $monitor * this, bool join ) {
         __cfaabi_dbg_debug_do(
-                if( active_thread() != this->owner ) {
-                        abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, active_thread(), this->owner);
+                if( TL_GET( this_thread ) != this->owner ) {
+                        abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, TL_GET( this_thread ), this->owner);
                 }
                 if( this->recursion != 1  && !join ) {
@@ -287 +287 @@
         /* 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( ! __preemption_enabled() );
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
         /* paranoid */ verify( thrd->state == Halted );
         /* paranoid */ verify( this->recursion == 1 );
@@ -303 +303 @@
         // 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( ! __preemption_enabled() );
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
         /* paranoid */ verify( thrd->state == Halted );
         unpark( new_owner );
@@ -327 +327 @@
 // Sorts monitors before entering
 void ?{}( monitor_guard_t & this, $monitor * m [], __lock_size_t count, fptr_t func ) {
-        $thread * thrd = active_thread();
+        $thread * thrd = TL_GET( this_thread );
 
         // Store current array
@@ -362 +362 @@
 
         // Restore thread context
-        active_thread()->monitors = this.prev;
+        TL_GET( this_thread )->monitors = this.prev;
 }
 
@@ -369 +369 @@
 void ?{}( monitor_dtor_guard_t & this, $monitor * m [], fptr_t func, bool join ) {
         // optimization
-        $thread * thrd = active_thread();
+        $thread * thrd = TL_GET( this_thread );
 
         // Store current array
@@ -392 +392 @@
 
         // Restore thread context
-        active_thread()->monitors = this.prev;
+        TL_GET( this_thread )->monitors = this.prev;
 }
 
@@ -432 +432 @@
 
         // Create the node specific to this wait operation
-        wait_ctx( active_thread(), user_info );
+        wait_ctx( TL_GET( this_thread ), user_info );
 
         // Append the current wait operation to the ones already queued on the condition
@@ -483 +483 @@
         //Some more checking in debug
         __cfaabi_dbg_debug_do(
-                $thread * this_thrd = active_thread();
+                $thread * this_thrd = TL_GET( this_thread );
                 if ( this.monitor_count != this_thrd->monitors.size ) {
                         abort( "Signal on condition %p made with different number of monitor(s), expected %zi got %zi", &this, this.monitor_count, this_thrd->monitors.size );
@@ -531 +531 @@
 
         // Create the node specific to this wait operation
-        wait_ctx_primed( active_thread(), 0 )
+        wait_ctx_primed( kernelTLS.this_thread, 0 )
 
         //save contexts
@@ -630 +630 @@
 
                                 // Create the node specific to this wait operation
-                                wait_ctx_primed( active_thread(), 0 );
+                                wait_ctx_primed( kernelTLS.this_thread, 0 );
 
                                 // Save monitor states
@@ -682 +682 @@
 
         // Create the node specific to this wait operation
-        wait_ctx_primed( active_thread(), 0 );
+        wait_ctx_primed( kernelTLS.this_thread, 0 );
 
         monitor_save;
@@ -688 +688 @@
 
         for( __lock_size_t i = 0; i < count; i++) {
-                verify( monitors[i]->owner == active_thread() );
+                verify( monitors[i]->owner == kernelTLS.this_thread );
         }
 
@@ -724 +724 @@
 static inline void __set_owner( $monitor * monitors [], __lock_size_t count, $thread * owner ) {
         /* paranoid */ verify ( monitors[0]->lock.lock );
-        /* paranoid */ verifyf( monitors[0]->owner == active_thread(), "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), monitors[0]->owner, monitors[0]->recursion, monitors[0] );
+        /* paranoid */ verifyf( monitors[0]->owner == kernelTLS.this_thread, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, monitors[0]->owner, monitors[0]->recursion, monitors[0] );
         monitors[0]->owner        = owner;
         monitors[0]->recursion    = 1;
         for( __lock_size_t i = 1; i < count; i++ ) {
                 /* paranoid */ verify ( monitors[i]->lock.lock );
-                /* paranoid */ verifyf( monitors[i]->owner == active_thread(), "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), monitors[i]->owner, monitors[i]->recursion, monitors[i] );
+                /* paranoid */ verifyf( monitors[i]->owner == kernelTLS.this_thread, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, monitors[i]->owner, monitors[i]->recursion, monitors[i] );
                 monitors[i]->owner        = owner;
                 monitors[i]->recursion    = 0;
@@ -755 +755 @@
                 //regardless of if we are ready to baton pass,
                 //we need to set the monitor as in use
-                /* paranoid */ verifyf( !this->owner || active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+                /* paranoid */ verifyf( !this->owner || kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
                 __set_owner( this,  urgent->owner->waiting_thread );
 
@@ -764 +764 @@
         // Get the next thread in the entry_queue
         $thread * new_owner = pop_head( this->entry_queue );
-        /* paranoid */ verifyf( !this->owner || active_thread() == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", active_thread(), this->owner, this->recursion, this );
+        /* paranoid */ verifyf( !this->owner || kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
         /* paranoid */ verify( !new_owner || new_owner->link.next == 0p );
         __set_owner( this, new_owner );
@@ -892 +892 @@
 
 static inline void brand_condition( condition & this ) {
-        $thread * thrd = active_thread();
+        $thread * thrd = TL_GET( this_thread );
         if( !this.monitors ) {
                 // __cfaabi_dbg_print_safe( "Branding\n" );