Changeset d95969a for libcfa/src/concurrency/io.cfa

Timestamp:

Jan 25, 2021, 3:45:42 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c292244

Parents:

b6a8b31 (diff), 7158202 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

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;
@@ -318 +321 @@
 
                 __cfadbg_print_safe(io_core, "Kernel I/O : Fast poller %d (%p) stopping\n", this.ring->fd, &this);
+
+                __ioctx_unregister( this );
         }
 
@@ -389 +394 @@
 
                         block++;
-
-                        abort( "Kernel I/O : all submit queue entries used, yielding\n" );
 
                         yield();
@@ -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;