Changes in src/libcfa/concurrency/monitor [aaa4f93:9f5ecf5]

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){};
@@ -33 +28 @@
         (this.signal_stack){};
         this.recursion = 0;
-        this.mask.accepted = NULL;
-        this.mask.clauses  = NULL;
-        this.mask.size     = 0;
+        this.acceptables = NULL;
+        this.acceptable_count = 0;
+        this.accepted_index = -1;
 }
 
@@ -105 +100 @@
 
 struct __acceptable_t {
-        __monitor_group_t;
+        fptr_t func;
+        unsigned short count;
+        monitor_desc ** monitors;
         bool is_dtor;
 };
 
-void __waitfor_internal( const __waitfor_mask_t & mask, int duration );
+int __accept_internal( unsigned short count, __acceptable_t * acceptables );
 
 // Local Variables: //