Changeset cc7f4b1 for src/libcfa/concurrency/monitor

Timestamp:

Feb 28, 2017, 12:40:47 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

2781e65, fd061ed3

Parents:

4868be4

Message:

• renamed monitor to monitor_t since the type should not be exposed to users
• added support for recursion in monitors

File:

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

src/libcfa/concurrency/monitor

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