Changes in libcfa/src/concurrency/io.cfa [d3605f8:2514f68b]

File:

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

libcfa/src/concurrency/io.cfa

@@ -33 +33 @@
                 #include <sys/syscall.h>
                 #include <sys/eventfd.h>
-                #include <sys/uio.h>
 
                 #include <linux/io_uring.h>
@@ -134 +133 @@
         }
 
-        bool __cfa_io_flush( processor * proc, int min_comp ) {
+        bool __cfa_io_flush( processor * proc, bool wait ) {
                 /* paranoid */ verify( ! __preemption_enabled() );
                 /* paranoid */ verify( proc );
@@ -145 +144 @@
 
                 __STATS__( true, io.calls.flush++; )
-                int ret = syscall( __NR_io_uring_enter, ctx.fd, ctx.sq.to_submit, min_comp, min_comp > 0 ? IORING_ENTER_GETEVENTS : 0, (sigset_t *)0p, _NSIG / 8);
+                int ret = syscall( __NR_io_uring_enter, ctx.fd, ctx.sq.to_submit, wait ? 1 : 0, 0, (sigset_t *)0p, _NSIG / 8);
                 if( ret < 0 ) {
                         switch((int)errno) {
@@ -303 +302 @@
                 ctx->proc->io.dirty   = true;
                 if(sq.to_submit > 30 || !lazy) {
-                        __cfa_io_flush( ctx->proc, 0 );
+                        __cfa_io_flush( ctx->proc, false );
                 }
         }
@@ -503 +502 @@
         }
 
-        #if defined(CFA_WITH_IO_URING_IDLE)
-                bool __kernel_read(processor * proc, io_future_t & future, iovec & iov, int fd) {
+        #if defined(IO_URING_IDLE)
+                bool __kernel_read(processor * proc, io_future_t & future, char buf[], int fd) {
                         $io_context * ctx = proc->io.ctx;
                         /* paranoid */ verify( ! __preemption_enabled() );
@@ -519 +518 @@
                         __fill( &sqe, 1, &idx, ctx );
 
+                        sqe->opcode = IORING_OP_READ;
                         sqe->user_data = (uintptr_t)&future;
                         sqe->flags = 0;
-                        sqe->fd = fd;
+                        sqe->ioprio = 0;
+                        sqe->fd = 0;
                         sqe->off = 0;
-                        sqe->ioprio = 0;
                         sqe->fsync_flags = 0;
                         sqe->__pad2[0] = 0;
                         sqe->__pad2[1] = 0;
                         sqe->__pad2[2] = 0;
-
-                        #if defined(CFA_HAVE_IORING_OP_READ)
-                                sqe->opcode = IORING_OP_READ;
-                                sqe->addr = (uint64_t)iov.iov_base;
-                                sqe->len = iov.iov_len;
-                        #elif defined(CFA_HAVE_READV) && defined(CFA_HAVE_IORING_OP_READV)
-                                sqe->opcode = IORING_OP_READV;
-                                sqe->addr = (uintptr_t)&iov;
-                                sqe->len = 1;
-                        #else
-                                #error CFA_WITH_IO_URING_IDLE but none of CFA_HAVE_READV, CFA_HAVE_IORING_OP_READV or CFA_HAVE_IORING_OP_READ defined
-                        #endif
+                        sqe->addr = (uintptr_t)buf;
+                        sqe->len = sizeof(uint64_t);
 
                         asm volatile("": : :"memory");