Changeset 8728104 for libcfa

Timestamp:

Jan 30, 2023, 8:59:28 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

ce691d2

Parents:

0f15e3b (diff), 1c75ef8 (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:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• Makefile.am (modified) (1 diff)
• concurrency/actor.hfa (added)
• concurrency/locks.hfa (modified) (2 diffs)

libcfa/src/Makefile.am

@@ -115 +115 @@
         concurrency/mutex_stmt.hfa \
     concurrency/select.hfa \
-    concurrency/channel.hfa
+    concurrency/channel.hfa \
+    concurrency/actor.hfa 
 
 inst_thread_headers_src = \

libcfa/src/concurrency/locks.hfa

@@ -511 +511 @@
         // flag showing if lock is held
         volatile bool held;
-
-        #ifdef __CFA_DEBUG__
-        // for deadlock detection
-        struct thread$ * owner;
-        #endif
 };
 
@@ -526 +521 @@
 static inline void ?=?( spin_queue_lock & this, spin_queue_lock this2 ) = void;
 
-// if this is called recursively IT WILL DEADLOCK!!!!!
+// if this is called recursively IT WILL DEADLOCK!
 static inline void lock(spin_queue_lock & this) with(this) {
         mcs_spin_node node;