Changeset 6b224a52 for src/libcfa/concurrency/monitor

Timestamp:

Aug 25, 2017, 12:11:53 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:

bf7b9da7

Parents:

135b431 (diff), f676b84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/monitor

@@ -22 +22 @@
 #include "stdlib"
 
-static inline void ?{}(monitor_desc * this) {
-        (&this->lock){};
-        this->owner = NULL;
-        (&this->entry_queue){};
-        (&this->signal_stack){};
-        this->recursion = 0;
-        this->acceptables = NULL;
-        this->acceptable_count = 0;
-        this->accepted_index = -1;
+static inline void ?{}(monitor_desc & this) {
+        (this.lock){};
+        this.owner = NULL;
+        (this.entry_queue){};
+        (this.signal_stack){};
+        this.recursion = 0;
+        this.acceptables = NULL;
+        this.acceptable_count = 0;
+        this.accepted_index = -1;
 }
 
@@ -45 +45 @@
 }
 
-void ?{}( monitor_guard_t * this, monitor_desc ** m, int count, void (*func)() );
-void ^?{}( monitor_guard_t * this );
+void ?{}( monitor_guard_t & this, monitor_desc ** m, int count );
+void ^?{}( monitor_guard_t & this );
 
 //-----------------------------------------------------------------------------
@@ -71 +71 @@
 };
 
-void ?{}( __condition_blocked_queue_t * );
+void ?{}( __condition_blocked_queue_t & );
 void append( __condition_blocked_queue_t *, __condition_node_t * );
 __condition_node_t * pop_head( __condition_blocked_queue_t * );
@@ -81 +81 @@
 };
 
-static inline void ?{}( condition * this ) {
-        this->monitors = NULL;
-        this->monitor_count = 0;
+static inline void ?{}( condition & this ) {
+        this.monitors = NULL;
+        this.monitor_count = 0;
 }
 
-static inline void ^?{}( condition * this ) {
-        free( this->monitors );
+static inline void ^?{}( condition & this ) {
+        free( this.monitors );
 }