Changes in src/libcfa/concurrency/monitor [6b0b624:80c72a7]

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: //