From: mthomas Date: Sat, 1 Feb 2003 09:10:17 +0000 (+0000) Subject: [project @ 2003-02-01 09:10:16 by mthomas] X-Git-Tag: Approx_11550_changesets_converted~1217 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=4864e9d7088661849d37bd00356cc210c6a091d2 [project @ 2003-02-01 09:10:16 by mthomas] Initialize stp->n_to_blocks as 0. Add function for MinGW32 in Signals.c. --- diff --git a/ghc/rts/Signals.c b/ghc/rts/Signals.c index d337078..899441f 100644 --- 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.34 2003/02/01 09:10:16 mthomas Exp $ * * (c) The GHC Team, 1998-1999 * @@ -473,5 +473,18 @@ initDefaultHandlers() ieee_set_fp_control(0); #endif } +#else /* mingw32_TARGET_OS */ -#endif /*! 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 */ diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c index a1bfc5e..f92e653 100644 --- a/ghc/rts/Storage.c +++ b/ghc/rts/Storage.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Storage.c,v 1.75 2003/01/29 10:28:56 simonmar Exp $ + * $Id: Storage.c,v 1.76 2003/02/01 09:10:17 mthomas Exp $ * * (c) The GHC Team, 1998-1999 * @@ -148,6 +148,7 @@ initStorage( void ) stp = &generations[g].steps[s]; stp->no = s; stp->blocks = NULL; + stp->n_to_blocks = 0; stp->n_blocks = 0; stp->gen = &generations[g]; stp->gen_no = g;