Changeset 51f3798

Timestamp:

Feb 23, 2017, 5:10:50 PM (8 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:

6ce9f7c7

Parents:

ead8c7e

Message:

Added raii guard for monitors

Location:

src

Files:

• libcfa/concurrency/monitor (modified) (1 diff)
• libcfa/concurrency/monitor.c (modified) (1 diff)
• tests/monitor.c (modified) (1 diff)

src/libcfa/concurrency/monitor

@@ -30 +30 @@
 void leave(monitor *);
 
+struct monitor_guard {
+        monitor * m;
+};
+
+static inline void ?{}( monitor_guard * this, monitor * m ) {
+        this->m = m;
+        enter( this->m );
+}
+
+static inline void ^?{}( monitor_guard * this ) {
+        leave( this->m );
+}
+
 #endif //MONITOR_H

src/libcfa/concurrency/monitor.c

@@ -44 +44 @@
 
         unlock( &this->lock );
+
         if( this->holder ) ScheduleThread( this->holder );
 }

src/tests/monitor.c

@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        enter( &this->m );
+        monitor_guard g = { &this->m };
         this->value += 1;
-        leave( &this->m );
 }