Changes in src/libcfa/concurrency/monitor [5ea06d6:cb0e6de]

File:

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

src/libcfa/concurrency/monitor

@@ -18 +18 @@
 #define MONITOR_H
 
-#include <stddef.h>
-
 #include "assert"
 #include "invoke.h"
@@ -25 +23 @@
 
 static inline void ?{}(monitor_desc * this) {
-        this->owner = NULL;
-      this->stack_owner = NULL;
+        this->owner = 0;
         this->recursion = 0;
 }
+
+//Array entering routine
+void enter(monitor_desc **, int count);
+void leave(monitor_desc **, int count);
 
 struct monitor_guard_t {
         monitor_desc ** m;
         int count;
-      monitor_desc ** prev_mntrs;
-      unsigned short  prev_count;
 };
 
@@ -41 +40 @@
 }
 
-void ?{}( monitor_guard_t * this, monitor_desc ** m, int count );
-void ^?{}( monitor_guard_t * this );
-
-//-----------------------------------------------------------------------------
-// Internal scheduling
-struct condition {
-        __thread_queue_t blocked;
-        monitor_desc ** monitors;
-        unsigned short monitor_count;
-};
-
-static inline void ?{}( condition * this ) {
-        this->monitors = NULL;
-        this->monitor_count = 0;
+static inline void ?{}( monitor_guard_t * this, monitor_desc ** m, int count ) {
+        this->m = m;
+        this->count = count;
+        qsort(this->m, count);
+        enter( this->m, this->count );
 }
 
-void wait( condition * this );
-void signal( condition * this );
+static inline void ^?{}( monitor_guard_t * this ) {
+        leave( this->m, this->count );
+}
+
+
 #endif //MONITOR_H