Changeset 1cb758f2 for src/libcfa/concurrency/monitor

Timestamp:

Aug 27, 2017, 11:26:26 AM (7 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:

111a8af8, 26238c1, 7ee1e2f6

Parents:

0c6596f (diff), eca3d10 (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) (4 diffs)

src/libcfa/concurrency/monitor

@@ -23 +23 @@
 
 static inline void ?{}(monitor_desc & this) {
+        (this.lock){};
         this.owner = NULL;
+        (this.entry_queue){};
+        (this.signal_stack){};
         this.recursion = 0;
+        this.acceptables = NULL;
+        this.acceptable_count = 0;
+        this.accepted_index = -1;
 }
 
@@ -32 +38 @@
         monitor_desc ** prev_mntrs;
         unsigned short  prev_count;
+        fptr_t          prev_func;
 };
 
@@ -38 +45 @@
 }
 
-void ?{}( monitor_guard_t & this, monitor_desc ** m, int count );
+void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() );
 void ^?{}( monitor_guard_t & this );
 
@@ -89 +96 @@
 uintptr_t front( condition * this );
 
+//-----------------------------------------------------------------------------
+// External scheduling
+
 struct __acceptable_t {
-        void (*func)(void);
+        fptr_t func;
         unsigned short count;
-        monitor_desc * monitors[1];
+        monitor_desc ** monitors;
 };
 
-void __accept_internal( unsigned short count, __acceptable_t * acceptables, void (*func)(void) );
+int __accept_internal( unsigned short count, __acceptable_t * acceptables );
 
 // Local Variables: //