Changeset d0c91a6 for tests/concurrent/waitfor/simple.cfa

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (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 jenkins-sandbox

File:

• tests/concurrent/waitfor/simple.cfa (moved) (moved from tests/concurrent/waitfor/simple.c ) (5 diffs)

tests/concurrent/waitfor/simple.cfa

@@ -31 +31 @@
 
 void do_wait( global_t * mutex a ) {
-        sout | "Waiting to accept" | endl;
+        sout | "Waiting to accept";
         yield( random( 10 ) );
 
-        sout | "Accepting" | endl;
+        sout | "Accepting";
 
         __acceptable_t acceptable;
@@ -43 +43 @@
         __waitfor_internal( 1, &acceptable );
 
-        sout | "Accepted" | endl;
+        sout | "Accepted";
         yield( random( 10 ) );
 }
@@ -50 +50 @@
         for( int i = 0; i < N; i++ ) {
                 do_wait( &globalA );
-                sout | i | endl;
+                sout | i;
         }
 
@@ -76 +76 @@
         srandom( time( NULL ) );
         printf("%p\n", &globalA);
-        sout | "Starting" | endl;
+        sout | "Starting";
         {
                 Acceptor r;
@@ -82 +82 @@
 
         }
-        sout | "Done" | endl;
+        sout | "Done";
 }