Changes in libcfa/src/concurrency/locks.cfa [848439f:be73f30]

File:

• libcfa/src/concurrency/locks.cfa (modified) (6 diffs)

libcfa/src/concurrency/locks.cfa

@@ -74 +74 @@
 
 void lock( blocking_lock & this ) with( this ) {
+        $thread * thrd = active_thread();
         lock( lock __cfaabi_dbg_ctx2 );
-        if ( owner == kernelTLS.this_thread && !multi_acquisition) {
+        if ( owner == thrd && !multi_acquisition) {
                 fprintf(stderr, "A single acquisition lock holder attempted to reacquire the lock resulting in a deadlock."); // Possibly throw instead
                 exit(EXIT_FAILURE);
-        } else if ( owner != 0p && owner != kernelTLS.this_thread ) {
-                append( blocked_threads, kernelTLS.this_thread );
+        } else if ( owner != 0p && owner != thrd ) {
+                append( blocked_threads, thrd );
                 wait_count++;
                 unlock( lock );
                 park( __cfaabi_dbg_ctx );
-        } else if ( owner == kernelTLS.this_thread && multi_acquisition ) {
+        } else if ( owner == thrd && multi_acquisition ) {
                 recursion_count++;
                 unlock( lock );
         } else {
-                owner = kernelTLS.this_thread;
+                owner = thrd;
                 recursion_count = 1;
                 unlock( lock );
@@ -94 +95 @@
 
 bool try_lock( blocking_lock & this ) with( this ) {
+        $thread * thrd = active_thread();
         bool ret = false;
         lock( lock __cfaabi_dbg_ctx2 );
         if ( owner == 0p ) {
-                owner = kernelTLS.this_thread;
+                owner = thrd;
                 if ( multi_acquisition ) recursion_count = 1;
                 ret = true;
-        } else if ( owner == kernelTLS.this_thread && multi_acquisition ) {
+        } else if ( owner == thrd && multi_acquisition ) {
                 recursion_count++;
                 ret = true;
@@ -113 +115 @@
                 fprintf( stderr, "There was an attempt to release a lock that isn't held" );
                 return;
-        } else if ( strict_owner && owner != kernelTLS.this_thread ) {
+        } else if ( strict_owner && owner != active_thread() ) {
                 fprintf( stderr, "A thread other than the owner attempted to release an owner lock" );
                 return;
@@ -159 +161 @@
         if ( owner == 0p ){ // no owner implies lock isn't held
                 fprintf( stderr, "A lock that is not held was passed to a synchronization lock" );
-        } else if ( strict_owner && owner != kernelTLS.this_thread ) {
+        } else if ( strict_owner && owner != active_thread() ) {
                 fprintf( stderr, "A thread other than the owner of a lock passed it to a synchronization lock" );
         } else {
@@ -317 +319 @@
 
         void wait( synchronization_lock(L) & this ) with(this) {
-                info_thread( L ) i = { kernelTLS.this_thread };
+                info_thread( L ) i = { active_thread() };
                 queue_info_thread( this, i );
         }
 
         void wait( synchronization_lock(L) & this, uintptr_t info ) with(this) {
-                info_thread( L ) i = { kernelTLS.this_thread, info };
+                info_thread( L ) i = { active_thread(), info };
                 queue_info_thread( this, i );
         }
@@ -360 +362 @@
 
         void wait( synchronization_lock(L) & this, L & l ) with(this) {
-                info_thread(L) i = { kernelTLS.this_thread };
+                info_thread(L) i = { active_thread() };
                 queue_info_thread_unlock( this, l, i );
         }
 
         void wait( synchronization_lock(L) & this, L & l, uintptr_t info ) with(this) {
-                info_thread(L) i = { kernelTLS.this_thread, info };
+                info_thread(L) i = { active_thread(), info };
                 queue_info_thread_unlock( this, l, i );
         }