Changes in src/libcfa/concurrency/monitor [0cf5b79:59a0bde]

File:

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

src/libcfa/concurrency/monitor

@@ -34 +34 @@
         this.recursion     = 0;
         this.mask.accepted = NULL;
-        this.mask.data     = NULL;
+        this.mask.clauses  = NULL;
         this.mask.size     = 0;
         this.dtor_node     = NULL;
@@ -40 +40 @@
 
 struct monitor_guard_t {
-        monitor_desc **         m;
-        __lock_size_t           count;
-        __monitor_group_t prev;
+        monitor_desc ** m;
+        __lock_size_t   count;
+        monitor_desc ** prev_mntrs;
+        __lock_size_t   prev_count;
+        fptr_t          prev_func;
 };
 
@@ -49 +51 @@
 
 struct monitor_dtor_guard_t {
-        monitor_desc *    m;
-        __monitor_group_t prev;
+        monitor_desc * m;
+        monitor_desc ** prev_mntrs;
+        __lock_size_t   prev_count;
+        fptr_t          prev_func;
 };
 
@@ -79 +83 @@
 };
 
-static inline __condition_criterion_t * & get_next( __condition_criterion_t & this ) {
-        return this.next;
-}
-
 struct __condition_node_t {
         // Thread that needs to be woken when all criteria are met
@@ -100 +100 @@
 };
 
-static inline __condition_node_t * & get_next( __condition_node_t & this ) {
-        return this.next;
-}
+struct __condition_blocked_queue_t {
+        __condition_node_t * head;
+        __condition_node_t ** tail;
+};
 
 void ?{}(__condition_node_t & this, thread_desc * waiting_thread, __lock_size_t count, uintptr_t user_info );
@@ -108 +109 @@
 void ?{}(__condition_criterion_t & this, monitor_desc * target, __condition_node_t * owner );
 
+void ?{}( __condition_blocked_queue_t & );
+void append( __condition_blocked_queue_t &, __condition_node_t * );
+__condition_node_t * pop_head( __condition_blocked_queue_t & );
+
 struct condition {
         // Link list which contains the blocked threads as-well as the information needed to unblock them
-        __queue_t(__condition_node_t) blocked;
+        __condition_blocked_queue_t blocked;
 
         // Array of monitor pointers (Monitors are NOT contiguous in memory)