* src/vm/jit/jit.h (jitdata): Added temporary fields for development

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

diff --git a/src/vm/signal.c b/src/vm/signal.c
index 1e6f91e5a39c51f293687f6222284be764d018ab..d4520fcd82487535ef6663c952442ed808bc9336 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -1,9 +1,9 @@
 /* src/vm/signal.c - machine independent signal functions
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,16 +19,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
    Changes:
 
-   $Id: signal.c 4327 2006-01-20 13:28:36Z twisti $
+   $Id: signal.c 4921 2006-05-15 14:24:36Z 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"
 
 
@@ -116,7 +115,7 @@ void signal_init(void)
 
        /* 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;
@@ -138,7 +137,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 +158,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 +175,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 */