X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FSignals.c;h=355cf147cc2b99cb246370630bcabd3a524e8283;hb=fa092c29d011e70a5658e726bbf523149f4dfbe2;hp=8e33d9dc88f01c5074733a530ec2a37f98f134a4;hpb=e65d8f387cccbcfd60a4a820024f8d8286f97ac2;p=ghc-hetmet.git

diff --git a/ghc/rts/Signals.c b/ghc/rts/Signals.c
index 8e33d9d..355cf14 100644
--- a/ghc/rts/Signals.c
+++ b/ghc/rts/Signals.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Signals.c,v 1.32 2003/01/10 22:08:20 wolfgang Exp $
+ * $Id: Signals.c,v 1.35 2003/03/25 17:15:07 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -49,6 +49,23 @@ StgPtr *next_pending_handler = pending_handler_buf;
 
 StgInt nocldstop = 0;
 
+
+#ifdef RTS_SUPPORTS_THREADS
+pthread_t signalHandlingThread;
+#endif
+
+	// Handle all signals in the current thread.
+	// Called from Capability.c whenever the main capability is granted to a thread
+	// and in installDefaultHandlers
+void
+handleSignalsInThisThread()
+{
+#ifdef RTS_SUPPORTS_THREADS
+    signalHandlingThread = pthread_self();
+#endif
+}
+
+
 /* -----------------------------------------------------------------------------
  * Allocate/resize the table of signal handlers.
  * -------------------------------------------------------------------------- */
@@ -62,14 +79,10 @@ more_handlers(I_ sig)
 	return;
 
     if (handlers == NULL)
-	handlers = (StgInt *) malloc((sig + 1) * sizeof(StgInt));
+	handlers = (StgInt *)stgMallocBytes((sig + 1) * sizeof(StgInt), "more_handlers");
     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;
@@ -105,6 +118,19 @@ generic_handler(int sig)
 {
     sigset_t signals;
 
+#if defined(THREADED_RTS)
+	// Make the thread that currently holds the main capability
+	// handle the signal.
+	// This makes sure that awaitEvent() is interrupted
+	// and it (hopefully) prevents race conditions
+	// (signal handlers are not atomic with respect to other threads)
+
+    if(pthread_self() != signalHandlingThread) {
+        pthread_kill(signalHandlingThread, sig);
+        return;
+    }
+#endif
+
     /* Can't call allocate from here.  Probably can't call malloc
        either.  However, we have to schedule a new thread somehow.
 
@@ -215,6 +241,8 @@ stg_sig_install(int sig, int spi, StgStablePtr *handler, void *mask)
 
     previous_spi = handlers[sig];
 
+    action.sa_flags = 0;
+    
     switch(spi) {
     case STG_SIG_IGN:
     	handlers[sig] = STG_SIG_IGN;
@@ -348,13 +376,24 @@ shutdown_handler(int sig STG_UNUSED)
 	pthread_kill(startup_guy, sig);
 	return;
     }
+    // ToDo: The code for the threaded RTS below does something very
+    // similar. Maybe the SMP special case is not needed
+    // -- Wolfgang Thaller
+#elif defined(THREADED_RTS)
+	// Make the thread that currently holds the main capability
+	// handle the signal.
+	// This makes sure that awaitEvent() is interrupted
+    if(pthread_self() != signalHandlingThread) {
+        pthread_kill(signalHandlingThread, sig);
+        return;
+    }
 #endif
 
     // 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);
+	stg_exit(EXIT_INTERRUPTED);
     } else {
 	interruptStgRts();
     }
@@ -383,6 +422,9 @@ initDefaultHandlers()
 #ifdef SMP
     startup_guy = pthread_self();
 #endif
+#ifdef RTS_SUPPORTS_THREADS
+	handleSignalsInThisThread();
+#endif
 
     // install the SIGINT handler
     action.sa_handler = shutdown_handler;
@@ -427,5 +469,18 @@ initDefaultHandlers()
     ieee_set_fp_control(0);
 #endif
 }
+#else /* mingw32_TARGET_OS */
+
+// Handle all signals in the current thread.
+// Called from Capability.c whenever the main capability is granted to a thread
+// and in installDefaultHandlers
+void
+handleSignalsInThisThread()
+{
+#ifdef RTS_SUPPORTS_THREADS
+#error "handleSignalsInThread needs to be sorted out for MinGW32"
+  /*    signalHandlingThread = pthread_self();*/
+#endif
+}
 
-#endif /*! mingw32_TARGET_OS */
+#endif /* mingw32_TARGET_OS */