* src/vm/jit/powerpc/emit.c (emit_replacement_stubs): Do not

[cacao.git] / src / vm / signal.c

diff --git a/src/vm/signal.c b/src/vm/signal.c
index 27106ada4a4f9516b18a21d453ca2ae49d7f1210..f8f4d33f403857ecc03dc9e46ddf8bb7e79dcef0 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -26,9 +26,7 @@
 
    Authors: Christian Thalinger
 
-   Changes:
-
-   $Id: signal.c 5038 2006-06-19 22:22:34Z twisti $
+   $Id: signal.c 6123 2006-12-05 21:10:54Z twisti $
 
 */
 
@@ -44,6 +42,7 @@
 # include "threads/native/threads.h"
 #endif
 
+#include "mm/memory.h"
 #include "vm/signallocal.h"
 #include "vm/options.h"
 #include "vm/vm.h"
@@ -52,9 +51,9 @@
 
 /* function prototypes ********************************************************/
 
-void signal_handler_sigquit(int sig, siginfo_t *siginfo, void *_p);
+void signal_handler_sighup(int sig, siginfo_t *siginfo, void *_p);
 void signal_handler_sigint(int sig, siginfo_t *siginfo, void *_p);
-void signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p);
+void signal_handler_sigquit(int sig, siginfo_t *siginfo, void *_p);
 
 
 /* signal_init *****************************************************************
@@ -65,38 +64,42 @@ void signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p);
 
 void signal_init(void)
 {
+#if !defined(__CYGWIN__)
        struct sigaction act;
 
+       /* Allocate something so the garbage collector's signal handlers
+          are installed. */
+
+#if defined(ENABLE_GC_BOEHM)
+       (void) GCNEW(u1);
+#endif
+
        /* install signal handlers we need to convert to exceptions */
 
        sigemptyset(&act.sa_mask);
 
-
 #if defined(ENABLE_JIT)
 # if defined(ENABLE_INTRP)
        if (!opt_intrp) {
 # endif
                /* catch NullPointerException/StackOverFlowException */
 
-               if (!checknull) {
-                       act.sa_sigaction = md_signal_handler_sigsegv;
-                       act.sa_flags = SA_NODEFER | SA_SIGINFO;
+               act.sa_sigaction = md_signal_handler_sigsegv;
+               act.sa_flags     = SA_NODEFER | SA_SIGINFO;
 
 #if defined(SIGSEGV)
-                       sigaction(SIGSEGV, &act, NULL);
+               sigaction(SIGSEGV, &act, NULL);
 #endif
 
 #if defined(SIGBUS)
-                       sigaction(SIGBUS, &act, NULL);
+               sigaction(SIGBUS, &act, NULL);
 #endif
-               }
-
 
                /* catch ArithmeticException */
 
 #if defined(__I386__) || defined(__X86_64__)
                act.sa_sigaction = md_signal_handler_sigfpe;
-               act.sa_flags = SA_NODEFER | SA_SIGINFO;
+               act.sa_flags     = SA_NODEFER | SA_SIGINFO;
                sigaction(SIGFPE, &act, NULL);
 #endif
 # if defined(ENABLE_INTRP)
@@ -104,43 +107,61 @@ void signal_init(void)
 # endif
 #endif /* !defined(ENABLE_INTRP) */
 
+#if defined(ENABLE_THREADS)
+       /* catch SIGHUP for threads_thread_interrupt */
+
+       act.sa_sigaction = signal_handler_sighup;
+       act.sa_flags     = 0;
+       sigaction(SIGHUP, &act, NULL);
+#endif
 
        /* catch SIGINT for exiting properly on <ctrl>-c */
 
        act.sa_sigaction = signal_handler_sigint;
-       act.sa_flags = SA_NODEFER | SA_SIGINFO;
+       act.sa_flags     = SA_NODEFER | SA_SIGINFO;
        sigaction(SIGINT, &act, NULL);
 
-
+#if defined(ENABLE_THREADS)
        /* catch SIGQUIT for thread dump */
 
-#if defined(ENABLE_THREADS)
-#if !defined(__FREEBSD__)
+# if !defined(__FREEBSD__)
        act.sa_sigaction = signal_handler_sigquit;
-       act.sa_flags = SA_SIGINFO;
+       act.sa_flags     = SA_SIGINFO;
        sigaction(SIGQUIT, &act, NULL);
-
-       /* XXX boehm uses SIGUSR1 for suspend on freebsd */
-
-       act.sa_sigaction = signal_handler_sigusr1;
-       act.sa_flags = SA_SIGINFO;
-       sigaction(SIGUSR1, &act, NULL);
-#endif
+# endif
 #endif
 
 #if defined(ENABLE_THREADS) && defined(ENABLE_PROFILING)
        /* install signal handler for profiling sampling */
 
        act.sa_sigaction = md_signal_handler_sigusr2;
-       act.sa_flags = SA_SIGINFO;
+       act.sa_flags     = SA_SIGINFO;
        sigaction(SIGUSR2, &act, NULL);
 #endif
+
+#endif /* !defined(__CYGWIN__) */
+}
+
+
+/* signal_handler_sighup *******************************************************
+
+   This handler is required by threads_thread_interrupt and does
+   nothing.
+
+*******************************************************************************/
+
+#if defined(ENABLE_THREADS)
+void signal_handler_sighup(int sig, siginfo_t *siginfo, void *_p)
+{
+       /* do nothing */
 }
+#endif
 
 
 /* signal_handler_sigquit ******************************************************
 
-   XXX
+   Handle for SIGQUIT (<ctrl>-\) which print a stacktrace for every
+   running thread.
 
 *******************************************************************************/
 
@@ -176,22 +197,6 @@ void signal_handler_sigint(int sig, siginfo_t *siginfo, void *_p)
 }
 
 
-/* signal_handler_sigusr1 ******************************************************
-
-   XXX
-
-*******************************************************************************/
-
-#if defined(ENABLE_THREADS)
-void signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p)
-{
-       /* call stacktrace function */
-
-       stacktrace_dump_trace();
-}
-#endif
-
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where