Changeset 54dd994 for tests/concurrent/examples/gortn.cfa

Timestamp:

Jun 24, 2019, 10:30:47 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

84917e2

Parents:

3c6e417 (diff), 9e0a360 (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:

• tests/concurrent/examples/gortn.cfa (modified) (3 diffs)

tests/concurrent/examples/gortn.cfa

@@ -10 +10 @@
 // Created On       : Wed Feb 20 08:02:37 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 20 08:35:55 2019
-// Update Count     : 3
+// Last Modified On : Fri Jun 21 08:25:03 2019
+// Update Count     : 4
 // 
 
@@ -18 +18 @@
 
 struct Msg { int i, j; };
-thread Gortn { int i;  float f;  Msg m; };
-void ^?{}( Gortn & mutex ) {}
-void mem1( Gortn & mutex gortn, int i ) { gortn.i = i; }
-void mem2( Gortn & mutex gortn, float f ) { gortn.f = f; }
-void mem3( Gortn & mutex gortn, Msg m ) { gortn.m = m; }
+thread GoRtn { int i;  float f;  Msg m; };
+void ^?{}( GoRtn & mutex ) {}
+void mem1( GoRtn & mutex gortn, int i ) { gortn.i = i; }
+void mem2( GoRtn & mutex gortn, float f ) { gortn.f = f; }
+void mem3( GoRtn & mutex gortn, Msg m ) { gortn.m = m; }
 
-void main( Gortn & gortn ) with( gortn ) {
-        for ( ;; ) {
+void main( GoRtn & gortn ) with( gortn ) {
+        for () {
                 waitfor( mem1, gortn ) sout | i;
                 or waitfor( mem2, gortn ) sout | f;
@@ -33 +33 @@
 }
 int main() {
-        Gortn gortn;                                                                            // start thread
+        GoRtn gortn;                                                                            // start thread
         mem1( gortn, 0 );
         mem2( gortn, 2.5 );