Changeset 4ee36bf0 for src/tests/sched-int-block.c

Timestamp:

Nov 8, 2017, 2:50:35 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

049ead9

Parents:

136ccd7 (diff), e35f30a (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' into cleanup-dtors

File:

• src/tests/sched-int-block.c (modified) (2 diffs)

src/tests/sched-int-block.c

@@ -47 +47 @@
 //------------------------------------------------------------------------------
 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( random( 10 ) );
@@ -74 +74 @@
         [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = this_thread;
 
-        if( !is_empty( &cond ) ) {
+        if( !is_empty( cond ) ) {
 
-                thread_desc * next = front( &cond );
+                thread_desc * next = front( cond );
 
-                if( ! signal_block( &cond ) ) {
+                if( ! signal_block( cond ) ) {
                         sout | "ERROR expected to be able to signal" | endl;
                         abort();