Changeset 3d5701e for libcfa/src/concurrency/mutex.hfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• libcfa/src/concurrency/mutex.hfa (modified) (5 diffs)

libcfa/src/concurrency/mutex.hfa

@@ -11 +11 @@
 // Author           : Thierry Delisle
 // Created On       : Fri May 25 01:24:09 2018
-// Last Modified By : Thierry Delisle
-// Last Modified On : Fri May 25 01:24:12 2018
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec  4 09:16:53 2019
+// Update Count     : 1
 //
 
@@ -36 +36 @@
 
         // List of blocked threads
-        __queue_t(struct thread_desc) blocked_threads;
+        __queue_t(struct $thread) blocked_threads;
 
         // Locked flag
@@ -55 +55 @@
 
         // List of blocked threads
-        __queue_t(struct thread_desc) blocked_threads;
+        __queue_t(struct $thread) blocked_threads;
 
         // Current thread owning the lock
-        struct thread_desc * owner;
+        struct $thread * owner;
 
         // Number of recursion level
@@ -83 +83 @@
 
         // List of blocked threads
-        __queue_t(struct thread_desc) blocked_threads;
+        __queue_t(struct $thread) blocked_threads;
 };
 
@@ -110 +110 @@
 
         static inline void ?{}(lock_scope(L) & this) {
-                this.locks = NULL;
+                this.locks = 0p;
                 this.count = 0;
         }