Changeset ca37445 for src/libcfa/concurrency/monitor.c

Timestamp:

Apr 10, 2018, 3:31:07 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

33f5b57

Parents:

9d1e3f7 (diff), 8ad6533 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/monitor.c

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 16 14:49:53 2018
-// Update Count     : 5
+// Last Modified On : Fri Mar 30 14:30:26 2018
+// Update Count     : 9
 //
 
@@ -85 +85 @@
                 // Lock the monitor spinlock
                 lock( this->lock __cfaabi_dbg_ctx2 );
-                thread_desc * thrd = this_thread;
+                thread_desc * thrd = TL_GET( this_thread );
 
                 __cfaabi_dbg_print_safe( "Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
@@ -134 +134 @@
                 // Lock the monitor spinlock
                 lock( this->lock __cfaabi_dbg_ctx2 );
-                thread_desc * thrd = 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);
@@ -168 +168 @@
 
                         // Create the node specific to this wait operation
-                        wait_ctx_primed( this_thread, 0 )
+                        wait_ctx_primed( TL_GET( this_thread ), 0 )
 
                         // Some one else has the monitor, wait for him to finish and then run
@@ -179 +179 @@
                         __cfaabi_dbg_print_safe( "Kernel :  blocking \n" );
 
-                        wait_ctx( this_thread, 0 )
+                        wait_ctx( TL_GET( this_thread ), 0 )
                         this->dtor_node = &waiter;
 
@@ -199 +199 @@
                 lock( this->lock __cfaabi_dbg_ctx2 );
 
-                __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
-
-                verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", 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
@@ -227 +227 @@
         void __leave_dtor_monitor_desc( monitor_desc * this ) {
                 __cfaabi_dbg_debug_do(
-                        if( this_thread != this->owner ) {
-                                abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_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 ) {
@@ -297 +297 @@
 
         // Save previous thread context
-        this.prev = this_thread->monitors;
+        this.prev = TL_GET( this_thread )->monitors;
 
         // Update thread context (needed for conditions)
-        (this_thread->monitors){m, count, func};
+        (TL_GET( this_thread )->monitors){m, count, func};
 
         // __cfaabi_dbg_print_safe( "MGUARD : enter %d\n", count);
@@ -322 +322 @@
 
         // Restore thread context
-        this_thread->monitors = this.prev;
+        TL_GET( this_thread )->monitors = this.prev;
 }
 
@@ -332 +332 @@
 
         // Save previous thread context
-        this.prev = this_thread->monitors;
+        this.prev = TL_GET( this_thread )->monitors;
 
         // Update thread context (needed for conditions)
-        (this_thread->monitors){m, 1, func};
+        (TL_GET( this_thread )->monitors){m, 1, func};
 
         __enter_monitor_dtor( this.m, func );
@@ -346 +346 @@
 
         // Restore thread context
-        this_thread->monitors = this.prev;
+        TL_GET( this_thread )->monitors = this.prev;
 }
 
@@ -386 +386 @@
 
         // Create the node specific to this wait operation
-        wait_ctx( this_thread, user_info );
+        wait_ctx( TL_GET( this_thread ), user_info );
 
         // Append the current wait operation to the ones already queued on the condition
@@ -425 +425 @@
         //Some more checking in debug
         __cfaabi_dbg_debug_do(
-                thread_desc * this_thrd = this_thread;
+                thread_desc * 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 );
@@ -473 +473 @@
 
         // Create the node specific to this wait operation
-        wait_ctx_primed( this_thread, 0 )
+        wait_ctx_primed( TL_GET( this_thread ), 0 )
 
         //save contexts
@@ -566 +566 @@
 
                                 // Create the node specific to this wait operation
-                                wait_ctx_primed( this_thread, 0 );
+                                wait_ctx_primed( TL_GET( this_thread ), 0 );
 
                                 // Save monitor states
@@ -612 +612 @@
 
         // Create the node specific to this wait operation
-        wait_ctx_primed( this_thread, 0 );
+        wait_ctx_primed( TL_GET( this_thread ), 0 );
 
         monitor_save;
@@ -618 +618 @@
 
         for( __lock_size_t i = 0; i < count; i++) {
-                verify( monitors[i]->owner == this_thread );
+                verify( monitors[i]->owner == TL_GET( this_thread ) );
         }
 
@@ -812 +812 @@
 
 static inline void brand_condition( condition & this ) {
-        thread_desc * thrd = this_thread;
+        thread_desc * thrd = TL_GET( this_thread );
         if( !this.monitors ) {
                 // __cfaabi_dbg_print_safe( "Branding\n" );