X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FSignals.c;h=4d76b11c29a7412f2a3802fed83cd19d914bc241;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=355cf147cc2b99cb246370630bcabd3a524e8283;hpb=4be00ac12eb12a88abadce5d38a17d53fc9339a9;p=ghc-hetmet.git

diff --git a/ghc/rts/Signals.c b/ghc/rts/Signals.c
index 355cf14..4d76b11 100644
--- a/ghc/rts/Signals.c
+++ b/ghc/rts/Signals.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Signals.c,v 1.35 2003/03/25 17:15:07 sof Exp $
+ * $Id: Signals.c,v 1.41 2004/08/13 13:10:44 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -16,10 +16,13 @@
 #include "Signals.h"
 #include "RtsUtils.h"
 #include "RtsFlags.h"
-#include "StablePriv.h"
 
 #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
@@ -32,9 +35,14 @@
 
 #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 */
@@ -47,9 +55,6 @@ static nat n_haskell_handlers = 0;
 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
@@ -289,7 +294,7 @@ stg_sig_install(int sig, int spi, StgStablePtr *handler, void *mask)
 	}
 	return STG_SIG_ERR;
     }
-    
+
     if (previous_spi == STG_SIG_DFL || previous_spi == STG_SIG_IGN
 	|| previous_spi == STG_SIG_ERR) {
 	return previous_spi;
@@ -340,20 +345,20 @@ markSignalHandlers (evac_fn evac)
     }
 }
 
-#else // PAR
+#else /* !RTS_USER_SIGNALS */
 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
 
+#if defined(RTS_USER_SIGNALS)
 /* -----------------------------------------------------------------------------
  * SIGINT handler.
  *
@@ -423,7 +428,7 @@ initDefaultHandlers()
     startup_guy = pthread_self();
 #endif
 #ifdef RTS_SUPPORTS_THREADS
-	handleSignalsInThisThread();
+    handleSignalsInThisThread();
 #endif
 
     // install the SIGINT handler
@@ -434,7 +439,7 @@ initDefaultHandlers()
 	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
 
@@ -469,18 +474,5 @@ 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 /* RTS_USER_SIGNALS */