Changeset 54cc2bf

Timestamp:

Jan 14, 2021, 7:42:53 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:

f756a7f

Parents:

7836dad (diff), 7222630 (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

Files:

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

libcfa/src/concurrency/io/setup.cfa

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

libcfa/src/concurrency/preemption.cfa

@@ -424 +424 @@
 static void timeout( $thread * this ) {
         unpark( this );
+}
+
+void __disable_interrupts_hard() {
+        sigset_t oldset;
+        int ret;
+        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
+        if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
+
+        ret = sigismember(&oldset, SIGUSR1);
+        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+        if(ret == 1) { abort("ERROR SIGUSR1 is disabled"); }
+
+        ret = sigismember(&oldset, SIGALRM);
+        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+        if(ret == 0) { abort("ERROR SIGALRM is enabled"); }
+
+        signal_block( SIGUSR1 );
+}
+
+void __enable_interrupts_hard() {
+        signal_unblock( SIGUSR1 );
+
+        sigset_t oldset;
+        int ret;
+        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
+        if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
+
+        ret = sigismember(&oldset, SIGUSR1);
+        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+        if(ret == 1) { abort("ERROR SIGUSR1 is disabled"); }
+
+        ret = sigismember(&oldset, SIGALRM);
+        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+        if(ret == 0) { abort("ERROR SIGALRM is enabled"); }
 }