Changes in tests/concurrent/futures/multi.cfa [e2cc3c7:44e37ef]

File:

• tests/concurrent/futures/multi.cfa (modified) (4 diffs)

tests/concurrent/futures/multi.cfa

@@ -5 +5 @@
 
 thread Server {
-        int pending, done, iteration;
+        int cnt, iteration;
         multi_future(int) * request;
 };
 
 void ?{}( Server & this ) {
-        ((thread&)this){"Server Thread"};
-        this.pending = 0;
-        this.done = 0;
+        this.cnt = 0;
         this.iteration = 0;
         this.request = 0p;
@@ -18 +16 @@
 
 void ^?{}( Server & mutex this ) {
-        assert(this.pending == 0);
-        this.request = 0p;
+        assert(this.cnt == 0);
+    this.request = 0p;
 }
 
@@ -26 +24 @@
 }
 
-void call( Server & mutex this ) {
-        this.pending++;
+void process( Server & mutex this ) {
+        fulfil( *this.request, this.iteration );
+        this.iteration++;
 }
 
-void finish( Server & mutex this ) {
-        this.done++;
+void call( Server & mutex this ) {
+        this.cnt++;
 }
 
+void finish( Server & mutex this ) { }
+
 void main( Server & this ) {
-        MAIN_LOOP:
         for() {
                 waitfor( ^?{} : this ) {
                         break;
                 }
-                or waitfor( call: this ) {
-                        if (this.pending != NFUTURES) { continue MAIN_LOOP; }
-
-                        this.pending = 0;
-                        fulfil( *this.request, this.iteration );
-                        this.iteration++;
-
-                        for(NFUTURES) {
-                                waitfor( finish: this );
+                or when( this.cnt < NFUTURES ) waitfor( call: this ) {
+                        if (this.cnt == NFUTURES) {
+                                process(this);
                         }
-
-                        reset( *this.request );
-                        this.done = 0;
+                }
+                or waitfor( finish: this ) {
+                        if (this.cnt == NFUTURES) {
+                                reset( *this.request );
+                                this.cnt = 0;
+                        }
                 }
         }
@@ -60 +57 @@
 Server * the_server;
 thread Worker {};
-void ?{}(Worker & this) {
-        ((thread&)this){"Worker Thread"};
-}
-
 multi_future(int) * shared_future;