Changeset 8728104

Timestamp:

Jan 30, 2023, 8:59:28 PM (22 months 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

Files:

• libcfa/src/Makefile.am (modified) (1 diff)
• libcfa/src/concurrency/actor.hfa (added)
• libcfa/src/concurrency/locks.hfa (modified) (2 diffs)
• src/Concurrency/Actors.cpp (added)
• src/Concurrency/Actors.hpp (added)
• src/Concurrency/module.mk (modified) (2 diffs)
• src/main.cc (modified) (2 diffs)
• tests/concurrent/actors/.expect/matrix.txt (added)
• tests/concurrent/actors/.expect/pingpong.txt (added)
• tests/concurrent/actors/.expect/types.txt (added)
• tests/concurrent/actors/matrix.cfa (added)
• tests/concurrent/actors/pingpong.cfa (added)
• tests/concurrent/actors/types.cfa (added)

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;

src/Concurrency/module.mk

@@ -16 +16 @@
 
 SRC += \
+        Concurrency/Actors.cpp \
+        Concurrency/Actors.hpp \
         Concurrency/KeywordsNew.cpp \
         Concurrency/Keywords.cc \
@@ -21 +23 @@
         Concurrency/WaitforNew.cpp \
         Concurrency/Waitfor.cc \
-        Concurrency/Waitfor.h
+        Concurrency/Waitfor.h 

src/main.cc

@@ -46 +46 @@
 #include "Common/UnimplementedError.h"      // for UnimplementedError
 #include "Common/utility.h"                 // for deleteAll, filter, printAll
+#include "Concurrency/Actors.hpp"           // for implementActors
 #include "Concurrency/Keywords.h"           // for implementMutex, implement...
 #include "Concurrency/Waitfor.h"            // for generateWaitfor
@@ -341 +342 @@
                 PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) );
 
+        PASS( "Implement Actors", Concurrency::implementActors( transUnit ) );
+
                 PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) );
                 PASS( "Implement Thread Start", Concurrency::implementThreadStarter( transUnit ) );