* Removed all Id tags.

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

diff --git a/src/vm/signal.c b/src/vm/signal.c
index ec84f5180a3ae826f7bcb8baf30154718dfdb909..56531e728b0af7f5a09f90a8eb820e1a57ef409f 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: signal.c 8295 2007-08-11 17:57:24Z michi $
-
 */
 
 
@@ -96,8 +94,12 @@ bool signal_init(void)
        if (sigemptyset(&mask) != 0)
                vm_abort("signal_init: sigemptyset failed: %s", strerror(errno));
 
+#if !defined(WITH_CLASSPATH_SUN)
+       /* Let OpenJDK handle SIGINT itself. */
+
        if (sigaddset(&mask, SIGINT) != 0)
                vm_abort("signal_init: sigaddset failed: %s", strerror(errno));
+#endif
 
 #if !defined(__FREEBSD__)
        if (sigaddset(&mask, SIGQUIT) != 0)
@@ -128,18 +130,18 @@ bool signal_init(void)
 # endif
                /* SIGSEGV handler */
 
-               signal_register_signal(SIGSEGV, (void *) md_signal_handler_sigsegv,
+               signal_register_signal(SIGSEGV, (functionptr) md_signal_handler_sigsegv,
                                                           SA_NODEFER | SA_SIGINFO);
 
 #  if defined(SIGBUS)
-               signal_register_signal(SIGBUS, (void *) md_signal_handler_sigsegv,
+               signal_register_signal(SIGBUS, (functionptr) md_signal_handler_sigsegv,
                                                           SA_NODEFER | SA_SIGINFO);
 #  endif
 
 #  if SUPPORT_HARDWARE_DIVIDE_BY_ZERO
                /* SIGFPE handler */
 
-               signal_register_signal(SIGFPE, (void *) md_signal_handler_sigfpe,
+               signal_register_signal(SIGFPE, (functionptr) md_signal_handler_sigfpe,
                                                           SA_NODEFER | SA_SIGINFO);
 #  endif
 
@@ -147,7 +149,7 @@ bool signal_init(void)
                /* XXX use better defines for that (in arch.h) */
                /* SIGILL handler */
 
-               signal_register_signal(SIGILL, (void *) md_signal_handler_sigill,
+               signal_register_signal(SIGILL, (functionptr) md_signal_handler_sigill,
                                                           SA_NODEFER | SA_SIGINFO);
 #  endif
 
@@ -155,7 +157,7 @@ bool signal_init(void)
                /* XXX use better defines for that (in arch.h) */
                /* SIGTRAP handler */
 
-               signal_register_signal(SIGTRAP, (void *) md_signal_handler_sigtrap,
+               signal_register_signal(SIGTRAP, (functionptr) md_signal_handler_sigtrap,
                                                           SA_NODEFER | SA_SIGINFO);
 #  endif
 # if defined(ENABLE_INTRP)
@@ -166,13 +168,13 @@ bool signal_init(void)
 #if defined(ENABLE_THREADS)
        /* SIGHUP handler for threads_thread_interrupt */
 
-       signal_register_signal(SIGHUP, (void *) signal_handler_sighup, 0);
+       signal_register_signal(SIGHUP, (functionptr) signal_handler_sighup, 0);
 #endif
 
 #if defined(ENABLE_THREADS) && defined(ENABLE_PROFILING)
        /* SIGUSR2 handler for profiling sampling */
 
-       signal_register_signal(SIGUSR2, (void *) md_signal_handler_sigusr2,
+       signal_register_signal(SIGUSR2, (functionptr) md_signal_handler_sigusr2,
                                                   SA_SIGINFO);
 #endif
 
@@ -188,9 +190,10 @@ bool signal_init(void)
 
 *******************************************************************************/
 
-void signal_register_signal(int signum, void *handler, int flags)
+void signal_register_signal(int signum, functionptr handler, int flags)
 {
        struct sigaction act;
+
        void (*function)(int, siginfo_t *, void *);
 
        function = (void (*)(int, siginfo_t *, void *)) handler;
@@ -304,26 +307,30 @@ static void signal_thread(void)
        if (sigemptyset(&mask) != 0)
                vm_abort("signal_thread: sigemptyset failed: %s", strerror(errno));
 
+#if !defined(WITH_CLASSPATH_SUN)
+       /* Let OpenJDK handle SIGINT itself. */
+
        if (sigaddset(&mask, SIGINT) != 0)
                vm_abort("signal_thread: sigaddset failed: %s", strerror(errno));
+#endif
 
 #if !defined(__FREEBSD__)
        if (sigaddset(&mask, SIGQUIT) != 0)
                vm_abort("signal_thread: sigaddset failed: %s", strerror(errno));
 #endif
 
-       while (true) {
+       for (;;) {
                /* just wait for a signal */
 
+#if defined(ENABLE_THREADS)
+               threads_thread_state_waiting(t);
+#endif
+
                /* XXX We don't check for an error here, although the man-page
                   states sigwait does not return an error (which is wrong!),
                   but it seems to make problems with Boehm-GC.  We should
                   revisit this code with our new exact-GC. */
 
-#if defined(ENABLE_THREADS)
-               threads_thread_state_waiting(t);
-#endif
-
 /*             if (sigwait(&mask, &sig) != 0) */
 /*                     vm_abort("signal_thread: sigwait failed: %s", strerror(errno)); */
                (void) sigwait(&mask, &sig);
@@ -332,30 +339,41 @@ static void signal_thread(void)
                threads_thread_state_runnable(t);
 #endif
 
-               switch (sig) {
-               case SIGINT:
-                       /* exit the vm properly */
+               /* Handle the signal. */
 
-                       vm_exit(0);
-                       break;
+               signal_thread_handler(sig);
+       }
+}
+
+
+/* signal_thread_handler *******************************************************
+
+   Handles the signals caught in the signal handler thread.  Also used
+   from sun.misc.Signal with OpenJDK.
+
+*******************************************************************************/
+
+void signal_thread_handler(int sig)
+{
+       switch (sig) {
+       case SIGINT:
+               /* exit the vm properly */
 
-               case SIGQUIT:
-                       /* print a thread dump */
+               vm_exit(0);
+               break;
+
+       case SIGQUIT:
+               /* print a thread dump */
 #if defined(ENABLE_THREADS)
-                       threads_dump();
+               threads_dump();
 #endif
 
 #if defined(ENABLE_STATISTICS)
-                       if (opt_stat)
-                               statistics_print_memory_usage();
+               if (opt_stat)
+                       statistics_print_memory_usage();
 #endif
-                       break;
-               }
+               break;
        }
-
-       /* this should not happen */
-
-       vm_abort("signal_thread: this thread should not exit!");
 }