Changeset d67cdb7 for src/libcfa/concurrency/monitor

Timestamp:

Sep 26, 2017, 11:27:38 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

5dc26f5

Parents:

201aeb9

Message:

merge

File:

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

src/libcfa/concurrency/monitor

@@ -22 +22 @@
 #include "stdlib"
 
+trait is_monitor(dtype T) {
+        monitor_desc * get_monitor( T & );
+        void ^?{}( T & mutex );
+};
+
 static inline void ?{}(monitor_desc & this) {
         (this.lock){};
@@ -28 +33 @@
         (this.signal_stack){};
         this.recursion = 0;
-        this.acceptables = NULL;
-        this.acceptable_count = 0;
-        this.accepted_index = -1;
+        this.mask.accepted = NULL;
+        this.mask.clauses  = NULL;
+        this.mask.size     = 0;
 }
 
@@ -100 +105 @@
 
 struct __acceptable_t {
-        fptr_t func;
-        unsigned short count;
-        monitor_desc ** monitors;
+        __monitor_group_t;
         bool is_dtor;
 };
 
-int __accept_internal( unsigned short count, __acceptable_t * acceptables );
+void __waitfor_internal( const __waitfor_mask_t & mask, int duration );
 
 // Local Variables: //