Changeset 90152a4 for tests/coroutine/prodcons.c

Timestamp:

Aug 27, 2018, 4:40:34 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:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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:

• tests/coroutine/prodcons.c (moved) (moved from src/tests/coroutine/prodcons.c ) (4 diffs)

tests/coroutine/prodcons.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// prodcons.c -- 
-// 
+//
+// prodcons.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Mon Sep 18 12:23:39 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 30 23:06:05 2017
-// Update Count     : 42
-// 
+// Last Modified On : Sat Aug 18 12:55:10 2018
+// Update Count     : 51
+//
 
-#include <fstream>
-#include <coroutine>
-#include <stdlib>                                                                               // random
+#include <fstream.hfa>
+#include <coroutine.hfa>
+#include <stdlib.hfa>                                                                   // random
 #include <unistd.h>                                                                             // getpid
 
@@ -24 +24 @@
 
 coroutine Prod {
-        Cons *c;
+        Cons * c;
         int N, money, receipt;
 };
-void main( Prod & prod ) {                                                              // starter ::main
+void main( Prod & prod ) with( prod ) {                                 // starter ::main
         // 1st resume starts here
-        for ( int i = 0; i < prod.N; i += 1 ) {
+        for ( i; N ) {                                                                          // N pairs of values
                 int p1 = random( 100 );
                 int p2 = random( 100 );
                 sout | p1 | " " | p2 | endl;
-                int status = delivery( *prod.c, p1, p2 );
-                sout | " $" | prod.money | endl;
+                int status = delivery( *c, p1, p2 );
+                sout | " $" | money | endl;
                 sout | status | endl;
-                prod.receipt += 1;
+                receipt += 1;
         }
-        stop( *prod.c );
+        stop( *c );
         sout | "prod stops" | endl;
 }
@@ -64 +64 @@
 }
 void ^?{}( Cons & cons ) {}
-void main( Cons & cons ) {                                                              // starter prod
+void main( Cons & cons ) with( cons ) {                                 // starter prod
         // 1st resume starts here
         int money = 1, receipt;
-        for ( ; ! cons.done; ) {
-                sout | cons.p1 | " " | cons.p2 | endl;
+        for ( ; ! done; ) {
+                sout | p1 | " " | p2 | endl;
                 sout | " $" | money | endl;
-                cons.status += 1;
-                receipt = payment( *cons.p, money );
+                status += 1;
+                receipt = payment( *p, money );
                 sout | " #" | receipt | endl;
                 money += 1;
@@ -90 +90 @@
         Prod prod;
         Cons cons = { prod };
-        random_seed( /* getpid() */ 103 );                                      // fixed seed for testing
+        srandom( /* getpid() */ 103 );                                          // fixed seed for testing
         start( prod, 5, cons );
         sout | "main stops" | endl;