Changeset 7f6a7c9 for tests/io/comp_fair.cfa

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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 pthread-emulation

File:

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

tests/io/comp_fair.cfa

@@ -27 +27 @@
 
 struct {
-      barrier & bar;
-      int pipe[2];
+        barrier & bar;
+        int pipe[2];
 
 } globals;
@@ -65 +65 @@
 thread Reader {};
 void main(Reader & this) {
-      bool do_read = has_user_level_blocking( (fptr_t)async_read );
+        char thrash[1];
+        bool do_read = has_user_level_blocking( (fptr_t)async_read );
 
-      for(TIMES) {
-            io_future_t f;
-            if ( do_read ) {
-                  char thrash[1];
-                  async_read(f, globals.pipe[0], thrash, 1, 0);
-            } else {
-                  fulfil(f, 0); // If we don't have user-level blocking just play along
-            }
+        for(TIMES) {
+                io_future_t f;
+                if ( do_read ) {
+                        async_read(f, globals.pipe[0], thrash, 1, 0);
+                } else {
+                        fulfil(f, 0); // If we don't have user-level blocking just play along
+                }
 
-            block( globals.bar );
+                block( globals.bar );
 
                 yield( prng( this, 15 ) );
 
-            unsigned i = __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST );
+                unsigned i = __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST );
                 if(0 == (i % 100)) sout | i;
 
-            wait( f );
+                wait( f );
 
-            if(f.result < 0)
-                  abort | "Read error" | -f.result | ":" | strerror(-f.result);
+                if(f.result < 0)
+                        abort | "Read error" | -f.result | ":" | strerror(-f.result);
 
-            block( globals.bar );
-      }
+                block( globals.bar );
+        }
 }
 
@@ -97 +97 @@
 thread Writer {};
 void main(Writer & this) {
-      for(TIMES) {
-            block( globals.bar );
+        for(TIMES) {
+                block( globals.bar );
 
-            sleep( 1`us );
+                sleep( 1`us );
 
-            char buf[1] = { '+' };
-            int ret = write( globals.pipe[1], buf, 1 );
-            if(ret < 0)
-                  abort | "Write error" | errno | ":" | strerror(errno);
+                char buf[1] = { '+' };
+                int ret = write( globals.pipe[1], buf, 1 );
+                if(ret < 0)
+                        abort | "Write error" | errno | ":" | strerror(errno);
 
-            block( globals.bar );
-      }
+                block( globals.bar );
+        }
 }
 
@@ -122 +122 @@
 
 int main() {
-      barrier bar = { 2 };
-      &globals.bar = &bar;
-      int ret = pipe(globals.pipe);
-      if(ret != 0)
-            abort | "Pipe error" | errno | ":" | strerror(errno);
+        barrier bar = { 2 };
+        &globals.bar = &bar;
+        int ret = pipe(globals.pipe);
+        if(ret != 0)
+                abort | "Pipe error" | errno | ":" | strerror(errno);
 
         processor p;
@@ -134 +134 @@
                 Spinner s;
                 Reader ior;
-            Writer iow;
+                Writer iow;
         }
         sout | "done";