Changeset 92538ab for libcfa/src/concurrency/io

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

Location:

libcfa/src/concurrency/io

Files:

• setup.cfa (modified) (8 diffs)
• types.hfa (modified) (4 diffs)

libcfa/src/concurrency/io/setup.cfa

@@ -32 +32 @@
 
         void __cfa_io_start( processor * proc ) {}
-        bool __cfa_io_flush( processor * proc, int ) { return false; }
+        bool __cfa_io_flush( processor * proc ) { return false; }
+        bool __cfa_io_drain( processor * proc ) __attribute__((nonnull (1))) { return false; }
+        void __cfa_io_idle ( processor * ) __attribute__((nonnull (1))) {}
         void __cfa_io_stop ( processor * proc ) {}
 
@@ -39 +41 @@
 
 #else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
         #include <errno.h>
         #include <stdint.h>
@@ -56 +60 @@
 
         #include "bitmanip.hfa"
-        #include "kernel_private.hfa"
+        #include "fstream.hfa"
+        #include "kernel/private.hfa"
+        #include "limits.hfa"
         #include "thread.hfa"
+#pragma GCC diagnostic pop
 
         void ?{}(io_context_params & this) {
@@ -111 +118 @@
                 this.ext_sq.empty = true;
                 (this.ext_sq.queue){};
-                __io_uring_setup( this, cl.io.params, proc->idle_fd );
+                __io_uring_setup( this, cl.io.params, proc->idle_wctx.evfd );
                 __cfadbg_print_safe(io_core, "Kernel I/O : Created ring for io_context %u (%p)\n", this.fd, &this);
         }
@@ -121 +128 @@
                 __cfadbg_print_safe(io_core, "Kernel I/O : Destroyed ring for io_context %u\n", this.fd);
         }
-
-        extern void __disable_interrupts_hard();
-        extern void __enable_interrupts_hard();
 
         static void __io_uring_setup( $io_context & this, const io_context_params & params_in, int procfd ) {
@@ -213 +217 @@
 
                 // completion queue
+                cq.lock      = false;
+                cq.id        = MAX;
+                cq.ts        = rdtscl();
                 cq.head      = (volatile __u32 *)(((intptr_t)cq.ring_ptr) + params.cq_off.head);
                 cq.tail      = (volatile __u32 *)(((intptr_t)cq.ring_ptr) + params.cq_off.tail);
@@ -226 +233 @@
                         __cfadbg_print_safe(io_core, "Kernel I/O : registering %d for completion with ring %d\n", procfd, fd);
 
-                        __disable_interrupts_hard();
-
                         int ret = syscall( __NR_io_uring_register, fd, IORING_REGISTER_EVENTFD, &procfd, 1);
                         if (ret < 0) {
                                 abort("KERNEL ERROR: IO_URING EVENTFD REGISTER - %s\n", strerror(errno));
                         }
-
-                        __enable_interrupts_hard();
 
                         __cfadbg_print_safe(io_core, "Kernel I/O : registered %d for completion with ring %d\n", procfd, fd);
@@ -258 +261 @@
                 struct __sub_ring_t & sq = this.sq;
                 struct __cmp_ring_t & cq = this.cq;
+                {
+                        __u32 fhead = sq.free_ring.head;
+                        __u32 ftail = sq.free_ring.tail;
+
+                        __u32 total = *sq.num;
+                        __u32 avail = ftail - fhead;
+
+                        if(avail != total) abort | "Processor (" | (void*)this.proc | ") tearing down ring with" | (total - avail) | "entries allocated but not submitted, out of" | total;
+                }
 
                 // unmap the submit queue entries

libcfa/src/concurrency/io/types.hfa

@@ -23 +23 @@
 #include "bits/locks.hfa"
 #include "bits/queue.hfa"
+#include "iofwd.hfa"
 #include "kernel/fwd.hfa"
+#include "limits.hfa"
 
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
@@ -77 +79 @@
 
         struct __cmp_ring_t {
+                volatile bool lock;
+
+                unsigned id;
+
+                unsigned long long ts;
+
                 // Head and tail of the ring
                 volatile __u32 * head;
@@ -128 +136 @@
         };
 
+        static inline unsigned long long ts($io_context *& this) {
+                const __u32 head = *this->cq.head;
+                const __u32 tail = *this->cq.tail;
+
+                if(head == tail) return MAX;
+
+                return this->cq.ts;
+        }
+
         struct __pending_alloc {
                 inline __outstanding_io;
@@ -170 +187 @@
         // void __ioctx_prepare_block($io_context & ctx);
 #endif
-
-//-----------------------------------------------------------------------
-// IO user data
-struct io_future_t {
-        future_t self;
-        __s32 result;
-};
-
-static inline {
-        thread$ * fulfil( io_future_t & this, __s32 result, bool do_unpark = true ) {
-                this.result = result;
-                return fulfil(this.self, do_unpark);
-        }
-
-        // Wait for the future to be fulfilled
-        bool wait     ( io_future_t & this ) { return wait     (this.self); }
-        void reset    ( io_future_t & this ) { return reset    (this.self); }
-        bool available( io_future_t & this ) { return available(this.self); }
-}