* src/vm/jit/jit.h (instruction): Removed.

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

diff --git a/src/vm/signal.c b/src/vm/signal.c
index 0d226b6a20e80fc2318e29b443a10458e5d0ca81..27106ada4a4f9516b18a21d453ca2ae49d7f1210 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: signal.c 4357 2006-01-22 23:33:38Z twisti $
+   $Id: signal.c 5038 2006-06-19 22:22:34Z twisti $
 
 */
 
@@ -40,14 +40,13 @@
 
 #include "vm/types.h"
 
-#include "cacao/cacao.h"
-
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+#if defined(ENABLE_THREADS)
 # include "threads/native/threads.h"
 #endif
 
 #include "vm/signallocal.h"
 #include "vm/options.h"
+#include "vm/vm.h"
 #include "vm/jit/stacktrace.h"
 
 
@@ -113,10 +112,9 @@ void signal_init(void)
        sigaction(SIGINT, &act, NULL);
 
 
-
        /* catch SIGQUIT for thread dump */
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+#if defined(ENABLE_THREADS)
 #if !defined(__FREEBSD__)
        act.sa_sigaction = signal_handler_sigquit;
        act.sa_flags = SA_SIGINFO;
@@ -129,6 +127,14 @@ void signal_init(void)
        sigaction(SIGUSR1, &act, NULL);
 #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;
+       sigaction(SIGUSR2, &act, NULL);
+#endif
 }
 
 
@@ -138,7 +144,7 @@ void signal_init(void)
 
 *******************************************************************************/
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+#if defined(ENABLE_THREADS)
 void signal_handler_sigquit(int sig, siginfo_t *siginfo, void *_p)
 {
        /* do thread dump */
@@ -159,14 +165,14 @@ void signal_handler_sigint(int sig, siginfo_t *siginfo, void *_p)
 {
        /* if we are already in Runtime.exit(), just do it hardcore */
 
-       if (cacao_exiting) {
-               fprintf(stderr, "Catched SIGINT while already shutting down. Shutdown aborted...\n");
+       if (vm_exiting) {
+               fprintf(stderr, "Caught SIGINT while already shutting down. Shutdown aborted...\n");
                exit(0);
        }
 
        /* exit the vm properly */
 
-       cacao_exit(0);
+       vm_exit(0);
 }
 
 
@@ -176,7 +182,7 @@ void signal_handler_sigint(int sig, siginfo_t *siginfo, void *_p)
 
 *******************************************************************************/
 
-#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+#if defined(ENABLE_THREADS)
 void signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p)
 {
        /* call stacktrace function */