Changeset b7d6a36 for libcfa/src/bits/signal.hfa

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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' into relaxed_ready

File:

• libcfa/src/bits/signal.hfa (modified) (2 diffs)

libcfa/src/bits/signal.hfa

@@ -37 +37 @@
 
         act.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
+        sigemptyset( &act.sa_mask );
+        sigaddset( &act.sa_mask, SIGALRM );             // disabled during signal handler
+        sigaddset( &act.sa_mask, SIGUSR1 );
+        sigaddset( &act.sa_mask, SIGSEGV );
+        sigaddset( &act.sa_mask, SIGBUS );
+        sigaddset( &act.sa_mask, SIGILL );
+        sigaddset( &act.sa_mask, SIGFPE );
+        sigaddset( &act.sa_mask, SIGHUP );              // revert to default on second delivery
+        sigaddset( &act.sa_mask, SIGTERM );
+        sigaddset( &act.sa_mask, SIGINT );
         act.sa_flags = flags;
 
-        if ( sigaction( sig, &act, NULL ) == -1 ) {
+        if ( sigaction( sig, &act, 0p ) == -1 ) {
                 __cfaabi_dbg_print_buffer_decl(
                         " __cfaabi_sigaction( sig:%d, handler:%p, flags:%d ), problem installing signal handler, error(%d) %s.\n",
@@ -45 +55 @@
                 );
                 _exit( EXIT_FAILURE );
-        }
+        } // if
 }
-
-// Sigaction wrapper : restore default handler
-static void __cfaabi_sigdefault( int sig ) {
-        struct sigaction act;
-
-        act.sa_handler = SIG_DFL;
-        act.sa_flags = 0;
-        sigemptyset( &act.sa_mask );
-
-        if ( sigaction( sig, &act, NULL ) == -1 ) {
-                __cfaabi_dbg_print_buffer_decl(
-                        " __cfaabi_sigdefault( sig:%d ), problem reseting signal handler, error(%d) %s.\n",
-                        sig, errno, strerror( errno )
-                );
-                _exit( EXIT_FAILURE );
-        }
-}