Changeset 1fbab5a for src/libcfa/concurrency/monitor.c

Timestamp:

Mar 16, 2017, 4:50:08 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

395fc37, 64ac636, ef42b143

Parents:

2f26687a (diff), d6d747d (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/monitor.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// __monitor_t.c --
+// monitor_desc.c --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(__monitor_t * this) {
+void enter(monitor_desc * this) {
         lock( &this->lock );
-        thread * thrd = this_thread();
+        thread_desc * thrd = this_thread();
 
         if( !this->owner ) {
@@ -45 +45 @@
 }
 
-void leave(__monitor_t * this) {
+void leave(monitor_desc * this) {
         lock( &this->lock );
 
-        thread * thrd = this_thread();
+        thread_desc * thrd = this_thread();
         assert( thrd == this->owner );
 
@@ -55 +55 @@
 
         //If we left the last level of recursion it means we are changing who owns the monitor
-        thread * new_owner = 0;
+        thread_desc * new_owner = 0;
         if( this->recursion == 0) {
                 //Get the next thread in the list
@@ -72 +72 @@
 }
 
-void enter(__monitor_t ** monitors, int count) {
+void enter(monitor_desc ** monitors, int count) {
         for(int i = 0; i < count; i++) {
                 // printf("%d\n", i);
@@ -79 +79 @@
 }
 
-void leave(__monitor_t ** monitors, int count) {
+void leave(monitor_desc ** monitors, int count) {
         for(int i = count - 1; i >= 0; i--) {
                 // printf("%d\n", i);