Changes in tests/concurrency/waituntil/futures.cfa [b5749f9:d923fca6]

File:

• tests/concurrency/waituntil/futures.cfa (modified) (2 diffs)

tests/concurrency/waituntil/futures.cfa

@@ -1 @@
-#include <fstream.hfa>
+#include <select.hfa>
 #include <future.hfa>
 #include <thread.hfa>
@@ -5 +5 @@
 future(int) A, B, C;
 
-thread Server {};
-void main( Server & ) {
-        B( 3 ); // fulfil( B, 3 );
-        A( 2 );
-        C( 4 );
+semaphore s{0};
+
+thread Server1 {};
+void main( Server1 & ) {
+    fulfil(B, 3);
+    P( s );
+    fulfil(A, 2);
+    fulfil(C, 4);
+}
+
+thread Server2 {};
+void main( Server2 & ) {
+    fulfil(B, 6);
+    fulfil(A, 5);
+    fulfil(C, 7);
 }
 
 int main() {
-        processor p;
-    sout | "start";
-        {
-                size_t count = 0;
-                Server s;
-                for ( ; count < 3; ) {
-                        waituntil( A ) { count += 1; A(); /* get( A ) */ }
-                        or waituntil( B ) { count += 1; B(); }
-                        or waituntil( C ) { count += 1; C(); }
-                }
-                reset( A ); reset( B ); reset( C );
-        }
-        {
-                size_t count = 0;
-                Server s;
-                for ( ; count < 3; ) {
-                        waituntil( A ) { count += 1; A(); /* get( A ) */ }
-                        or waituntil( B ) { count += 1; B(); }
-                        and waituntil( C ) { count += 1; C(); }
-                }
-                reset( A ); reset( B ); reset( C );
-        }
-        size_t count = 0;
-        for ( i; 8 ) {
-                {
-                        Server s;
-                        when( i % 2 == 0 ) waituntil( A ) { count += 1; A(); }
-                        or when( i % 4 < 2 ) waituntil( B ) { count += 1; B(); }
-                        and when( i < 4 ) waituntil( C ) { count += 1; C(); }
-                }
-                reset( A ); reset( B ); reset( C );
-                {
-                        Server s;
-                        ( when( i % 2 == 0 ) waituntil( A ) { count += 1; A(); }
-                          or when( i % 4 < 2 ) waituntil( B ) { count += 1; B(); }
-                        ) and when( i < 4 ) waituntil( C ) { count += 1; C(); }
-                }
-                reset( A ); reset( B ); reset( C );
-        } // for
-        sout | "end";
+    processor proc[1];
+    printf("start\n"); // currently not working
+    {
+        Server1 s1;
+        waituntil( A ) { get(A); }
+        or waituntil( B ) { get(B); V( s ); }
+        and waituntil( C ) { get(C); }
+    }
+    reset(A);
+    reset(B);
+    reset(C);
+    for ( int i = 0; i < 8; i++ ) {
+        {
+            Server2 s2;
+            when( i % 2 == 0 ) waituntil( A ) { get(A); }
+            or when( i % 4 < 2 ) waituntil( B ) { get(B); }
+            and when( i < 4 ) waituntil( C ) { get(C); }
+        }
+        reset(A);
+        reset(B);
+        reset(C);
+        {
+            Server2 s2;
+            (
+                when( i % 2 == 0 ) waituntil( A ) { get(A); }
+                or when( i % 4 < 2 ) waituntil( B ) { get(B); }
+            )
+            and when( i < 4 ) waituntil( C ) { get(C); }
+        }
+        reset(A);
+        reset(B);
+        reset(C);
+    }
+
+    printf("end\n");
+    return 0;
 }