Changes in / [20221d4:f37147b]

Location:

src

Files:

• libcfa/concurrency/monitor (modified) (2 diffs)
• libcfa/concurrency/monitor.c (modified) (1 diff)
• tests/.expect/multi-monitor.txt (deleted)
• tests/monitor.c (modified) (1 diff)
• tests/multi-monitor.c (deleted)

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

src/libcfa/concurrency/monitor.c

@@ -71 +71 @@
         }
 }
-
-void enter(__monitor_t ** monitors, int count) {
-        for(int i = 0; i < count; i++) {
-                // printf("%d\n", i);
-                enter( monitors[i] );
-        }
-}
-
-void leave(__monitor_t ** monitors, int count) {
-        for(int i = count - 1; i >= 0; i--) {
-                // printf("%d\n", i);
-                leave( monitors[i] );
-        }
-}

src/tests/monitor.c

@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        __monitor_t * mon = &this->m;
-        monitor_guard_t g1 = { &mon };
+        monitor_guard_t g1 = { &this->m };
         {
-                monitor_guard_t g2 = { &mon };
+                monitor_guard_t g2 = { &this->m };
                 {
-                        monitor_guard_t g3 = { &mon };
+                        monitor_guard_t g3 = { &this->m };
                         this->value += 1;
                 }