Changes in libcfa/src/concurrency/monitor.hfa [58b6d1b:ac2b598]

File:

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

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 : Sat Oct  7 18:06:45 2017
-// Update Count     : 10
+// Last Modified On : Wed Dec  4 07:55:32 2019
+// Update Count     : 11
 //
 
@@ -23 +23 @@
 
 trait is_monitor(dtype T) {
-        monitor_desc * get_monitor( T & );
+        $monitor * get_monitor( T & );
         void ^?{}( T & mutex );
 };
 
-static inline void ?{}(monitor_desc & this) with( this ) {
+static inline void ?{}($monitor & this) with( this ) {
         lock{};
         entry_queue{};
         signal_stack{};
-        owner         = NULL;
+        owner         = 0p;
         recursion     = 0;
-        mask.accepted = NULL;
-        mask.data     = NULL;
+        mask.accepted = 0p;
+        mask.data     = 0p;
         mask.size     = 0;
-        dtor_node     = NULL;
+        dtor_node     = 0p;
 }
 
+static inline void ^?{}($monitor & ) {}
+
 struct monitor_guard_t {
-        monitor_desc **         m;
+        $monitor **     m;
         __lock_size_t           count;
         __monitor_group_t prev;
 };
 
-void ?{}( monitor_guard_t & this, monitor_desc ** 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_desc *    m;
+        $monitor *    m;
         __monitor_group_t prev;
 };
 
-void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, void (*func)() );
+void ?{}( monitor_dtor_guard_t & this, $monitor ** m, void (*func)() );
 void ^?{}( monitor_dtor_guard_t & this );
 
@@ -70 +72 @@
 
         // The monitor this criterion concerns
-        monitor_desc * target;
+        $monitor * target;
 
         // The parent node to which this criterion belongs
@@ -85 +87 @@
 struct __condition_node_t {
         // Thread that needs to be woken when all criteria are met
-        thread_desc * waiting_thread;
+        $thread * waiting_thread;
 
         // Array of criteria (Criterions are contiguous in memory)
@@ -104 +106 @@
 }
 
-void ?{}(__condition_node_t & this, thread_desc * 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_desc * target, __condition_node_t * owner );
+void ?{}(__condition_criterion_t & this, $monitor * target, __condition_node_t * owner );
 
 struct condition {
@@ -113 +115 @@
 
         // Array of monitor pointers (Monitors are NOT contiguous in memory)
-        monitor_desc ** monitors;
+        $monitor ** monitors;
 
         // Number of monitors in the array
@@ -120 +122 @@
 
 static inline void ?{}( condition & this ) {
-        this.monitors = NULL;
+        this.monitors = 0p;
         this.monitor_count = 0;
 }
@@ -131 +133 @@
               bool signal      ( condition & this );
               bool signal_block( condition & this );
-static inline bool is_empty    ( condition & this ) { return !this.blocked.head; }
+static inline bool is_empty    ( condition & this ) { return this.blocked.head == 1p; }
          uintptr_t front       ( condition & this );