Changeset 7222630

Timestamp:

Jan 14, 2021, 1:13:47 PM (3 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:

03ecdcf, 54cc2bf, ee59ede

Parents:

b0f6190a

Message:

Small refector so only preemption cares about signal

Location:

libcfa/src/concurrency

Files:

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

libcfa/src/concurrency/io/setup.cfa

@@ -314 +314 @@
         }
 
-        extern void signal_block( int sig );
-        extern void signal_unblock( int sig );
+        extern void __disable_interrupts_hard();
+        extern void __enable_interrupts_hard();
 
         static void __io_create( __io_data & this, const io_context_params & params_in ) {
@@ -434 +434 @@
                 // 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 );
+                __disable_interrupts_hard();
 
                 int efd = eventfd(0, 0);
@@ -446 +446 @@
                 }
 
-                signal_unblock( SIGUSR1 );
+                __enable_interrupts_hard();
 
                 // 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 );
@@ -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"); }
 }