X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsFlags.c;h=cf8d2c5bdb49b1127751d01bfe28a9a150077567;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=17931046746546fb58791edb20cb617501bdfb92;hpb=20593d1d1cf47050d9430895a1c2ada6c39dfb98;p=ghc-hetmet.git diff --git a/ghc/rts/RtsFlags.c b/ghc/rts/RtsFlags.c index 1793104..cf8d2c5 100644 --- a/ghc/rts/RtsFlags.c +++ b/ghc/rts/RtsFlags.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsFlags.c,v 1.72 2003/11/12 17:49:09 sof Exp $ + * $Id: RtsFlags.c,v 1.75 2004/08/13 13:10:29 simonmar Exp $ * * (c) The AQUA Project, Glasgow University, 1994-1997 * (c) The GHC Team, 1998-1999 @@ -36,7 +36,8 @@ #include #include -extern struct RTS_FLAGS RtsFlags; +// Flag Structure +RTS_FLAGS RtsFlags; /* * Split argument lists @@ -147,7 +148,7 @@ void initRtsFlagsDefaults(void) RtsFlags.GcFlags.statsFile = NULL; RtsFlags.GcFlags.giveStats = NO_GC_STATS; - RtsFlags.GcFlags.maxStkSize = (1024 * 1024) / sizeof(W_); + RtsFlags.GcFlags.maxStkSize = (8 * 1024 * 1024) / sizeof(W_); RtsFlags.GcFlags.initialStkSize = 1024 / sizeof(W_); RtsFlags.GcFlags.minAllocAreaSize = (256 * 1024) / BLOCK_SIZE; @@ -245,7 +246,7 @@ void initRtsFlagsDefaults(void) #if defined(GRAN) /* ToDo: check defaults for GranSim and GUM */ - RtsFlags.GcFlags.maxStkSize = (1024 * 1024) / sizeof(W_); + RtsFlags.GcFlags.maxStkSize = (8 * 1024 * 1024) / sizeof(W_); RtsFlags.GcFlags.initialStkSize = 1024 / sizeof(W_); RtsFlags.GranFlags.maxThreads = 65536; // refers to mandatory threads @@ -331,7 +332,7 @@ usage_text[] = { "", " -? Prints this message and exits; the program is not executed", "", -" -K Sets the maximum stack size (default 1M) Egs: -K32k -K512k", +" -K Sets the maximum stack size (default 8M) Egs: -K32k -K512k", " -k Sets the initial thread stack size (default 1k) Egs: -k4k -k2m", "", " -A Sets the minimum allocation area size (default 256k) Egs: -A1m -A10k", @@ -594,7 +595,7 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) # define TICKY_BUILD_ONLY(x) x #else # define TICKY_BUILD_ONLY(x) \ -prog_belch("GHC not built for: ticky-ticky stats"); \ +prog_belch("not built for: ticky-ticky stats"); \ error = rtsTrue; #endif @@ -602,7 +603,7 @@ error = rtsTrue; # define COST_CENTRE_USING_BUILD_ONLY(x) x #else # define COST_CENTRE_USING_BUILD_ONLY(x) \ -prog_belch("GHC not built for: -prof or -parallel"); \ +prog_belch("not built for: -prof or -parallel"); \ error = rtsTrue; #endif @@ -610,7 +611,7 @@ error = rtsTrue; # define PROFILING_BUILD_ONLY(x) x #else # define PROFILING_BUILD_ONLY(x) \ -prog_belch("GHC not built for: -prof"); \ +prog_belch("not built for: -prof"); \ error = rtsTrue; #endif @@ -618,7 +619,7 @@ error = rtsTrue; # define SMP_BUILD_ONLY(x) x #else # define SMP_BUILD_ONLY(x) \ -prog_belch("GHC not built for: -smp"); \ +prog_belch("not built for: -smp"); \ error = rtsTrue; #endif @@ -626,7 +627,7 @@ error = rtsTrue; # define PAR_BUILD_ONLY(x) x #else # define PAR_BUILD_ONLY(x) \ -prog_belch("GHC not built for: -parallel"); \ +prog_belch("not built for: -parallel"); \ error = rtsTrue; #endif @@ -634,7 +635,7 @@ error = rtsTrue; # define PAR_OR_SMP_BUILD_ONLY(x) x #else # define PAR_OR_SMP_BUILD_ONLY(x) \ -prog_belch("GHC not built for: -parallel or -smp"); \ +prog_belch("not built for: -parallel or -smp"); \ error = rtsTrue; #endif @@ -642,7 +643,7 @@ error = rtsTrue; # define GRAN_BUILD_ONLY(x) x #else # define GRAN_BUILD_ONLY(x) \ -prog_belch("GHC not built for: -gransim"); \ +prog_belch("not built for: -gransim"); \ error = rtsTrue; #endif