Changeset 6ff08d8 for libcfa/src/concurrency/monitor.hfa

Timestamp:

Jul 12, 2021, 1:44:35 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

605673f, 9345684

Parents:

cf444b6 (diff), a953c2e3 (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

File:

• libcfa/src/concurrency/monitor.hfa (modified) (6 diffs)

libcfa/src/concurrency/monitor.hfa

@@ -23 +23 @@
 
 trait is_monitor(T &) {
-        $monitor * get_monitor( T & );
+        monitor$ * get_monitor( T & );
         void ^?{}( T & mutex );
 };
 
-static inline void ?{}($monitor & this) with( this ) {
+static inline void ?{}(monitor$ & this) with( this ) {
         lock{};
         entry_queue{};
@@ -39 +39 @@
 }
 
-static inline void ^?{}($monitor & ) {}
+static inline void ^?{}(monitor$ & ) {}
 
 struct monitor_guard_t {
-        $monitor **     m;
+        monitor$ **     m;
         __lock_size_t           count;
         __monitor_group_t prev;
 };
 
-void ?{}( monitor_guard_t & this, $monitor ** m, __lock_size_t count, void (*func)() );
+void ?{}( monitor_guard_t & this, monitor$ ** m, __lock_size_t count, void (*func)() );
 void ^?{}( monitor_guard_t & this );
 
 struct monitor_dtor_guard_t {
-        $monitor *    m;
+        monitor$ *    m;
         __monitor_group_t prev;
         bool join;
 };
 
-void ?{}( monitor_dtor_guard_t & this, $monitor ** m, void (*func)(), bool join );
+void ?{}( monitor_dtor_guard_t & this, monitor$ ** m, void (*func)(), bool join );
 void ^?{}( monitor_dtor_guard_t & this );
 
@@ -73 +73 @@
 
         // The monitor this criterion concerns
-        $monitor * target;
+        monitor$ * target;
 
         // The parent node to which this criterion belongs
@@ -88 +88 @@
 struct __condition_node_t {
         // Thread that needs to be woken when all criteria are met
-        $thread * waiting_thread;
+        thread$ * waiting_thread;
 
         // Array of criteria (Criterions are contiguous in memory)
@@ -107 +107 @@
 }
 
-void ?{}(__condition_node_t & this, $thread * waiting_thread, __lock_size_t count, uintptr_t user_info );
+void ?{}(__condition_node_t & this, thread$ * waiting_thread, __lock_size_t count, uintptr_t user_info );
 void ?{}(__condition_criterion_t & this );
-void ?{}(__condition_criterion_t & this, $monitor * target, __condition_node_t * owner );
+void ?{}(__condition_criterion_t & this, monitor$ * target, __condition_node_t * owner );
 
 struct condition {
@@ -116 +116 @@
 
         // Array of monitor pointers (Monitors are NOT contiguous in memory)
-        $monitor ** monitors;
+        monitor$ ** monitors;
 
         // Number of monitors in the array