Changeset 515a037 for tests/concurrent/waitfor/recurse.c

Timestamp:

Dec 12, 2018, 3:52:19 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

1b8f13f0

Parents:

cdc02f2 (diff), 85acec94 (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 shared_library

File:

• tests/concurrent/waitfor/recurse.c (modified) (4 diffs)

tests/concurrent/waitfor/recurse.c

@@ -95 +95 @@
         rand_yield();
 
-        sout | "1st" | endl;
+        sout | "1st" | nl;
 
         return this.counter < N ? (state_t)this.actions[idx] : (state_t)STOP;
@@ -123 +123 @@
                         case THIRD  : while( !global.ready ) { yield(); } this.state = call3( global, this.idx ); break;
                         case LAST   : while( !global.ready ) { yield(); } this.state = call4( global, this.idx ); break;
-                        case STOP   : serr | "This should not happen" | endl;
+                        case STOP   : serr | "This should not happen" | nl;
                 }
         }
@@ -132 +132 @@
 int main() {
         srandom( time(NULL) );
-        sout | "Starting" | endl;
+        sout | nlOff;                                   // turn off auto newline
+        sout | "Starting" | nl;
         {
                 waiter_t waiters[4] = {
@@ -142 +143 @@
                 the_threads = waiters;
         }
-        sout | "Stopping" | endl;
+        sout | "Stopping" | nl;
 }