Changeset 6ddef36 for libcfa/src/concurrency

Timestamp:

Nov 22, 2021, 2:18:56 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

2514f68b

Parents:

7ef162b2

Message:

No longer define kernel_read when not needed.

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (1 diff)
• kernel.cfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -502 +502 @@
         }
 
-        bool __kernel_read(processor * proc, io_future_t & future, char buf[], int fd) {
-                $io_context * ctx = proc->io.ctx;
-                /* paranoid */ verify( ! __preemption_enabled() );
-                /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
-                /* paranoid */ verify( ctx );
-
-                __u32 idx;
-                struct io_uring_sqe * sqe;
-
-                // We can proceed to the fast path
-                if( !__alloc(ctx, &idx, 1) ) return false;
-
-                // Allocation was successful
-                __fill( &sqe, 1, &idx, ctx );
-
-                sqe->opcode = IORING_OP_READ;
-                sqe->user_data = (uintptr_t)&future;
-                sqe->flags = 0;
-                sqe->ioprio = 0;
-                sqe->fd = 0;
-                sqe->off = 0;
-                sqe->fsync_flags = 0;
-                sqe->__pad2[0] = 0;
-                sqe->__pad2[1] = 0;
-                sqe->__pad2[2] = 0;
-                sqe->addr = (uintptr_t)buf;
-                sqe->len = sizeof(uint64_t);
-
-                asm volatile("": : :"memory");
-
-                /* paranoid */ verify( sqe->user_data == (uintptr_t)&future );
-                __submit( ctx, &idx, 1, true );
-
-                /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
-                /* paranoid */ verify( ! __preemption_enabled() );
-        }
+        #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() );
+                        /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
+                        /* paranoid */ verify( ctx );
+
+                        __u32 idx;
+                        struct io_uring_sqe * sqe;
+
+                        // We can proceed to the fast path
+                        if( !__alloc(ctx, &idx, 1) ) return false;
+
+                        // Allocation was successful
+                        __fill( &sqe, 1, &idx, ctx );
+
+                        sqe->opcode = IORING_OP_READ;
+                        sqe->user_data = (uintptr_t)&future;
+                        sqe->flags = 0;
+                        sqe->ioprio = 0;
+                        sqe->fd = 0;
+                        sqe->off = 0;
+                        sqe->fsync_flags = 0;
+                        sqe->__pad2[0] = 0;
+                        sqe->__pad2[1] = 0;
+                        sqe->__pad2[2] = 0;
+                        sqe->addr = (uintptr_t)buf;
+                        sqe->len = sizeof(uint64_t);
+
+                        asm volatile("": : :"memory");
+
+                        /* paranoid */ verify( sqe->user_data == (uintptr_t)&future );
+                        __submit( ctx, &idx, 1, true );
+
+                        /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
+                        /* paranoid */ verify( ! __preemption_enabled() );
+                }
+        #endif
 #endif

libcfa/src/concurrency/kernel.cfa

@@ -135 +135 @@
 static inline bool __maybe_io_drain( processor * );
 
-extern bool __kernel_read(processor * proc, io_future_t & future, char buf[], 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
 
 extern void __disable_interrupts_hard();