Changes in src/libcfa/concurrency/monitor [2781e65:cc7f4b1]

File:

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

src/libcfa/concurrency/monitor

@@ -20 +20 @@
 #include "assert"
 #include "invoke.h"
-#include "stdlib"
 
 struct __monitor_t {
@@ -34 +33 @@
 }
 
-//Basic entering routine
 void enter(__monitor_t *);
 void leave(__monitor_t *);
 
-//Array entering routine
-void enter(__monitor_t **, int count);
-void leave(__monitor_t **, int count);
-
 struct monitor_guard_t {
-        __monitor_t ** m;
-        int count;
+        __monitor_t * m;
 };
 
-static inline int ?<?(__monitor_t* lhs, __monitor_t* rhs) {
-        return ((intptr_t)lhs) < ((intptr_t)rhs);
-}
-
-static inline void ?{}( monitor_guard_t * this, __monitor_t ** m ) {
+static inline void ?{}( monitor_guard_t * this, __monitor_t * m ) {
         this->m = m;
-        this->count = 1;
-        enter( *this->m );
-}
-
-static inline void ?{}( monitor_guard_t * this, __monitor_t ** m, int count ) {
-        this->m = m;
-        this->count = count;
-        qsort(this->m, count);
-        enter( this->m, this->count );
+        enter( this->m );
 }
 
 static inline void ^?{}( monitor_guard_t * this ) {
-        leave( this->m, this->count );
+        leave( this->m );
 }
 
-
 #endif //MONITOR_H