Changes in libcfa/src/concurrency/kernel.cfa [d3605f8:6ddef36]

File:

• libcfa/src/concurrency/kernel.cfa (modified) (13 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -27 +27 @@
 extern "C" {
         #include <sys/eventfd.h>
-        #include <sys/uio.h>
 }
 
@@ -126 +125 @@
 static void __wake_one(cluster * cltr);
 
-static void idle_sleep(processor * proc, io_future_t & future, iovec & iov);
+static void idle_sleep(processor * proc, io_future_t & future, char buf[]);
 static bool mark_idle (__cluster_proc_list & idles, processor & proc);
 static void mark_awake(__cluster_proc_list & idles, processor & proc);
@@ -132 +131 @@
 extern void __cfa_io_start( processor * );
 extern bool __cfa_io_drain( processor * );
-extern bool __cfa_io_flush( processor *, int min_comp );
+extern bool __cfa_io_flush( processor *, bool wait );
 extern void __cfa_io_stop ( processor * );
 static inline bool __maybe_io_drain( processor * );
 
-#if defined(CFA_WITH_IO_URING_IDLE)
-        extern bool __kernel_read(processor * proc, io_future_t & future, iovec &, int fd);
+#if defined(IO_URING_IDLE) && defined(CFA_HAVE_LINUX_IO_URING_H)
+        extern bool __kernel_read(processor * proc, io_future_t & future, char buf[], int fd);
 #endif
 
@@ -172 +171 @@
         io_future_t future; // used for idle sleep when io_uring is present
         future.self.ptr = 1p;  // mark it as already fulfilled so we know if there is a pending request or not
-        eventfd_t idle_val;
-        iovec idle_iovec = { &idle_val, sizeof(idle_val) };
+        char buf[sizeof(uint64_t)];
 
         __cfa_io_start( this );
@@ -208 +206 @@
 
                         if( !readyThread ) {
-                                __cfa_io_flush( this, 0 );
+                                __cfa_io_flush( this, false );
 
                                 readyThread = __next_thread_slow( this->cltr );
@@ -239 +237 @@
                                 }
 
-                                idle_sleep( this, future, idle_iovec );
+                                idle_sleep( this, future, buf );
 
                                 // We were woken up, remove self from idle
@@ -260 +258 @@
 
                         if(this->io.pending && !this->io.dirty) {
-                                __cfa_io_flush( this, 0 );
+                                __cfa_io_flush( this, false );
                         }
 
@@ -276 +274 @@
 
                                 // If we can't find a thread, might as well flush any outstanding I/O
-                                if(this->io.pending) { __cfa_io_flush( this, 0 ); }
+                                if(this->io.pending) { __cfa_io_flush( this, false ); }
 
                                 // Spin a little on I/O, just in case
@@ -371 +369 @@
 
                         if(this->io.pending && !this->io.dirty) {
-                                __cfa_io_flush( this, 0 );
+                                __cfa_io_flush( this, false );
                         }
 
@@ -381 +379 @@
 
                 __cfadbg_print_safe(runtime_core, "Kernel : core %p stopping\n", this);
-        }
-
-        for(int i = 0; !available(future); i++) {
-                if(i > 1000) __cfaabi_dbg_write( "ERROR: kernel has bin spinning on a flush after exit loop.\n", 60);
-                __cfa_io_flush( this, 1 );
         }
 
@@ -786 +779 @@
 }
 
-static void idle_sleep(processor * this, io_future_t & future, iovec & iov) {
-        #if !defined(CFA_WITH_IO_URING_IDLE)
+static void idle_sleep(processor * this, io_future_t & future, char buf[]) {
+        #if !defined(IO_URING_IDLE) || !defined(CFA_HAVE_LINUX_IO_URING_H)
                 #if !defined(__CFA_NO_STATISTICS__)
                         if(this->print_halts) {
@@ -820 +813 @@
                 #endif
         #else
+                #if !defined(CFA_HAVE_IORING_OP_READ)
+                        #error this is only implemented if the read is present
+                #endif
                 // Do we already have a pending read
                 if(available(future)) {
@@ -825 +821 @@
                         reset(future);
 
-                        __kernel_read(this, future, iov, this->idle_fd );
-                }
-
-                __cfa_io_flush( this, 1 );
+                        __kernel_read(this, future, buf, this->idle_fd );
+                }
+
+                __cfa_io_flush( this, true );
         #endif
 }