Changeset a83ffa4

Timestamp:

May 18, 2018, 3:24:12 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

cb6314e

Parents:

b1a4300

Message:

Preemption now properly restore signal before context switching

Location:

src

Files:

• libcfa/concurrency/preemption.c (modified) (3 diffs)
• tests/concurrent/preempt.c (modified) (1 diff)

src/libcfa/concurrency/preemption.c

@@ -15 +15 @@
 
 #include "preemption.h"
+#include <assert.h>
 
 extern "C" {
@@ -350 +351 @@
         kernelTLS.preemption_state.in_progress = true;
 
-        // We are about to CtxSwitch out of the signal handler, let other handlers in
-        signal_unblock( SIGUSR1 );
+        // Clear sighandler mask before context switching.
+        static_assert( sizeof( sigset_t ) == sizeof( cxt->uc_sigmask ), "Expected cxt->uc_sigmask to be of sigset_t" );
+        if ( pthread_sigmask( SIG_SETMASK, (sigset_t *)&(cxt->uc_sigmask), NULL ) == -1 ) {
+                abort( "internal error, sigprocmask" );
+        }
 
         // TODO: this should go in finish action
@@ -435 +439 @@
         sigset_t oldset;
         int ret;
-        ret = sigprocmask(0, NULL, &oldset);
+        ret = pthread_sigmask(0, NULL, &oldset);
         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"); }
+
+        ret = sigismember(&oldset, SIGTERM);
+        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+        if(ret == 1) { abort("ERROR SIGTERM is disabled"); }
 }
 

src/tests/concurrent/preempt.c

@@ -44 +44 @@
 
 int main(int argc, char* argv[]) {
-        processor p;
+        // processor p;
         {
                 worker_t w0 = 0;