Changes in src/libcfa/concurrency/monitor.c [afd550c:b10affd]

File:

• src/libcfa/concurrency/monitor.c (modified) (12 diffs)

src/libcfa/concurrency/monitor.c

@@ -85 +85 @@
                 // Lock the monitor spinlock
                 lock( this->lock __cfaabi_dbg_ctx2 );
-                // Interrupts disable inside critical section
-                thread_desc * thrd = kernelTLS.this_thread;
+                thread_desc * thrd = TL_GET( this_thread );
 
                 __cfaabi_dbg_print_safe( "Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
@@ -135 +134 @@
                 // Lock the monitor spinlock
                 lock( this->lock __cfaabi_dbg_ctx2 );
-                // Interrupts disable inside critical section
-                thread_desc * thrd = kernelTLS.this_thread;
+                thread_desc * thrd = TL_GET( this_thread );
 
                 __cfaabi_dbg_print_safe( "Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
@@ -170 +168 @@
 
                         // Create the node specific to this wait operation
-                        wait_ctx_primed( thrd, 0 )
+                        wait_ctx_primed( TL_GET( this_thread ), 0 )
 
                         // Some one else has the monitor, wait for him to finish and then run
@@ -181 +179 @@
                         __cfaabi_dbg_print_safe( "Kernel :  blocking \n" );
 
-                        wait_ctx( thrd, 0 )
+                        wait_ctx( TL_GET( this_thread ), 0 )
                         this->dtor_node = &waiter;
 
@@ -201 +199 @@
                 lock( this->lock __cfaabi_dbg_ctx2 );
 
-                __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", kernelTLS.this_thread, this, this->owner);
-
-                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 );
+                __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", TL_GET( this_thread ), this, this->owner);
+
+                verifyf( TL_GET( this_thread ) == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", TL_GET( this_thread ), this->owner, this->recursion, this );
 
                 // Leaving a recursion level, decrement the counter
@@ -291 +289 @@
 // Sorts monitors before entering
 void ?{}( monitor_guard_t & this, monitor_desc * m [], __lock_size_t count, fptr_t func ) {
-        thread_desc * thrd = TL_GET( this_thread );
-
         // Store current array
         this.m = m;
@@ -301 +297 @@
 
         // Save previous thread context
-        this.prev = thrd->monitors;
+        this.prev = TL_GET( this_thread )->monitors;
 
         // Update thread context (needed for conditions)
-        (thrd->monitors){m, count, func};
+        (TL_GET( this_thread )->monitors){m, count, func};
 
         // __cfaabi_dbg_print_safe( "MGUARD : enter %d\n", count);
@@ -332 +328 @@
 // Sorts monitors before entering
 void ?{}( monitor_dtor_guard_t & this, monitor_desc * m [], fptr_t func ) {
-        // optimization
-        thread_desc * thrd = TL_GET( this_thread );
-
         // Store current array
         this.m = *m;
 
         // Save previous thread context
-        this.prev = thrd->monitors;
+        this.prev = TL_GET( this_thread )->monitors;
 
         // Update thread context (needed for conditions)
-        (thrd->monitors){m, 1, func};
+        (TL_GET( this_thread )->monitors){m, 1, func};
 
         __enter_monitor_dtor( this.m, func );
@@ -480 +473 @@
 
         // Create the node specific to this wait operation
-        wait_ctx_primed( kernelTLS.this_thread, 0 )
+        wait_ctx_primed( TL_GET( this_thread ), 0 )
 
         //save contexts
@@ -573 +566 @@
 
                                 // Create the node specific to this wait operation
-                                wait_ctx_primed( kernelTLS.this_thread, 0 );
+                                wait_ctx_primed( TL_GET( this_thread ), 0 );
 
                                 // Save monitor states
@@ -619 +612 @@
 
         // Create the node specific to this wait operation
-        wait_ctx_primed( kernelTLS.this_thread, 0 );
+        wait_ctx_primed( TL_GET( this_thread ), 0 );
 
         monitor_save;
@@ -625 +618 @@
 
         for( __lock_size_t i = 0; i < count; i++) {
-                verify( monitors[i]->owner == kernelTLS.this_thread );
+                verify( monitors[i]->owner == TL_GET( this_thread ) );
         }