Changeset b1e63ac5 for src/libcfa/concurrency/monitor

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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' into references

File:

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

src/libcfa/concurrency/monitor

@@ -26 +26 @@
 static inline void ?{}(monitor_desc * this) {
         this->owner = NULL;
-      this->stack_owner = NULL;
+        this->stack_owner = NULL;
         this->recursion = 0;
 }
@@ -33 +33 @@
         monitor_desc ** m;
         int count;
-      monitor_desc ** prev_mntrs;
-      unsigned short  prev_count;
+        monitor_desc ** prev_mntrs;
+        unsigned short  prev_count;
 };
 
@@ -59 +59 @@
         unsigned short count;                           //Number of criterions in the criteria
         __condition_node_t * next;                      //Intrusive linked list Next field
+        uintptr_t user_info;                            //Custom user info accessible before signalling
 };
 
@@ -85 +86 @@
 }
 
-void wait( condition * this );
-void signal( condition * this );
+void wait( condition * this, uintptr_t user_info = 0 );
+bool signal( condition * this );
+bool signal_block( condition * this );
+static inline bool is_empty( condition * this ) { return !this->blocked.head; }
+uintptr_t front( condition * this );
+
+struct __acceptable_t {
+        void (*func)(void);
+        unsigned short count;
+        monitor_desc * monitors[1];
+};
+
+void __accept_internal( unsigned short count, __acceptable_t * acceptables, void (*func)(void) );
+
 #endif //MONITOR_H