Changeset 779a4a3 for src/libcfa

Timestamp:

May 3, 2018, 4:33:19 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

f3152ab

Parents:

f465f0e (diff), c9d5c4f (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 fix-reference-overloading

Location:

src/libcfa

Files:

• concurrency/preemption.c (modified) (1 diff)
• concurrency/thread (modified) (1 diff)
• interpose.c (modified) (4 diffs)

src/libcfa/concurrency/preemption.c

@@ -404 +404 @@
 }
 
+//=============================================================================================
+// Kernel Signal Debug
+//=============================================================================================
+
+void __cfaabi_check_preemption() {
+        bool ready = TL_GET( preemption_state ).enabled;
+        if(!ready) { abort("Preemption should be ready"); }
+
+        sigset_t oldset;
+        int ret;
+        ret = sigprocmask(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"); }
+}
+
 // Local Variables: //
 // mode: c //

src/libcfa/concurrency/thread

@@ -20 +20 @@
 
 #include "coroutine"
+#include "kernel"
 #include "monitor"
 

src/libcfa/interpose.c

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  8 16:18:09 2018
-// Update Count     : 75
+// Last Modified On : Tue May  1 15:05:35 2018
+// Update Count     : 83
 //
 
@@ -95 +95 @@
 void sigHandler_fpe  ( __CFA_SIGPARMS__ );
 void sigHandler_abort( __CFA_SIGPARMS__ );
+void sigHandler_term ( __CFA_SIGPARMS__ );
 
 struct {
@@ -114 +115 @@
                 __cfaabi_sigaction( SIGFPE , sigHandler_fpe  , SA_SIGINFO ); // Failure handler
                 __cfaabi_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO ); // Failure handler
+                __cfaabi_sigaction( SIGTERM, sigHandler_term , SA_SIGINFO ); // Failure handler
+                __cfaabi_sigaction( SIGINT , sigHandler_term , SA_SIGINFO ); // Failure handler
         }
 }
@@ -268 +271 @@
 }
 
+void sigHandler_term( __CFA_SIGPARMS__ ) {
+        abort( "Application stopped by %s signal.", sig == SIGINT ? "an interrupt (SIGINT)" : "a terminate (SIGTERM)" );
+}
+
 // Local Variables: //
 // mode: c //