Changeset d5a52cc for src/libcfa/concurrency/monitor

Timestamp:

Nov 28, 2017, 3:04:37 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

4e7a4e6

Parents:

1393df07 (diff), 8a0a64d9 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/monitor

@@ -34 +34 @@
         this.recursion     = 0;
         this.mask.accepted = NULL;
-        this.mask.clauses  = NULL;
+        this.mask.data     = NULL;
         this.mask.size     = 0;
         this.dtor_node     = NULL;
@@ -40 +40 @@
 
 struct monitor_guard_t {
-        monitor_desc ** m;
-        __lock_size_t   count;
-        monitor_desc ** prev_mntrs;
-        __lock_size_t   prev_count;
-        fptr_t          prev_func;
+        monitor_desc **         m;
+        __lock_size_t           count;
+        __monitor_group_t prev;
 };
 
@@ -51 +49 @@
 
 struct monitor_dtor_guard_t {
-        monitor_desc * m;
-        monitor_desc ** prev_mntrs;
-        __lock_size_t   prev_count;
-        fptr_t          prev_func;
+        monitor_desc *    m;
+        __monitor_group_t prev;
 };
 
@@ -83 +79 @@
 };
 
+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 @@
 };
 
-struct __condition_blocked_queue_t {
-        __condition_node_t * head;
-        __condition_node_t ** tail;
-};
+static inline __condition_node_t * & get_next( __condition_node_t & this ) {
+        return this.next;
+}
 
 void ?{}(__condition_node_t & this, thread_desc * waiting_thread, __lock_size_t count, uintptr_t user_info );
@@ -109 +108 @@
 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
-        __condition_blocked_queue_t blocked;
+        __queue_t(__condition_node_t) blocked;
 
         // Array of monitor pointers (Monitors are NOT contiguous in memory)