Changeset 0428aad for src/libcfa/concurrency

Timestamp:

Apr 28, 2017, 12:34:17 PM (9 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:

13e2c54, ad1a8dd

Parents:

f3fda4e (diff), 2e5ad9f (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.c (modified) (4 diffs)

src/libcfa/concurrency/monitor.c

@@ -144 +144 @@
 
         unsigned short count = this->monitor_count;
-        unsigned int blarg_recursions[ count ];         //Save the current recursion levels to restore them later
-        spinlock *   blarg_locks     [ count ];         //We need to pass-in an array of locks to ScheduleInternal
+        unsigned int recursions[ count ];               //Save the current recursion levels to restore them later
+        spinlock *   locks     [ count ];               //We need to pass-in an array of locks to ScheduleInternal
 
         LIB_DEBUG_PRINT_SAFE("count %i\n", count);
@@ -166 +166 @@
         append( &this->blocked, &waiter );
 
-        lock_all( this->monitors, blarg_locks, count );
-        save_recursion( this->monitors, blarg_recursions, count );
+        lock_all( this->monitors, locks, count );
+        save_recursion( this->monitors, recursions, count );
         //DON'T unlock, ask the kernel to do it
 
@@ -185 +185 @@
         LIB_DEBUG_PRINT_SAFE("\n");
 
-        //Everything is ready to go to sleep
-        ScheduleInternal( blarg_locks, count, threads, thread_count );
+        // Everything is ready to go to sleep
+        ScheduleInternal( locks, count, threads, thread_count );
 
 
@@ -193 +193 @@
 
         //We are back, restore the owners and recursions
-        lock_all( blarg_locks, count );
-        restore_recursion( this->monitors, blarg_recursions, count );
-        unlock_all( blarg_locks, count );
+        lock_all( locks, count );
+        restore_recursion( this->monitors, recursions, count );
+        unlock_all( locks, count );
 }