Changeset b826e6b for src/tests/sched-int-block.c

Timestamp:

Jul 19, 2017, 11:49:33 AM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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/tests/sched-int-block.c (modified) (5 diffs)

src/tests/sched-int-block.c

@@ -6 +6 @@
 
 #ifndef N
-#define N 100_000
+#define N 10_000
 #endif
 
@@ -31 +31 @@
 //------------------------------------------------------------------------------
 void wait_op( global_data_t * mutex a, global_data_t * mutex b, unsigned i ) {
-        wait( &cond, (uintptr_t)this_thread() );
+        wait( &cond, (uintptr_t)this_thread );
 
         yield( ((unsigned)rand48()) % 10 );
@@ -40 +40 @@
         }
 
-        a->last_thread = b->last_thread = this_thread();
+        a->last_thread = b->last_thread = this_thread;
 
         yield( ((unsigned)rand48()) % 10 );
@@ -56 +56 @@
         yield( ((unsigned)rand48()) % 10 );
 
-        a->last_thread = b->last_thread = a->last_signaller = b->last_signaller = this_thread();
+        a->last_thread = b->last_thread = a->last_signaller = b->last_signaller = this_thread;
 
         if( !is_empty( &cond ) ) {
@@ -86 +86 @@
 //------------------------------------------------------------------------------
 void barge_op( global_data_t * mutex a ) {
-        a->last_thread = this_thread();
+        a->last_thread = this_thread;
 }