Support exit_fz to cancel_watchdog in kernel, suppor signal handling in rtspin

2 files changed, 11 insertions, 1 deletions

diff --git a/bin/rtspin.c b/bin/rtspin.c
index 881d155..a47e3e7 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -11,6 +11,7 @@
 #include <inttypes.h>
 #include <sys/mman.h>
 #include <errno.h>
+#include <signal.h>
 
 #include "litmus.h"
 #include "common.h"
@@ -104,6 +105,11 @@ static void usage(char *error) {
         exit(error ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
+void default_sig_handler(int sig) {
+        if (sig == SIGSYS)
+                return;
+}
+
 #define NUMS 4096
 static int num[NUMS];
 static char* progname;
@@ -304,6 +310,10 @@ static void job(double exec_time, double program_end, int lock_od, double cs_len
 {
         double chunk1, chunk2;
         int lock_res;
+        struct sigaction handler;
+        memset(&handler, 0, sizeof(handler));
+        handler.sa_handler = default_sig_handler;
+        sigaction(SIGSYS, &handler, NULL);
 
         if (lock_od >= 0) {
                 /* simulate critical section somewhere in the middle */
diff --git a/src/syscalls.c b/src/syscalls.c
index cb90908..ec5cbe9 100644
--- a/src/syscalls.c
+++ b/src/syscalls.c
@@ -101,7 +101,7 @@ int litmus_access_forbidden_zone_check(int od, lt_t fz_len, lt_t panic_len)
 int litmus_set_fz_launch_done(int od)
 {
         // Call the exit_forbidden_zone litmus call to cancel the timer
-        return litmus_syscall(LRT_exit_forbidden_zone, od);
+        return litmus_syscall(LRT_cancel_watchdog, od);
 }
 
 int litmus_exit_forbidden_zone(int od)