From: mthomas Date: Wed, 18 Sep 2002 06:34:07 +0000 (+0000) Subject: [project @ 2002-09-18 06:34:07 by mthomas] X-Git-Tag: Approx_11550_changesets_converted~1659 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=29e55dea299569979d4e73d64b709a97aaea36e8;p=ghc-hetmet.git [project @ 2002-09-18 06:34:07 by mthomas] ifdefs for mingw32 to get rid of signal functions. --- diff --git a/ghc/rts/GC.c b/ghc/rts/GC.c index 40fea7d..c0e1a4a 100644 --- a/ghc/rts/GC.c +++ b/ghc/rts/GC.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: GC.c,v 1.142 2002/09/17 12:11:44 simonmar Exp $ + * $Id: GC.c,v 1.143 2002/09/18 06:34:07 mthomas Exp $ * * (c) The GHC Team 1998-1999 * @@ -250,8 +250,10 @@ GarbageCollect ( void (*get_roots)(evac_fn), rtsBool force_major_gc ) Now, Now)); #endif +#ifndef mingw32_TARGET_OS // block signals blockUserSignals(); +#endif // tell the stats department that we've started a GC stat_startGC(); @@ -1034,8 +1036,10 @@ GarbageCollect ( void (*get_roots)(evac_fn), rtsBool force_major_gc ) // ok, GC over: tell the stats department what happened. stat_endGC(allocated, collected, live, copied, N); +#ifndef mingw32_TARGET_OS // unblock signals again unblockUserSignals(); +#endif //PAR_TICKY_TP(); } diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c index c0a9c04..6973954 100644 --- a/ghc/rts/Schedule.c +++ b/ghc/rts/Schedule.c @@ -1,5 +1,5 @@ /* --------------------------------------------------------------------------- - * $Id: Schedule.c,v 1.154 2002/09/17 12:20:15 simonmar Exp $ + * $Id: Schedule.c,v 1.155 2002/09/18 06:34:07 mthomas Exp $ * * (c) The GHC Team, 1998-2000 * @@ -2473,8 +2473,10 @@ GetRoots(evac_fn evac) markSparkQueue(evac); #endif +#ifndef mingw32_TARGET_OS // mark the signal handlers (signals should be already blocked) markSignalHandlers(evac); +#endif } /* -----------------------------------------------------------------------------