Changeset 2ed94a9 for libcfa/src/concurrency

Timestamp:

Feb 8, 2023, 2:27:55 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master, stuck-waitfor-destruct

Children:

b110bcc

Parents:

997185e (diff), ccb29b4 (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/concurrency

Files:

• actor.hfa (added)
• coroutine.hfa (modified) (2 diffs)
• locks.hfa (modified) (3 diffs)
• monitor.hfa (modified) (2 diffs)
• mutex.hfa (modified) (2 diffs)
• thread.hfa (modified) (2 diffs)

libcfa/src/concurrency/coroutine.hfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan  6 16:33:16 2022
-// Update Count     : 12
+// Last Modified On : Thu Feb  2 11:31:42 2023
+// Update Count     : 13
 //
 
@@ -38 +38 @@
 // Anything that implements this trait can be resumed.
 // Anything that is resumed is a coroutine.
-trait is_coroutine(T & | IS_RESUMPTION_EXCEPTION(CoroutineCancelled(T))) {
+forall( T & | IS_RESUMPTION_EXCEPTION(CoroutineCancelled(T)) )
+trait is_coroutine {
         void main(T & this);
         coroutine$ * get_coroutine(T & this);

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;
@@ -645 +640 @@
 //-----------------------------------------------------------------------------
 // is_blocking_lock
-trait is_blocking_lock(L & | sized(L)) {
+forall( L & | sized(L) )
+trait is_blocking_lock {
         // For synchronization locks to use when acquiring
         void on_notify( L &, struct thread$ * );

libcfa/src/concurrency/monitor.hfa

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec  4 07:55:32 2019
-// Update Count     : 11
+// Last Modified On : Thu Feb  2 11:29:21 2023
+// Update Count     : 12
 //
 
@@ -22 +22 @@
 #include "stdlib.hfa"
 
-trait is_monitor(T &) {
+forall( T & )
+trait is_monitor {
         monitor$ * get_monitor( T & );
         void ^?{}( T & mutex );

libcfa/src/concurrency/mutex.hfa

@@ -12 +12 @@
 // Created On       : Fri May 25 01:24:09 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec  4 09:16:53 2019
-// Update Count     : 1
+// Last Modified On : Thu Feb  2 11:46:08 2023
+// Update Count     : 2
 //
 
@@ -70 +70 @@
 void unlock(recursive_mutex_lock & this) __attribute__((deprecated("use concurrency/locks.hfa instead")));
 
-trait is_lock(L & | sized(L)) {
+forall( L & | sized(L) )
+trait is_lock {
         void lock  (L &);
         void unlock(L &);

libcfa/src/concurrency/thread.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov 22 22:18:34 2022
-// Update Count     : 35
+// Last Modified On : Thu Feb  2 11:27:59 2023
+// Update Count     : 37
 //
 
@@ -27 +27 @@
 //-----------------------------------------------------------------------------
 // thread trait
-trait is_thread(T &) {
+forall( T & )
+trait is_thread {
         void ^?{}(T& mutex this);
         void main(T& this);