Changeset a0dbf20 for libcfa/src/concurrency/io

Timestamp:

Aug 30, 2022, 6:30:32 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

4858a88

Parents:

a8dd247 (diff), 01ba701 (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

Location:

libcfa/src/concurrency/io

Files:

• call.cfa.in (modified) (1 diff)
• setup.cfa (modified) (3 diffs)

libcfa/src/concurrency/io/call.cfa.in

@@ -202 +202 @@
                 struct io_context$ * ctx = cfa_io_allocate( &sqe, &idx, 1 );
 
+                memset(sqe, 0, sizeof(*sqe));
                 sqe->opcode = IORING_OP_{op};
+                sqe->flags = sflags;
                 sqe->user_data = (uintptr_t)&future;
-                sqe->flags = sflags;
-                sqe->ioprio = 0;
-                sqe->fd = 0;
-                sqe->off = 0;
-                sqe->addr = 0;
-                sqe->len = 0;
-                sqe->fsync_flags = 0;
-                sqe->__pad2[0] = 0;
-                sqe->__pad2[1] = 0;
-                sqe->__pad2[2] = 0;{body}
+                {body}
 
                 asm volatile("": : :"memory");

libcfa/src/concurrency/io/setup.cfa

@@ -228 +228 @@
 
                 #if !defined(CFA_WITH_IO_URING_IDLE)
+                {
                         // Step 4 : eventfd
                         __cfadbg_print_safe(io_core, "Kernel I/O : registering %d for completion with ring %d\n", procfd, fd);
@@ -237 +238 @@
 
                         __cfadbg_print_safe(io_core, "Kernel I/O : registered %d for completion with ring %d\n", procfd, fd);
-                #endif
-
+                }
+                #endif
+
+                // TODO: implement a proper version of this.
+                // I have not found a better maximum that works in general but users should be able to configure it
+                // the same way they configure other I/O options
                 // #if defined(CFA_HAVE_IORING_REGISTER_IOWQ_MAX_WORKERS)
+                // {
                 //      // Step 5 : max worker count
                 //      __cfadbg_print_safe(io_core, "Kernel I/O : lmiting max workers for ring %d\n", fd);
@@ -252 +258 @@
 
                 //      __cfadbg_print_safe(io_core, "Kernel I/O : lmited max workers for ring %d\n", fd);
+                // }
                 // #endif