Changeset e99e43f for tests/concurrent/thread.cfa

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (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.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• tests/concurrent/thread.cfa (moved) (moved from tests/concurrent/thread.c ) (4 diffs)

tests/concurrent/thread.cfa

@@ -12 +12 @@
 void main(First& this) {
         for(int i = 0; i < 10; i++) {
-                sout | "First : Suspend No." | i + 1 | endl;
+                sout | "First : Suspend No." | i + 1;
                 yield();
         }
@@ -21 +21 @@
         P(*this.lock);
         for(int i = 0; i < 10; i++) {
-                sout | "Second : Suspend No." | i + 1 | endl;
+                sout | "Second : Suspend No." | i + 1;
                 yield();
         }
@@ -29 +29 @@
 int main(int argc, char* argv[]) {
         semaphore lock = { 0 };
-        sout | "User main begin" | endl;
+        sout | "User main begin";
         {
                 processor p;
@@ -37 +37 @@
                 }
         }
-        sout | "User main end" | endl;
+        sout | "User main end";
 }