From 2ac31c7f6e9306024da822674f478db039edb39b Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 3 Jun 2008 07:27:01 +0000 Subject: [PATCH] +RTS -N also sets +RTS -g --- rts/RtsFlags.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index 186ded3..81bac4e 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -447,7 +447,7 @@ usage_text[] = { "", #endif /* DEBUG */ #if defined(THREADED_RTS) && !defined(NOSMP) -" -N Use OS threads (default: 1)", +" -N Use OS threads (default: 1) (also sets -g)", " -g Use OS threads for GC (default: 1)", " -qm Don't automatically migrate threads between CPUs", " -qw Migrate a thread to the current CPU when it is woken up", @@ -1121,10 +1121,18 @@ error = rtsTrue; if (rts_argv[arg][2] != '\0') { RtsFlags.ParFlags.nNodes = strtol(rts_argv[arg]+2, (char **) NULL, 10); + // set -g at the same time as -N by default + RtsFlags.ParFlags.gcThreads = RtsFlags.ParFlags.nNodes; if (RtsFlags.ParFlags.nNodes <= 0) { errorBelch("bad value for -N"); error = rtsTrue; } +#if defined(PROFILING) + if (RtsFlags.ParFlags.nNodes > 1) { + errorBelch("bad option %s: only -N1 is supported with profiling", rts_argv[arg]); + error = rtsTrue; + } +#endif } ) break; @@ -1137,12 +1145,6 @@ error = rtsTrue; errorBelch("bad value for -g"); error = rtsTrue; } -#if defined(PROFILING) - if (RtsFlags.ParFlags.nNodes > 1) { - errorBelch("bad option %s: only -N1 is supported with profiling", rts_argv[arg]); - error = rtsTrue; - } -#endif } ) break; -- 1.7.10.4