Changes in libcfa/src/concurrency/io/setup.cfa [7425720:a986807]

File:

• libcfa/src/concurrency/io/setup.cfa (modified) (8 diffs)

libcfa/src/concurrency/io/setup.cfa

@@ -32 +32 @@
 
         void __cfa_io_start( processor * proc ) {}
-        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))) {}
+        bool __cfa_io_flush( processor * proc, int ) { return false; }
         void __cfa_io_stop ( processor * proc ) {}
 
@@ -41 +39 @@
 
 #else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
         #include <errno.h>
         #include <stdint.h>
@@ -60 +56 @@
 
         #include "bitmanip.hfa"
-        #include "fstream.hfa"
-        #include "kernel/private.hfa"
-        #include "limits.hfa"
+        #include "kernel_private.hfa"
         #include "thread.hfa"
-#pragma GCC diagnostic pop
 
         void ?{}(io_context_params & this) {
@@ -118 +111 @@
                 this.ext_sq.empty = true;
                 (this.ext_sq.queue){};
-                __io_uring_setup( this, cl.io.params, proc->idle_wctx.evfd );
+                __io_uring_setup( this, cl.io.params, proc->idle_fd );
                 __cfadbg_print_safe(io_core, "Kernel I/O : Created ring for io_context %u (%p)\n", this.fd, &this);
         }
@@ -128 +121 @@
                 __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 ) {
@@ -217 +213 @@
 
                 // 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);
@@ -233 +226 @@
                         __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);
@@ -261 +258 @@
                 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