Changeset 58fe85a for libcfa/src/concurrency/mutex.cfa

Timestamp:

Jan 7, 2021, 3:27:00 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (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' into park_unpark

File:

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

libcfa/src/concurrency/mutex.cfa

@@ -30 +30 @@
         this.lock{};
         this.blocked_threads{};
+        this.is_locked = false;
 }
 
@@ -39 +40 @@
         lock( lock __cfaabi_dbg_ctx2 );
         if( is_locked ) {
-                append( blocked_threads, kernelTLS.this_thread );
+                append( blocked_threads, active_thread() );
                 unlock( lock );
                 park();
@@ -85 +86 @@
         lock( lock __cfaabi_dbg_ctx2 );
         if( owner == 0p ) {
-                owner = kernelTLS.this_thread;
+                owner = active_thread();
                 recursion_count = 1;
                 unlock( lock );
         }
-        else if( owner == kernelTLS.this_thread ) {
+        else if( owner == active_thread() ) {
                 recursion_count++;
                 unlock( lock );
         }
         else {
-                append( blocked_threads, kernelTLS.this_thread );
+                append( blocked_threads, active_thread() );
                 unlock( lock );
                 park();
@@ -104 +105 @@
         lock( lock __cfaabi_dbg_ctx2 );
         if( owner == 0p ) {
-                owner = kernelTLS.this_thread;
+                owner = active_thread();
                 recursion_count = 1;
                 ret = true;
         }
-        else if( owner == kernelTLS.this_thread ) {
+        else if( owner == active_thread() ) {
                 recursion_count++;
                 ret = true;
@@ -158 +159 @@
 void wait(condition_variable & this) {
         lock( this.lock __cfaabi_dbg_ctx2 );
-        append( this.blocked_threads, kernelTLS.this_thread );
+        append( this.blocked_threads, active_thread() );
         unlock( this.lock );
         park();
@@ -166 +167 @@
 void wait(condition_variable & this, L & l) {
         lock( this.lock __cfaabi_dbg_ctx2 );
-        append( this.blocked_threads, kernelTLS.this_thread );
+        append( this.blocked_threads, active_thread() );
         unlock(l);
         unlock(this.lock);