Changeset 22226e4 for libcfa/src/concurrency/io/setup.cfa

Timestamp:

Mar 18, 2022, 12:42:39 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

0b4ddb71, 51239d1b

Parents:

3bc69f2

Message:

Tentative fix for spurious deadlock in some concurrency tests

File:

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

libcfa/src/concurrency/io/setup.cfa

@@ -115 +115 @@
                 this.ext_sq.empty = true;
                 (this.ext_sq.queue){};
-                __io_uring_setup( this, cl.io.params, proc->idle_fd );
+                __io_uring_setup( this, cl.io.params, proc->idle_wctx.evfd );
                 __cfadbg_print_safe(io_core, "Kernel I/O : Created ring for io_context %u (%p)\n", this.fd, &this);
         }
@@ -125 +125 @@
                 __cfadbg_print_safe(io_core, "Kernel I/O : Destroyed ring for io_context %u\n", this.fd);
         }
-
-        extern void __disable_interrupts_hard();
-        extern void __enable_interrupts_hard();
 
         static void __io_uring_setup( $io_context & this, const io_context_params & params_in, int procfd ) {
@@ -230 +227 @@
                         __cfadbg_print_safe(io_core, "Kernel I/O : registering %d for completion with ring %d\n", procfd, fd);
 
-                        __disable_interrupts_hard();
-
                         int ret = syscall( __NR_io_uring_register, fd, IORING_REGISTER_EVENTFD, &procfd, 1);
                         if (ret < 0) {
                                 abort("KERNEL ERROR: IO_URING EVENTFD REGISTER - %s\n", strerror(errno));
                         }
-
-                        __enable_interrupts_hard();
 
                         __cfadbg_print_safe(io_core, "Kernel I/O : registered %d for completion with ring %d\n", procfd, fd);