projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:04:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
Signals.c
diff --git
a/ghc/rts/Signals.c
b/ghc/rts/Signals.c
index
d337078
..
4d76b11
100644
(file)
--- a/
ghc/rts/Signals.c
+++ b/
ghc/rts/Signals.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Signals.c,v 1.33 2003/01/25 15:54:50 wolfgang Exp $
+ * $Id: Signals.c,v 1.41 2004/08/13 13:10:44 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-16,10
+16,13
@@
#include "Signals.h"
#include "RtsUtils.h"
#include "RtsFlags.h"
#include "Signals.h"
#include "RtsUtils.h"
#include "RtsFlags.h"
-#include "StablePriv.h"
#ifdef alpha_TARGET_ARCH
#ifdef alpha_TARGET_ARCH
-# include <machine/fpu.h>
+# if defined(linux_TARGET_OS)
+# include <asm/fpu.h>
+# else
+# include <machine/fpu.h>
+# endif
#endif
#ifdef HAVE_UNISTD_H
#endif
#ifdef HAVE_UNISTD_H
@@
-32,9
+35,14
@@
#include <stdlib.h>
#include <stdlib.h>
-#ifndef mingw32_TARGET_OS
+/* This curious flag is provided for the benefit of the Haskell binding
+ * to POSIX.1 to control whether or not to include SA_NOCLDSTOP when
+ * installing a SIGCHLD handler.
+ *
+ */
+StgInt nocldstop = 0;
-#ifndef PAR
+#if defined(RTS_USER_SIGNALS)
/* SUP: The type of handlers is a little bit, well, doubtful... */
static StgInt *handlers = NULL; /* Dynamically grown array of signal handlers */
/* SUP: The type of handlers is a little bit, well, doubtful... */
static StgInt *handlers = NULL; /* Dynamically grown array of signal handlers */
@@
-47,9
+55,6
@@
static nat n_haskell_handlers = 0;
StgPtr pending_handler_buf[N_PENDING_HANDLERS];
StgPtr *next_pending_handler = pending_handler_buf;
StgPtr pending_handler_buf[N_PENDING_HANDLERS];
StgPtr *next_pending_handler = pending_handler_buf;
-StgInt nocldstop = 0;
-
-
#ifdef RTS_SUPPORTS_THREADS
pthread_t signalHandlingThread;
#endif
#ifdef RTS_SUPPORTS_THREADS
pthread_t signalHandlingThread;
#endif
@@
-79,14
+84,10
@@
more_handlers(I_ sig)
return;
if (handlers == NULL)
return;
if (handlers == NULL)
- handlers = (StgInt *) malloc((sig + 1) * sizeof(StgInt));
+ handlers = (StgInt *)stgMallocBytes((sig + 1) * sizeof(StgInt), "more_handlers");
else
else
- handlers = (StgInt *) realloc(handlers, (sig + 1) * sizeof(StgInt));
+ handlers = (StgInt *)stgReallocBytes(handlers, (sig + 1) * sizeof(StgInt), "more_handlers");
- if (handlers == NULL) {
- // don't fflush(stdout); WORKAROUND bug in Linux glibc
- barf("VM exhausted (in more_handlers)");
- }
for(i = nHandlers; i <= sig; i++)
// Fill in the new slots with default actions
handlers[i] = STG_SIG_DFL;
for(i = nHandlers; i <= sig; i++)
// Fill in the new slots with default actions
handlers[i] = STG_SIG_DFL;
@@
-293,7
+294,7
@@
stg_sig_install(int sig, int spi, StgStablePtr *handler, void *mask)
}
return STG_SIG_ERR;
}
}
return STG_SIG_ERR;
}
-
+
if (previous_spi == STG_SIG_DFL || previous_spi == STG_SIG_IGN
|| previous_spi == STG_SIG_ERR) {
return previous_spi;
if (previous_spi == STG_SIG_DFL || previous_spi == STG_SIG_IGN
|| previous_spi == STG_SIG_ERR) {
return previous_spi;
@@
-344,20
+345,20
@@
markSignalHandlers (evac_fn evac)
}
}
}
}
-#else // PAR
+#else /* !RTS_USER_SIGNALS */
StgInt
StgInt
-stg_sig_install(StgInt sig, StgInt spi, StgStablePtr handler, sigset_t *mask)
+stg_sig_install(StgInt sig STG_UNUSED,
+ StgInt spi STG_UNUSED,
+ StgStablePtr* handler STG_UNUSED,
+ void* mask STG_UNUSED)
{
{
- // don't fflush(stdout); WORKAROUND bug in Linux glibc
- barf("no signal handling support in a parallel implementation");
+ //barf("User signals not supported");
+ return STG_SIG_DFL;
}
}
-void
-startSignalHandlers(void)
-{
-}
#endif
#endif
+#if defined(RTS_USER_SIGNALS)
/* -----------------------------------------------------------------------------
* SIGINT handler.
*
/* -----------------------------------------------------------------------------
* SIGINT handler.
*
@@
-397,7
+398,7
@@
shutdown_handler(int sig STG_UNUSED)
// extreme prejudice. So the first ^C tries to exit the program
// cleanly, and the second one just kills it.
if (interrupted) {
// extreme prejudice. So the first ^C tries to exit the program
// cleanly, and the second one just kills it.
if (interrupted) {
- exit(EXIT_INTERRUPTED);
+ stg_exit(EXIT_INTERRUPTED);
} else {
interruptStgRts();
}
} else {
interruptStgRts();
}
@@
-427,7
+428,7
@@
initDefaultHandlers()
startup_guy = pthread_self();
#endif
#ifdef RTS_SUPPORTS_THREADS
startup_guy = pthread_self();
#endif
#ifdef RTS_SUPPORTS_THREADS
- handleSignalsInThisThread();
+ handleSignalsInThisThread();
#endif
// install the SIGINT handler
#endif
// install the SIGINT handler
@@
-438,7
+439,7
@@
initDefaultHandlers()
prog_belch("warning: failed to install SIGINT handler");
}
prog_belch("warning: failed to install SIGINT handler");
}
-#ifndef cygwin32_TARGET_OS
+#if defined(HAVE_SIGINTERRUPT)
siginterrupt(SIGINT, 1); // isn't this the default? --SDM
#endif
siginterrupt(SIGINT, 1); // isn't this the default? --SDM
#endif
@@
-474,4
+475,4
@@
initDefaultHandlers()
#endif
}
#endif
}
-#endif /*! mingw32_TARGET_OS */
+#endif /* RTS_USER_SIGNALS */