Changes in / [b0f6190a:ec19b21]

Location:

libcfa/src/concurrency

Files:

• io/setup.cfa (modified) (2 diffs)
• preemption.cfa (modified) (2 diffs)

libcfa/src/concurrency/io/setup.cfa

@@ -314 +314 @@
         }
 
-        extern void signal_block( int sig );
-        extern void signal_unblock( int sig );
-
         static void __io_create( __io_data & this, const io_context_params & params_in ) {
                 // Step 1 : call to setup
@@ -432 +429 @@
 
                 // Step 4 : eventfd
-                // io_uring_register is so f*cking slow on some machine that it
-                // will never succeed if preemption isn't hard blocked
-                signal_block( SIGUSR1 );
-
-                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

libcfa/src/concurrency/preemption.cfa

@@ -394 +394 @@
 
 // sigprocmask wrapper : unblock a single signal
-void signal_unblock( int sig ) {
+static inline void signal_unblock( int sig ) {
         sigset_t mask;
         sigemptyset( &mask );
@@ -405 +405 @@
 
 // sigprocmask wrapper : block a single signal
-void signal_block( int sig ) {
+static inline void signal_block( int sig ) {
         sigset_t mask;
         sigemptyset( &mask );