Changeset f80f840 for libcfa/src/concurrency/mutex.cfa

Timestamp:

Dec 10, 2019, 4:24:49 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

2a3d446

Parents:

b798713 (diff), e307e12 (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 relaxed_ready

File:

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

libcfa/src/concurrency/mutex.cfa

@@ -11 +11 @@
 // Author           : Thierry Delisle
 // Created On       : Fri May 25 01:37:11 2018
-// Last Modified By : Thierry Delisle
-// Last Modified On : Fri May 25 01:37:51 2018
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec  4 09:16:39 2019
+// Update Count     : 1
 //
 
@@ -73 +73 @@
         this.lock{};
         this.blocked_threads{};
-        this.owner = NULL;
+        this.owner = 0p;
         this.recursion_count = 0;
 }
@@ -83 +83 @@
 void lock(recursive_mutex_lock & this) with(this) {
         lock( lock __cfaabi_dbg_ctx2 );
-        if( owner == NULL ) {
+        if( owner == 0p ) {
                 owner = kernelTLS.this_thread;
                 recursion_count = 1;
@@ -101 +101 @@
         bool ret = false;
         lock( lock __cfaabi_dbg_ctx2 );
-        if( owner == NULL ) {
+        if( owner == 0p ) {
                 owner = kernelTLS.this_thread;
                 recursion_count = 1;