Changeset 11054eb for libcfa/src/concurrency/io

Timestamp:

Mar 17, 2021, 4:52:22 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5c2b454

Parents:

c407434e

Message:

Fix io to no longer use monitors since some usages aren't in threads

Location:

libcfa/src/concurrency/io

Files:

• setup.cfa (modified) (2 diffs)
• types.hfa (modified) (3 diffs)

libcfa/src/concurrency/io/setup.cfa

@@ -110 +110 @@
                 this.arbiter = cl.io.arbiter;
                 this.ext_sq.empty = true;
-                (this.ext_sq.blocked){};
+                (this.ext_sq.queue){};
                 __io_uring_setup( this, cl.io.params, proc->idle );
                 __cfadbg_print_safe(io_core, "Kernel I/O : Created ring for io_context %u (%p)\n", this.fd, &this);
@@ -329 +329 @@
 //=============================================================================================
         void ?{}( $io_arbiter & this ) {
-                this.pending.flag = false;
-        }
-
-        void ^?{}( $io_arbiter & mutex this ) {
-                // /* paranoid */ verify( empty(this.assigned) );
-                // /* paranoid */ verify( empty(this.available) );
-                /* paranoid */ verify( is_empty(this.pending.blocked) );
-        }
+                this.pending.empty = true;
+        }
+
+        void ^?{}( $io_arbiter & this ) {}
 
         $io_arbiter * create(void) {

libcfa/src/concurrency/io/types.hfa

@@ -22 +22 @@
 
 #include "bits/locks.hfa"
+#include "bits/queue.hfa"
 #include "kernel/fwd.hfa"
 
@@ -95 +96 @@
         };
 
+        struct __outstanding_io {
+                inline Colable;
+                single_sem sem;
+        };
+        static inline __outstanding_io *& Next( __outstanding_io * n ) { return (__outstanding_io *)Next( (Colable *)n ); }
+
+        struct __outstanding_io_queue {
+                __spinlock_t lock;
+                Queue(__outstanding_io) queue;
+                volatile bool empty;
+        };
+
+        struct __external_io {
+                inline __outstanding_io;
+                __u32 * idxs;
+                __u32 have;
+                bool lazy;
+        };
+
+
         struct __attribute__((aligned(128))) $io_context {
                 $io_arbiter * arbiter;
                 processor * proc;
 
-                struct {
-                        volatile bool empty;
-                        condition blocked;
-                } ext_sq;
+                __outstanding_io_queue ext_sq;
 
                 struct __sub_ring_t sq;
@@ -110 +128 @@
         };
 
-        monitor __attribute__((aligned(128))) $io_arbiter {
-                struct {
-                        condition blocked;
-                        $io_context * ctx;
-                        volatile bool flag;
-                } pending;
+        struct __pending_alloc {
+                inline __outstanding_io;
+                __u32 * idxs;
+                __u32 want;
+                $io_context * ctx;
+        };
+
+        struct __attribute__((aligned(128))) $io_arbiter {
+                __outstanding_io_queue pending;
         };