Changeset 1417f6b for tests/io

Timestamp:

Apr 1, 2022, 1:08:24 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

e71e94a

Parents:

31ef267

Message:

Changed comp_fair to use a barrier rather than a semaphore.

File:

• tests/io/comp_fair.cfa (modified) (9 diffs)

tests/io/comp_fair.cfa

@@ -16 +16 @@
 
 
-#include <concurrency/locks.hfa>
+#include <concurrency/barrier.hfa>
 #include <fstream.hfa>
 #include <iofwd.hfa>
@@ -27 +27 @@
 
 struct {
-      semaphore sem;
+      barrier & bar;
       int pipe[2];
 
@@ -59 +59 @@
                 yield();
         }
-
-      mutex(sout) sout | "Spinner done";
 }
 
@@ -70 +68 @@
 
       for(TIMES) {
-                yield( prng( this, 15 ) );
-
             io_future_t f;
             if ( do_read ) {
@@ -80 +76 @@
             }
 
-            P( globals.sem );
+            block( globals.bar );
+
+                yield( prng( this, 15 ) );
 
             unsigned i = __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST );
@@ -89 +87 @@
             if(f.result < 0)
                   abort | "Read error" | -f.result | ":" | strerror(-f.result);
+
+            block( globals.bar );
       }
-
-      P( globals.sem );
-
-      mutex(sout) sout | "Reader done";
 }
 
@@ -102 +98 @@
 void main(Writer & this) {
       for(TIMES) {
-            yield( prng( this, 15 ) );
-
-            V( globals.sem );
+            block( globals.bar );
 
             sleep( 1`us );
@@ -113 +107 @@
                   abort | "Write error" | errno | ":" | strerror(errno);
 
+            block( globals.bar );
       }
-
-      mutex(sout) sout | "Writer done";
 }
 
@@ -126 +119 @@
                 yield();
         }
-
-      mutex(sout) sout | "Yielder done";
 }
 
 int main() {
+      barrier bar = { 2 };
+      &globals.bar = &bar;
       int ret = pipe(globals.pipe);
       if(ret != 0)