Changes in src/libcfa/concurrency/monitor [cc7f4b1:51f3798]

File:

• src/libcfa/concurrency/monitor (modified) (1 diff)

src/libcfa/concurrency/monitor

@@ -21 +21 @@
 #include "invoke.h"
 
-struct __monitor_t {
+struct monitor {
         spinlock lock;
-        thread * owner;
+        thread * holder;
         simple_thread_list entry_queue;
-        unsigned int recursion;
 };
 
-static inline void ?{}(__monitor_t * this) {
-        this->owner = 0;
-        this->recursion = 0;
-}
+void enter(monitor *);
+void leave(monitor *);
 
-void enter(__monitor_t *);
-void leave(__monitor_t *);
-
-struct monitor_guard_t {
-        __monitor_t * m;
+struct monitor_guard {
+        monitor * m;
 };
 
-static inline void ?{}( monitor_guard_t * this, __monitor_t * m ) {
+static inline void ?{}( monitor_guard * this, monitor * m ) {
         this->m = m;
         enter( this->m );
 }
 
-static inline void ^?{}( monitor_guard_t * this ) {
+static inline void ^?{}( monitor_guard * this ) {
         leave( this->m );
 }