Changeset 58f99b3

Timestamp:

Jan 12, 2021, 12:44:15 PM (4 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:

d48b174

Parents:

426f60c

Message:

Retry interruptable syscalls instead of blocking interrupts

File:

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

libcfa/src/concurrency/io/setup.cfa

@@ -310 +310 @@
         }
 
-        extern void signal_unblock( int sig );
-        extern void signal_block  ( int sig );
-
         static void __io_create( __io_data & this, const io_context_params & params_in ) {
                 // Step 1 : call to setup
@@ -431 +428 @@
                 cq.cqes = (struct io_uring_cqe *)(((intptr_t)cq.ring_ptr) + params.cq_off.cqes);
 
-                signal_block( SIGUSR1 );
-
                 // Step 4 : eventfd
-                int efd = eventfd(0, 0);
-                if (efd < 0) {
-                        abort("KERNEL ERROR: IO_URING EVENTFD - %s\n", strerror(errno));
-                }
-
-                int ret = syscall( __NR_io_uring_register, fd, IORING_REGISTER_EVENTFD, &efd, 1);
-                if (ret < 0) {
-                        abort("KERNEL ERROR: IO_URING EVENTFD REGISTER - %s\n", strerror(errno));
-                }
-
-                signal_unblock( SIGUSR1 );
+                int efd;
+                for() {
+                        efd = eventfd(0, 0);
+                        if (efd < 0) {
+                                if (errno == EINTR) continue;
+                                abort("KERNEL ERROR: IO_URING EVENTFD - %s\n", strerror(errno));
+                        }
+                        break;
+                }
+
+                int ret;
+                for() {
+                        ret = syscall( __NR_io_uring_register, fd, IORING_REGISTER_EVENTFD, &efd, 1);
+                        if (ret < 0) {
+                                if (errno == EINTR) continue;
+                                abort("KERNEL ERROR: IO_URING EVENTFD REGISTER - %s\n", strerror(errno));
+                        }
+                        break;
+                }
 
                 // some paranoid checks