Changes in / [1adab3e:7b91c0e]

Files:

• benchmark/io/http/http_ring.cpp (added)
• benchmark/io/http/main.cfa (modified) (2 diffs)
• benchmark/io/http/options.cfa (modified) (6 diffs)
• benchmark/io/setup.sh (added)
• example/io/attach-block.c (added)
• example/io/attach-end.c (added)
• libcfa/src/concurrency/io.cfa (modified) (6 diffs)
• libcfa/src/concurrency/io/setup.cfa (modified) (1 diff)

benchmark/io/http/main.cfa

@@ -6 +6 @@
 #include <unistd.h>
 extern "C" {
+        #include <signal.h>
         #include <sys/socket.h>
         #include <netinet/in.h>
@@ -78 +79 @@
 //============================================================================================='
 int main( int argc, char * argv[] ) {
+        __sighandler_t s = 1p;
+        signal(SIGPIPE, s);
+
         //===================
         // Parse args

benchmark/io/http/options.cfa

@@ -9 +9 @@
 }
 
+#include <bitmanip.hfa>
 #include <fstream.hfa>
 #include <kernel.hfa>
@@ -51 +52 @@
         bool iokpoll = false;
         unsigned sublen = 16;
+        unsigned nentries = 16;
+
 
         static cfa_option opt[] = {
@@ -68 +71 @@
                 { 'i', "kpollcomplete",  "If set, cluster uses IORING_SETUP_IOPOLL", iokpoll, parse_settrue },
                 {'\0', "submitlength",   "Max number of submitions that can be submitted together", sublen },
+                {'\0', "numentries",     "Number of I/O entries", nentries },
 
         };
@@ -74 +78 @@
         char **left;
         parse_args( argc, argv, opt, opt_cnt, "[OPTIONS]... [PATH]\ncforall http server", left );
+
+        if( !is_pow2(nentries) ) {
+                unsigned v = nentries;
+                v--;
+                v |= v >> 1;
+                v |= v >> 2;
+                v |= v >> 4;
+                v |= v >> 8;
+                v |= v >> 16;
+                v++;
+                serr | "Warning: num_entries not a power of 2" | '(' | nentries | ')' | "raising to " | v;
+                nentries = v;
+        }
+        options.clopts.params.num_entries = nentries;
 
         options.clopts.params.poller_submits = subthrd;
@@ -94 +112 @@
         options.clopts.params.num_ready = sublen;
 
-        if( left[0] == 0p ) { return "."; }
+        if( left[0] == 0p ) { return; }
 
         const char * path = left[0];
@@ -100 +118 @@
 
         if( left[0] != 0p ) {
-                serr | "Too many trailing arguments!";
+                serr | "Too many trailing arguments!" | '\'' | path | '\'';
+                while(left[0] != 0p) {
+                        serr | " - " | left[0];
+                        left++;
+                }
                 exit(EXIT_FAILURE);
         }

libcfa/src/concurrency/io.cfa

@@ -41 +41 @@
         #include "io/types.hfa"
 
-        static const char * opcodes[] = {
+        __attribute__((unused)) static const char * opcodes[] = {
                 "OP_NOP",
                 "OP_READV",
@@ -173 +173 @@
                         __cfadbg_print_safe(io_core, "Kernel I/O : IO_URING enter %d %u %u\n", ring.fd, to_submit, flags);
                         ret = syscall( __NR_io_uring_enter, ring.fd, to_submit, 0, flags, (sigset_t *)0p, _NSIG / 8);
+                        __cfadbg_print_safe(io_core, "Kernel I/O : IO_URING %d returned %d\n", ring.fd, ret);
+
                         if( ret < 0 ) {
                                 switch((int)errno) {
                                 case EAGAIN:
                                 case EINTR:
+                                case EBUSY:
                                         ret = -1;
                                         break;
@@ -465 +468 @@
                                 sqe->flags,
                                 sqe->ioprio,
-                                sqe->off,
-                                sqe->addr,
+                                (void*)sqe->off,
+                                (void*)sqe->addr,
                                 sqe->len,
                                 sqe->accept_flags,
@@ -491 +494 @@
                 }
                 else if( ring.eager_submits ) {
-                        __u32 picked = __submit_to_ready_array( ring, idx, mask );
+                        __attribute__((unused)) __u32 picked = __submit_to_ready_array( ring, idx, mask );
 
                         #if defined(LEADER_LOCK)
@@ -629 +632 @@
                                         sqe->flags,
                                         sqe->ioprio,
-                                        sqe->off,
-                                        sqe->addr,
+                                        (void*)sqe->off,
+                                        (void*)sqe->addr,
                                         sqe->len,
                                         sqe->accept_flags,
@@ -642 +645 @@
                         __atomic_thread_fence( __ATOMIC_SEQ_CST );
                         // Release the consumed SQEs
+
                         __release_consumed_submission( ring );
                         // ring.submit_q.sqes[idx].user_data = 3ul64;

libcfa/src/concurrency/io/setup.cfa

@@ -549 +549 @@
                 int ret = syscall( __NR_io_uring_register, ctx.thrd.ring->fd, IORING_REGISTER_FILES, files, count );
                 if( ret < 0 ) {
-                        abort( "KERNEL ERROR: IO_URING SYSCALL - (%d) %s\n", (int)errno, strerror(errno) );
+                        abort( "KERNEL ERROR: IO_URING REGISTER - (%d) %s\n", (int)errno, strerror(errno) );
                 }