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

File:

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

src/libcfa/concurrency/monitor

@@ -22 +22 @@
 #include "stdlib"
 
-static inline void ?{}(monitor_desc * this) {
-        this->owner = NULL;
-        this->recursion = 0;
+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 );
+void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() );
+void ^?{}( monitor_guard_t & this );
 
 //-----------------------------------------------------------------------------
@@ -64 +71 @@
 };
 
-void ?{}( __condition_blocked_queue_t * );
+void ?{}( __condition_blocked_queue_t & );
 void append( __condition_blocked_queue_t *, __condition_node_t * );
 __condition_node_t * pop_head( __condition_blocked_queue_t * );
@@ -74 +81 @@
 };
 
-static inline void ?{}( condition * this ) {
-        this->monitors = NULL;
-        this->monitor_count = 0;
+static inline void ?{}( condition & this ) {
+        this.monitors = NULL;
+        this.monitor_count = 0;
 }
 
-static inline void ^?{}( condition * this ) {
-        free( this->monitors );
+static inline void ^?{}( condition & this ) {
+        free( this.monitors );
 }
 
@@ -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: //