Changes in libcfa/src/concurrency/io.cfa [5751a56:20ab637]

File:

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

libcfa/src/concurrency/io.cfa

@@ -16 +16 @@
 #if defined(__CFA_DEBUG__)
         // #define __CFA_DEBUG_PRINT_IO__
-        // #define __CFA_DEBUG_PRINT_IO_CORE__
+        #define __CFA_DEBUG_PRINT_IO_CORE__
 #endif
 
@@ -22 +22 @@
 #include "bitmanip.hfa"
 
-#if !defined(CFA_HAVE_LINUX_IO_URING_H)
+#if !defined(HAVE_LINUX_IO_URING_H)
         void __kernel_io_startup( cluster &, unsigned, bool ) {
                 // Nothing to do without io_uring
@@ -218 +218 @@
                         // adjust the size according to the parameters
                         if ((params.features & IORING_FEAT_SINGLE_MMAP) != 0) {
-                                cq.ring_sz = sq.ring_sz = max(cq.ring_sz, sq.ring_sz);
+                                cq->ring_sz = sq->ring_sz = max(cq->ring_sz, sq->ring_sz);
                         }
                 #endif
@@ -232 +232 @@
                         // mmap the Completion Queue into existence (may or may not be needed)
                         if ((params.features & IORING_FEAT_SINGLE_MMAP) != 0) {
-                                cq.ring_ptr = sq.ring_ptr;
+                                cq->ring_ptr = sq->ring_ptr;
                         }
                         else
@@ -490 +490 @@
         static uint32_t __release_consumed_submission( struct __io_data & ring );
 
-        static inline void process(struct io_uring_cqe & cqe, struct __processor_id_t * id ) {
-                struct __io_user_data_t * data = (struct __io_user_data_t *)(uintptr_t)cqe.user_data;
-                __cfadbg_print_safe( io, "Kernel I/O : Syscall completed : cqe %p, result %d for %p\n", data, cqe.res, data->thrd );
-
-                data->result = cqe.res;
-                if(!id) { unpark(     data->thrd __cfaabi_dbg_ctx2 ); }
-                else  { __unpark( id, data->thrd __cfaabi_dbg_ctx2 ); }
-        }
-
         // Process a single completion message from the io_uring
         // This is NOT thread-safe
         static [int, bool] __drain_io( & struct __io_data ring, * sigset_t mask ) {
                 /* paranoid */ verify( !kernelTLS.preemption_state.enabled );
+                const uint32_t smask = *ring.submit_q.mask;
 
                 unsigned to_submit = 0;
@@ -547 +539 @@
                         /* paranoid */ verify(&cqe);
 
-                        process( cqe, !mask ? (struct __processor_id_t *)0p : &ring.poller.slow.id );
+                        struct __io_user_data_t * data = (struct __io_user_data_t *)(uintptr_t)cqe.user_data;
+                        __cfadbg_print_safe( io, "Kernel I/O : Performed reading io cqe %p, result %d for %p\n", data, cqe.res, data->thrd );
+
+                        data->result = cqe.res;
+                        if(!mask) { unpark( data->thrd __cfaabi_dbg_ctx2 ); }
+                        else      { __unpark( &ring.poller.slow.id, data->thrd __cfaabi_dbg_ctx2 ); }
                 }