/* -----------------------------------------------------------------------------
- * $Id: Signals.c,v 1.14 2000/02/29 14:38:19 simonmar Exp $
+ * $Id: Signals.c,v 1.18 2000/08/25 13:12:07 simonmar Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* ---------------------------------------------------------------------------*/
+#define NON_POSIX_SOURCE
+
#include "Rts.h"
#include "SchedAPI.h"
#include "Schedule.h"
#ifndef PAR
+/* SUP: The type of handlers is a little bit, well, doubtful... */
static StgInt *handlers = NULL; /* Dynamically grown array of signal handlers */
static StgInt nHandlers = 0; /* Size of handlers array */
circumstances, depending on the signal.
*/
- *next_pending_handler++ = deRefStablePtr(handlers[sig]);
+ *next_pending_handler++ = deRefStablePtr(stgCast(StgStablePtr,handlers[sig]));
/* stack full? */
if (next_pending_handler == &pending_handler_buf[N_PENDING_HANDLERS]) {
* by freeing the previous handler if there was one.
*/
if (previous_spi >= 0) {
- freeStablePtr(handlers[sig]);
+ freeStablePtr(stgCast(StgStablePtr,handlers[sig]));
}
return STG_SIG_ERR;
}
next_pending_handler--;
- createIOThread(RtsFlags.GcFlags.initialStkSize,
- (StgClosure *) *next_pending_handler);
+ scheduleThread(
+ createIOThread(RtsFlags.GcFlags.initialStkSize,
+ (StgClosure *) *next_pending_handler));
}
unblockUserSignals();
} else
#endif
- interruptStgRts();
+ /* If we're already trying to interrupt the RTS, terminate with
+ * extreme prejudice. So the first ^C tries to exit the program
+ * cleanly, and the second one just kills it.
+ */
+ if (interrupted) {
+ exit(EXIT_INTERRUPTED);
+ } else {
+ interruptStgRts();
+ }
}
/*
* Haskell code may install their own SIGINT handler, which is
* fine, provided they're so kind as to put back the old one
* when they de-install.
- *
- * We ignore SIGPIPE, because our I/O library handles EPIPE properly,
- * and a SIGPIPE tends to cause the program to exit silently and
- * mysteriously.
*/
void
init_default_handlers()
prog_belch("failed to install SIGINT handler");
}
- action.sa_handler = SIG_IGN;
- if (sigaction(SIGPIPE, &action, &oact) != 0) {
- prog_belch("failed to install SIGINT handler");
- }
+ siginterrupt(SIGINT, 1);
}
#endif /*! mingw32_TARGET_OS */