Changeset d3e4d6c for src/libcfa/concurrency/monitor.c

Timestamp:

Aug 23, 2017, 6:22:07 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

87e08e24, cb811ac

Parents:

9f07232 (diff), bd37119 (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 plg2:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/monitor.c (modified) (5 diffs)

src/libcfa/concurrency/monitor.c

@@ -139 +139 @@
 }
 
-void ?{}( monitor_guard_t * this, monitor_desc ** m, int count ) {
-        this->m = m;
-        this->count = count;
-        qsort(this->m, count);
-        enter( this->m, this->count );
-
-        this->prev_mntrs = this_thread->current_monitors;
-        this->prev_count = this_thread->current_monitor_count;
+void ?{}( monitor_guard_t & this, monitor_desc ** m, int count ) {
+        this.m = m;
+        this.count = count;
+        qsort(this.m, count);
+        enter( this.m, this.count );
+
+        this.prev_mntrs = this_thread->current_monitors;
+        this.prev_count = this_thread->current_monitor_count;
 
         this_thread->current_monitors      = m;
@@ -152 +152 @@
 }
 
-void ^?{}( monitor_guard_t * this ) {
-        leave( this->m, this->count );
-
-        this_thread->current_monitors      = this->prev_mntrs;
-        this_thread->current_monitor_count = this->prev_count;
-}
-
-void ?{}(__condition_node_t * this, thread_desc * waiting_thread, unsigned short count, uintptr_t user_info ) {
-        this->waiting_thread = waiting_thread;
-        this->count = count;
-        this->next = NULL;
-        this->user_info = user_info;
-}
-
-void ?{}(__condition_criterion_t * this ) {
-        this->ready  = false;
-        this->target = NULL;
-        this->owner  = NULL;
-        this->next   = NULL;
-}
-
-void ?{}(__condition_criterion_t * this, monitor_desc * target, __condition_node_t * owner ) {
-        this->ready  = false;
-        this->target = target;
-        this->owner  = owner;
-        this->next   = NULL;
+void ^?{}( monitor_guard_t & this ) {
+        leave( this.m, this.count );
+
+        this_thread->current_monitors      = this.prev_mntrs;
+        this_thread->current_monitor_count = this.prev_count;
+}
+
+void ?{}(__condition_node_t & this, thread_desc * waiting_thread, unsigned short count, uintptr_t user_info ) {
+        this.waiting_thread = waiting_thread;
+        this.count = count;
+        this.next = NULL;
+        this.user_info = user_info;
+}
+
+void ?{}(__condition_criterion_t & this ) {
+        this.ready  = false;
+        this.target = NULL;
+        this.owner  = NULL;
+        this.next   = NULL;
+}
+
+void ?{}(__condition_criterion_t & this, monitor_desc * target, __condition_node_t * owner ) {
+        this.ready  = false;
+        this.target = target;
+        this.owner  = owner;
+        this.next   = NULL;
 }
 
@@ -202 +202 @@
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
-                (&criteria[i]){ this->monitors[i], &waiter };
+                (criteria[i]){ this->monitors[i], &waiter };
                 // LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
         }
@@ -314 +314 @@
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
-                (&criteria[i]){ this->monitors[i], &waiter };
+                (criteria[i]){ this->monitors[i], &waiter };
                 // LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
                 push( &criteria[i].target->signal_stack, &criteria[i] );
@@ -505 +505 @@
 }
 
-void ?{}( __condition_blocked_queue_t * this ) {
-        this->head = NULL;
-        this->tail = &this->head;
+void ?{}( __condition_blocked_queue_t & this ) {
+        this.head = NULL;
+        this.tail = &this.head;
 }