X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsFlags.c;h=cf8d2c5bdb49b1127751d01bfe28a9a150077567;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=01b2ec070354094c3955cfc0b98efa703da43ec3;hpb=9ac55e08e159d7a4647ab01e7872e69dd762f275;p=ghc-hetmet.git diff --git a/ghc/rts/RtsFlags.c b/ghc/rts/RtsFlags.c index 01b2ec0..cf8d2c5 100644 --- a/ghc/rts/RtsFlags.c +++ b/ghc/rts/RtsFlags.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsFlags.c,v 1.34 2000/12/04 12:31:21 simonmar 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 @@ -21,29 +21,31 @@ //@node Includes, Constants //@subsection Includes +#include "PosixSource.h" #include "Rts.h" #include "RtsFlags.h" #include "RtsUtils.h" #include "BlockAlloc.h" -#include "Itimer.h" /* CS_MIN_MILLISECS */ +#include "Timer.h" /* CS_MIN_MILLISECS */ #include "Profiling.h" -#if defined(PROFILING) -#include "Itimer.h" -#endif - #ifdef HAVE_CTYPE_H #include #endif -extern struct RTS_FLAGS RtsFlags; +#include +#include + +// Flag Structure +RTS_FLAGS RtsFlags; /* * Split argument lists */ -int prog_argc; /* an "int" so as to match normal "argc" */ +int prog_argc = 0; /* an "int" so as to match normal "argc" */ char **prog_argv = NULL; -int rts_argc; /* ditto */ +char *prog_name = NULL; /* 'basename' of prog_argv[0] */ +int rts_argc = 0; /* ditto */ char *rts_argv[MAX_RTS_ARGS]; //@node Constants, Static function decls, Includes @@ -55,41 +57,9 @@ char *rts_argv[MAX_RTS_ARGS]; #define RTS 1 #define PGM 0 -char *debug_opts_strs[] = { - "DEBUG (-D1): scheduler\n", - "DEBUG (-D2): evaluator\n", - "DEBUG (-D4): codegen\n", - "DEBUG (-D8): weak\n", - "DEBUG (-D16): gccafs\n", - "DEBUG (-D32): gc\n", - "DEBUG (-D64): block\n", - "DEBUG (-D128): sanity\n", - "DEBUG (-D256): stable\n", - "DEBUG (-D512): prof\n", - "DEBUG (-D1024): gran\n", - "DEBUG (-D2048): par\n", - "DEBUG (-D4096): linker\n" -}; - -char *debug_opts_prefix[] = { - "_-", /* scheduler */ - "_.", /* evaluator */ - "_,", /* codegen */ - "_;", /* weak */ - "_~", /* gccafs */ - "_@", /* gc */ - "_#", /* block */ - "_&", /* sanity */ - "_:", /* stable */ - "_!", /* prof */ - "_=", /* gran */ - "_=" /* par */ - "_*" /* linker */ -}; - #if defined(GRAN) -char *gran_debug_opts_strs[] = { +static char *gran_debug_opts_strs[] = { "DEBUG (-bDe, -bD1): event_trace; printing event trace.\n", "DEBUG (-bDE, -bD2): event_stats; printing event statistics.\n", "DEBUG (-bDb, -bD4): bq; check blocking queues\n", @@ -108,34 +78,15 @@ char *gran_debug_opts_strs[] = { }; /* one character codes for the available debug options */ -char gran_debug_opts_flags[] = { +static char gran_debug_opts_flags[] = { 'e', 'E', 'b', 'G', 'q', 'f', 'r', 'F', 'u', 'S', ':', 'o', 'z', 'P', 't' }; -/* prefix strings printed with the debug messages of the corresponding type */ -char *gran_debug_opts_prefix[] = { - "", /* event_trace */ - "", /* event_stats */ - "##", /* bq */ - "**", /* pack */ - "^^", /* checkSparkQ */ - "==", /* thunkStealing */ - "^^", /* randomSteal */ - "+-", /* findWork */ - "", /* unused */ - "++", /* pri */ - "::", /* checkLight */ - "##", /* sortedQ */ - "", /* blockOnFetch */ - "", /* packBuffer */ - "" /* blockOnFetch_sanity */ -}; - #elif defined(PAR) -char *par_debug_opts_strs[] = { +static char *par_debug_opts_strs[] = { "DEBUG (-qDv, -qD1): verbose; be generally verbose with parallel related stuff.\n", - "DEBUG (-qDt, -qD2): trace; trace messages.\n", + "DEBUG (-qDq, -qD2): bq; print blocking queues.\n", "DEBUG (-qDs, -qD4): schedule; scheduling of parallel threads.\n", "DEBUG (-qDe, -qD8): free; free messages.\n", "DEBUG (-qDr, -qD16): resume; resume messages.\n", @@ -146,28 +97,13 @@ char *par_debug_opts_strs[] = { //"DEBUG (-qDo, -qD512): forward; forwarding messages to other PEs.\n", "DEBUG (-qDl, -qD256): tables; print internal LAGA etc tables.\n", "DEBUG (-qDo, -qD512): packet; packets and graph structures when packing.\n", - "DEBUG (-qDp, -qD1024): pack; packing and unpacking graphs.\n" + "DEBUG (-qDp, -qD1024): pack; packing and unpacking graphs.\n", + "DEBUG (-qDz, -qD2048): paranoia; ridiculously detailed output (excellent for filling a partition).\n" }; /* one character codes for the available debug options */ -char par_debug_opts_flags[] = { - 'v', 't', 's', 'e', 'r', 'w', 'F', 'f', 'l', 'o', 'p' -}; - -/* prefix strings printed with the debug messages of the corresponding type */ -char *par_debug_opts_prefix[] = { - " ", /* verbose */ - "..", /* trace */ - "--", /* schedule */ - "!!", /* free */ - "[]", /* resume */ - ";;", /* weight */ - "%%", /* fetch */ - //",,", /* ack */ - "$$", /* fish */ - "", /* tables */ - "**", /* packet */ - "**" /* pack */ +static char par_debug_opts_flags[] = { + 'v', 'q', 's', 'e', 'r', 'w', 'F', 'f', 'l', 'o', 'p', 'z' }; #endif /* PAR */ @@ -199,10 +135,6 @@ static void process_par_option(int arg, int *rts_argc, char *rts_argv[], rtsBool static void set_par_debug_options(nat n); static void help_par_debug_options(nat n); #endif -#if defined(DEBUG) -static void set_debug_options(nat n); -static void help_debug_options(nat n); -#endif //@node Command-line option parsing routines, GranSim specific options, Static function decls //@subsection Command-line option parsing routines @@ -216,32 +148,67 @@ 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; RtsFlags.GcFlags.minOldGenSize = (1024 * 1024) / BLOCK_SIZE; - RtsFlags.GcFlags.maxHeapSize = (64 * 1024 * 1024) / BLOCK_SIZE; + RtsFlags.GcFlags.maxHeapSize = 0; /* off by default */ RtsFlags.GcFlags.heapSizeSuggestion = 0; /* none */ RtsFlags.GcFlags.pcFreeHeap = 3; /* 3% */ RtsFlags.GcFlags.oldGenFactor = 2; +#if defined(PAR) + /* A hack currently needed for GUM -- HWL */ + RtsFlags.GcFlags.generations = 1; + RtsFlags.GcFlags.steps = 2; + RtsFlags.GcFlags.squeezeUpdFrames = rtsFalse; +#else RtsFlags.GcFlags.generations = 2; RtsFlags.GcFlags.steps = 2; - RtsFlags.GcFlags.squeezeUpdFrames = rtsTrue; +#endif + RtsFlags.GcFlags.compact = rtsFalse; + RtsFlags.GcFlags.compactThreshold = 30.0; #ifdef RTS_GTK_FRONTPANEL RtsFlags.GcFlags.frontpanel = rtsFalse; #endif +#ifdef DEBUG + RtsFlags.DebugFlags.scheduler = rtsFalse; + RtsFlags.DebugFlags.interpreter = rtsFalse; + RtsFlags.DebugFlags.codegen = rtsFalse; + RtsFlags.DebugFlags.weak = rtsFalse; + RtsFlags.DebugFlags.gccafs = rtsFalse; + RtsFlags.DebugFlags.gc = rtsFalse; + RtsFlags.DebugFlags.block_alloc = rtsFalse; + RtsFlags.DebugFlags.sanity = rtsFalse; + RtsFlags.DebugFlags.stable = rtsFalse; + RtsFlags.DebugFlags.prof = rtsFalse; + RtsFlags.DebugFlags.gran = rtsFalse; + RtsFlags.DebugFlags.par = rtsFalse; + RtsFlags.DebugFlags.linker = rtsFalse; +#endif + #if defined(PROFILING) || defined(PAR) RtsFlags.CcFlags.doCostCentres = 0; #endif /* PROFILING or PAR */ #ifdef PROFILING - RtsFlags.ProfFlags.doHeapProfile = rtsFalse; + RtsFlags.ProfFlags.doHeapProfile = rtsFalse; + RtsFlags.ProfFlags.profileInterval = 100; + RtsFlags.ProfFlags.includeTSOs = rtsFalse; RtsFlags.ProfFlags.showCCSOnException = rtsFalse; + RtsFlags.ProfFlags.maxRetainerSetSize = 8; + RtsFlags.ProfFlags.modSelector = NULL; + RtsFlags.ProfFlags.descrSelector = NULL; + RtsFlags.ProfFlags.typeSelector = NULL; + RtsFlags.ProfFlags.ccSelector = NULL; + RtsFlags.ProfFlags.ccsSelector = NULL; + RtsFlags.ProfFlags.retainerSelector = NULL; + RtsFlags.ProfFlags.bioSelector = NULL; + #elif defined(DEBUG) - RtsFlags.ProfFlags.doHeapProfile = rtsFalse; + RtsFlags.ProfFlags.doHeapProfile = rtsFalse; #endif RtsFlags.ConcFlags.ctxtSwitchTime = CS_MIN_MILLISECS; /* In milliseconds */ @@ -252,6 +219,7 @@ void initRtsFlagsDefaults(void) #ifdef PAR RtsFlags.ParFlags.ParStats.Full = rtsFalse; + RtsFlags.ParFlags.ParStats.Suppressed = rtsFalse; RtsFlags.ParFlags.ParStats.Binary = rtsFalse; RtsFlags.ParFlags.ParStats.Sparks = rtsFalse; RtsFlags.ParFlags.ParStats.Heap = rtsFalse; @@ -259,8 +227,14 @@ void initRtsFlagsDefaults(void) RtsFlags.ParFlags.ParStats.Global = rtsFalse; RtsFlags.ParFlags.outputDisabled = rtsFalse; +#ifdef DIST + RtsFlags.ParFlags.doFairScheduling = rtsTrue; /* fair sched by def */ +#else + RtsFlags.ParFlags.doFairScheduling = rtsFalse; /* unfair sched by def */ +#endif RtsFlags.ParFlags.packBufferSize = 1024; - + RtsFlags.ParFlags.thunksToPack = 1; /* 0 ... infinity; */ + RtsFlags.ParFlags.globalising = 1; /* 0 ... everything */ RtsFlags.ParFlags.maxThreads = 1024; RtsFlags.ParFlags.maxFishes = MAX_FISHES; RtsFlags.ParFlags.fishDelay = FISH_DELAY; @@ -272,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 @@ -358,17 +332,22 @@ 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 initial thread stack size (default 1k) Egs: -K4k -K2m", +" -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", -" -M Sets the maximum heap size (default 64M) Egs: -M256k -M1G", +" -M Sets the maximum heap size (default unlimited) Egs: -M256k -M1G", " -H Sets the minimum heap size (default 0M) Egs: -H24m -H1G", -" -m% Minimum % of heap which must be available (default 3%)", +" -m Minimum % of heap which must be available (default 3%)", " -G Number of generations (default: 2)", " -T Number of steps in younger generations (default: 2)", -" -s Summary GC statistics (default file: .stat)", -" -S Detailed GC statistics (with -Sstderr going to stderr)", +" -c Auto-enable compaction of the oldest generation when live data is", +" at least % of the maximum heap size set with -M (default: 30%)", +" -c Enable compaction for all major collections", +"", +" -t One-line GC statistics (default file: .stat)", +" -s Summary GC statistics (with -Sstderr going to stderr)", +" -S Detailed GC statistics", #ifdef RTS_GTK_FRONTPANEL " -f Display front panel (requires X11 & GTK+)", #endif @@ -379,15 +358,34 @@ usage_text[] = { #if defined(PROFILING) || defined(PAR) "", " -px Time/allocation profile (XML) (output file .prof)", -" -p Time/allocation profile (output file .prof)", -" sort: T = time (default), A = alloc, C = cost centre label", -" -P More detailed Time/Allocation profile" +" -p Time/allocation profile (output file .prof)", +" -P More detailed Time/Allocation profile", +" -Pa Give information about *all* cost centres", + # if defined(PROFILING) "", -" -hx Heap residency profile (XML) (output file .prof)", -" -h Heap residency profile (text) (output file .prof)", -" break-down: C = cost centre stack (default), M = module", -" D = closure description, Y = type description", +" -hx Heap residency profile (XML) (output file .prof)", +" -h Heap residency profile (hp2ps) (output file .hp)", +" break-down: c = cost centre stack (default)", +" m = module", +" d = closure description", +" y = type description", +" r = retainer", +" b = biography (LAG,DRAG,VOID,USE)", +" A subset of closures may be selected thusly:", +" -hc,... specific cost centre(s) (top of stack only)", +" -hC,... specific cost centre(s) (anywhere in stack)", +" -hm... all cost centres from the specified modules(s)", +" -hd,... closures with specified closure descriptions", +" -hy... closures with specified type descriptions", +" -hr... closures with specified retainers", +" -hb... closures with specified biographies (lag,drag,void,use)", +"", +" -R Set the maximum retainer set size (default: 8)", +"", +" -i Time between heap samples (seconds, default: 0.1)", +"", +" -xt Include threads (TSOs) in a heap profile", "", " -xc Show current cost centre stack on raising an exception", # endif @@ -411,6 +409,23 @@ usage_text[] = { " -C Context-switch interval in seconds", " (0 or no argument means switch as often as possible)", " the default is .02 sec; resolution is .02 sec", +"", +#if defined(DEBUG) +" -Ds DEBUG: scheduler", +" -Di DEBUG: interpreter", +" -Dc DEBUG: codegen", +" -Dw DEBUG: weak", +" -DG DEBUG: gccafs", +" -Dg DEBUG: gc", +" -Db DEBUG: block", +" -DS DEBUG: sanity", +" -Dt DEBUG: stable", +" -Dp DEBUG: prof", +" -Dr DEBUG: gran", +" -DP DEBUG: par", +" -Dl DEBUG: linker", +"", +#endif // DEBUG #if defined(SMP) " -N Use OS threads (default: 1)", #endif @@ -435,18 +450,46 @@ usage_text[] = { " -b... All GranSim options start with -b; see GranSim User's Guide for details", #endif "", +"RTS options may also be specified using the GHCRTS environment variable.", +"", "Other RTS options may be available for programs compiled a different way.", "The GHC User's Guide has full details.", "", 0 }; -static __inline__ rtsBool +STATIC_INLINE rtsBool strequal(const char *a, const char * b) { return(strcmp(a, b) == 0); } +static void +splitRtsFlags(char *s, int *rts_argc, char *rts_argv[]) +{ + char *c1, *c2; + + c1 = s; + do { + while (isspace(*c1)) { c1++; }; + c2 = c1; + while (!isspace(*c2) && *c2 != '\0') { c2++; }; + + if (c1 == c2) { break; } + + if (*rts_argc < MAX_RTS_ARGS-1) { + s = stgMallocBytes(c2-c1+1, "RtsFlags.c:splitRtsFlags()"); + strncpy(s, c1, c2-c1); + s[c2-c1] = '\0'; + rts_argv[(*rts_argc)++] = s; + } else { + barf("too many RTS arguments (max %d)", MAX_RTS_ARGS-1); + } + + c1 = c2; + } while (*c1 != '\0'); +} + void setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) { @@ -456,12 +499,17 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) char *last_slash; /* Remove directory from argv[0] -- default files in current directory */ - - if ((last_slash = (char *) strrchr(argv[0], '/')) != NULL) - strcpy(argv[0], last_slash+1); - - /* Split arguments (argv) into PGM (argv) and RTS (rts_argv) parts */ - /* argv[0] must be PGM argument -- leave in argv */ + if ((last_slash = (char *) strrchr(argv[0], +#if !defined(mingw32_TARGET_OS) + '/') +#else + '\\') +#endif + ) != NULL) { + prog_name = last_slash+1; + } else { + prog_name = argv[0]; + } total_arg = *argc; arg = 1; @@ -469,8 +517,40 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) *argc = 1; *rts_argc = 0; - for (mode = PGM; arg < total_arg && ! strequal("--RTS", argv[arg]); arg++) { - if (strequal("+RTS", argv[arg])) { + // process arguments from the ghc_rts_opts global variable first. + // (arguments from the GHCRTS environment variable and the command + // line override these). + { + if (ghc_rts_opts != NULL) { + splitRtsFlags(ghc_rts_opts, rts_argc, rts_argv); + } + } + + // process arguments from the GHCRTS environment variable next + // (arguments from the command line override these). + { + char *ghc_rts = getenv("GHCRTS"); + + if (ghc_rts != NULL) { + splitRtsFlags(ghc_rts, rts_argc, rts_argv); + } + } + + // Split arguments (argv) into PGM (argv) and RTS (rts_argv) parts + // argv[0] must be PGM argument -- leave in argv + + for (mode = PGM; arg < total_arg; arg++) { + // The '--RTS' argument disables all future +RTS ... -RTS processing. + if (strequal("--RTS", argv[arg])) { + arg++; + break; + } + // The '--' argument is passed through to the program, but + // disables all further +RTS ... -RTS processing. + else if (strequal("--", argv[arg])) { + break; + } + else if (strequal("+RTS", argv[arg])) { mode = RTS; } else if (strequal("-RTS", argv[arg])) { @@ -486,17 +566,14 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) barf("too many RTS arguments (max %d)", MAX_RTS_ARGS-1); } } - if (arg < total_arg) { - /* arg must be --RTS; process remaining program arguments */ - while (++arg < total_arg) { - argv[(*argc)++] = argv[arg]; - } + // process remaining program arguments + for (; arg < total_arg; arg++) { + argv[(*argc)++] = argv[arg]; } argv[*argc] = (char *) 0; rts_argv[*rts_argc] = (char *) 0; - /* Process RTS (rts_argv) part: mainly to determine statsfile */ - + // Process RTS (rts_argv) part: mainly to determine statsfile for (arg = 0; arg < *rts_argc; arg++) { if (rts_argv[arg][0] != '-') { fflush(stdout); @@ -518,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 @@ -526,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 @@ -534,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 @@ -542,7 +619,7 @@ error = rtsTrue; # define SMP_BUILD_ONLY(x) x #else # define SMP_BUILD_ONLY(x) \ -prog_belch("GHC not built for: -parallel"); \ +prog_belch("not built for: -smp"); \ error = rtsTrue; #endif @@ -550,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 @@ -558,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 @@ -566,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 @@ -587,6 +664,15 @@ error = rtsTrue; RtsFlags.GcFlags.ringBell = rtsTrue; break; + case 'c': + if (rts_argv[arg][2] != '\0') { + RtsFlags.GcFlags.compactThreshold = + atof(rts_argv[arg]+2); + } else { + RtsFlags.GcFlags.compact = rtsTrue; + } + break; + case 'F': RtsFlags.GcFlags.oldGenFactor = atof(rts_argv[arg]+2); @@ -596,12 +682,59 @@ error = rtsTrue; #ifdef DEBUG case 'D': - if (isdigit(rts_argv[arg][2])) {/* Set all debugging options in one */ - /* hack warning: interpret the flags as a binary number */ - nat n = decode(rts_argv[arg]+2); - set_debug_options(n); - } - break; + { + char *c; + + for (c = rts_argv[arg] + 2; *c != '\0'; c++) { + switch (*c) { + case 's': + RtsFlags.DebugFlags.scheduler = rtsTrue; + break; + case 'i': + RtsFlags.DebugFlags.interpreter = rtsTrue; + break; + case 'c': + RtsFlags.DebugFlags.codegen = rtsTrue; + break; + case 'w': + RtsFlags.DebugFlags.weak = rtsTrue; + break; + case 'G': + RtsFlags.DebugFlags.gccafs = rtsTrue; + break; + case 'g': + RtsFlags.DebugFlags.gc = rtsTrue; + break; + case 'b': + RtsFlags.DebugFlags.block_alloc = rtsTrue; + break; + case 'S': + RtsFlags.DebugFlags.sanity = rtsTrue; + break; + case 't': + RtsFlags.DebugFlags.stable = rtsTrue; + break; + case 'p': + RtsFlags.DebugFlags.prof = rtsTrue; + break; + case 'r': + RtsFlags.DebugFlags.gran = rtsTrue; + break; + case 'P': + RtsFlags.DebugFlags.par = rtsTrue; + break; + case 'l': + RtsFlags.DebugFlags.linker = rtsTrue; + break; + case 'a': + RtsFlags.DebugFlags.apply = rtsTrue; + break; + default: + bad_option( rts_argv[arg] ); + } + } + break; + } #endif case 'K': @@ -668,22 +801,30 @@ error = rtsTrue; #endif case 'S': - RtsFlags.GcFlags.giveStats ++; + RtsFlags.GcFlags.giveStats = VERBOSE_GC_STATS; + goto stats; case 's': - RtsFlags.GcFlags.giveStats ++; + RtsFlags.GcFlags.giveStats = SUMMARY_GC_STATS; + goto stats; + + case 't': + RtsFlags.GcFlags.giveStats = ONELINE_GC_STATS; + goto stats; + + stats: #ifdef PAR /* Opening all those files would almost certainly fail... */ - RtsFlags.ParFlags.ParStats.Full = rtsTrue; + // RtsFlags.ParFlags.ParStats.Full = rtsTrue; RtsFlags.GcFlags.statsFile = stderr; /* temporary; ToDo: rm */ #else - RtsFlags.GcFlags.statsFile - = open_stats_file(arg, *argc, argv, - *rts_argc, rts_argv, STAT_FILENAME_FMT); - - if (RtsFlags.GcFlags.statsFile == NULL) error = rtsTrue; + RtsFlags.GcFlags.statsFile + = open_stats_file(arg, *argc, argv, + *rts_argc, rts_argv, STAT_FILENAME_FMT); + + if (RtsFlags.GcFlags.statsFile == NULL) error = rtsTrue; #endif - break; + break; case 'Z': RtsFlags.GcFlags.squeezeUpdFrames = rtsFalse; @@ -692,21 +833,32 @@ error = rtsTrue; /* =========== PROFILING ========================== */ case 'P': /* detailed cost centre profiling (time/alloc) */ - COST_CENTRE_USING_BUILD_ONLY( - RtsFlags.CcFlags.doCostCentres = COST_CENTRES_VERBOSE; - ) case 'p': /* cost centre profiling (time/alloc) */ COST_CENTRE_USING_BUILD_ONLY( switch (rts_argv[arg][2]) { case 'x': RtsFlags.CcFlags.doCostCentres = COST_CENTRES_XML; break; - default: - RtsFlags.CcFlags.doCostCentres = COST_CENTRES_SUMMARY; + case 'a': + RtsFlags.CcFlags.doCostCentres = COST_CENTRES_ALL; break; + default: + if (rts_argv[arg][1] == 'P') { + RtsFlags.CcFlags.doCostCentres = + COST_CENTRES_VERBOSE; + } else { + RtsFlags.CcFlags.doCostCentres = + COST_CENTRES_SUMMARY; + } + break; } ) break; + case 'R': + PROFILING_BUILD_ONLY( + RtsFlags.ProfFlags.maxRetainerSetSize = atof(rts_argv[arg]+2); + ) break; + case 'h': /* serial heap profile */ #if !defined(PROFILING) && defined(DEBUG) switch (rts_argv[arg][2]) { @@ -724,26 +876,128 @@ error = rtsTrue; #else PROFILING_BUILD_ONLY( switch (rts_argv[arg][2]) { - case '\0': - case CCchar: - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_CCS; - break; - case MODchar: - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_MOD; - break; - case DESCRchar: - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_DESCR; - break; - case TYPEchar: - RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_TYPE; + case '\0': + case 'C': + case 'c': + case 'M': + case 'm': + case 'D': + case 'd': + case 'Y': + case 'y': + case 'R': + case 'r': + case 'B': + case 'b': + if (rts_argv[arg][2] != '\0' && rts_argv[arg][3] != '\0') { + { + char *left = strchr(rts_argv[arg], '{'); + char *right = strrchr(rts_argv[arg], '}'); + + // curly braces are optional, for + // backwards compat. + if (left) + left = left+1; + else + left = rts_argv[arg] + 3; + + if (!right) + right = rts_argv[arg] + strlen(rts_argv[arg]); + + *right = '\0'; + + switch (rts_argv[arg][2]) { + case 'c': // cost centre label select + RtsFlags.ProfFlags.ccSelector = left; + break; + case 'C': + RtsFlags.ProfFlags.ccsSelector = left; + break; + case 'M': + case 'm': // cost centre module select + RtsFlags.ProfFlags.modSelector = left; + break; + case 'D': + case 'd': // closure descr select + RtsFlags.ProfFlags.descrSelector = left; + break; + case 'Y': + case 'y': // closure type select + RtsFlags.ProfFlags.typeSelector = left; + break; + case 'R': + case 'r': // retainer select + RtsFlags.ProfFlags.retainerSelector = left; + break; + case 'B': + case 'b': // biography select + RtsFlags.ProfFlags.bioSelector = left; + break; + } + } + break; + } + + if (RtsFlags.ProfFlags.doHeapProfile != 0) { + prog_belch("multiple heap profile options"); + error = rtsTrue; + break; + } + + switch (rts_argv[arg][2]) { + case '\0': + case 'C': + case 'c': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_CCS; + break; + case 'M': + case 'm': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_MOD; + break; + case 'D': + case 'd': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_DESCR; + break; + case 'Y': + case 'y': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_TYPE; + break; + case 'R': + case 'r': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_RETAINER; + break; + case 'B': + case 'b': + RtsFlags.ProfFlags.doHeapProfile = HEAP_BY_LDV; + break; + } break; - default: + + default: prog_belch("invalid heap profile option: %s",rts_argv[arg]); error = rtsTrue; } ) +#endif // PROFILING + break; + +#if defined(PROFILING) + case 'i': /* heap sample interval */ + if (rts_argv[arg][2] == '\0') { + /* use default */ + } else { + I_ cst; /* tmp */ + + /* Convert to milliseconds */ + cst = (I_) ((atof(rts_argv[arg]+2) * 1000)); + cst = (cst / CS_MIN_MILLISECS) * CS_MIN_MILLISECS; + if (cst != 0 && cst < CS_MIN_MILLISECS) + cst = CS_MIN_MILLISECS; + + RtsFlags.ProfFlags.profileInterval = cst; + } + break; #endif - break; /* =========== CONCURRENT ========================= */ case 'C': /* context switch interval */ @@ -790,14 +1044,14 @@ error = rtsTrue; case 'q': PAR_BUILD_ONLY( - process_par_option(arg, rts_argc, rts_argv, &error); + process_par_option(arg, rts_argc, rts_argv, &error); ) break; /* =========== GRAN =============================== */ case 'b': GRAN_BUILD_ONLY( - process_gran_option(arg, rts_argc, rts_argv, &error); + process_gran_option(arg, rts_argc, rts_argv, &error); ) break; /* =========== TICKY ============================== */ @@ -824,8 +1078,15 @@ error = rtsTrue; case 'c': /* Debugging tool: show current cost centre on an exception */ PROFILING_BUILD_ONLY( - RtsFlags.ProfFlags.showCCSOnException = rtsTrue; - ) break; + RtsFlags.ProfFlags.showCCSOnException = rtsTrue; + ); + break; + + case 't': /* Include memory used by TSOs in a heap profile */ + PROFILING_BUILD_ONLY( + RtsFlags.ProfFlags.includeTSOs = rtsTrue; + ); + break; /* The option prefix '-xx' is reserved for future extension. KSW 1999-11. */ @@ -1145,8 +1406,7 @@ process_gran_option(int arg, int *rts_argc, char *rts_argv[], rtsBool *error) } else if (RtsFlags.GranFlags.proc > MAX_PROC || RtsFlags.GranFlags.proc < 1) { - fprintf(stderr,"setupRtsFlags: no more than %u processors -allowed\n", + fprintf(stderr,"setupRtsFlags: no more than %u processors allowed\n", MAX_PROC); *error = rtsTrue; } @@ -1604,9 +1864,12 @@ help_GranSim_debug_options(nat n) { static void process_par_option(int arg, int *rts_argc, char *rts_argv[], rtsBool *error) { - if (rts_argv[arg][1] != 'q') /* All GUM options start with -q */ + + if (rts_argv[arg][1] != 'q') { /* All GUM options start with -q */ + belch("Warning: GUM option does not start with -q: %s", rts_argv[arg]); return; - + } + /* Communication and task creation cost parameters */ switch(rts_argv[arg][2]) { case 'e': /* -qe ... allow local sparks */ @@ -1648,17 +1911,16 @@ process_par_option(int arg, int *rts_argc, char *rts_argv[], rtsBool *error) RtsFlags.ParFlags.maxFishes)); break; - - case 'd': + case 'F': if (rts_argv[arg][3] != '\0') { RtsFlags.ParFlags.fishDelay = strtol(rts_argv[arg]+3, (char **) NULL, 10); } else { - belch("setupRtsFlags: missing fish delay time for -qd\n"); + belch("setupRtsFlags: missing fish delay time for -qF\n"); *error = rtsTrue; } IF_PAR_DEBUG(verbose, - belch("-qd: fish delay time %d", + belch("-qF: fish delay time %d us", RtsFlags.ParFlags.fishDelay)); break; @@ -1668,13 +1930,39 @@ process_par_option(int arg, int *rts_argc, char *rts_argv[], rtsBool *error) belch("-qO: output disabled")); break; + case 'g': /* -qg ... globalisation scheme */ + if (rts_argv[arg][3] != '\0') { + RtsFlags.ParFlags.globalising = decode(rts_argv[arg]+3); + } else { + belch("setupRtsFlags: missing identifier for globalisation scheme (for -qg)\n"); + *error = rtsTrue; + } + IF_PAR_DEBUG(verbose, + belch("-qg: globalisation scheme set to %d", + RtsFlags.ParFlags.globalising)); + break; + + case 'h': /* -qh ... max number of thunks (except root) in packet */ + if (rts_argv[arg][3] != '\0') { + RtsFlags.ParFlags.thunksToPack = decode(rts_argv[arg]+3); + } else { + belch("setupRtsFlags: missing number of thunks per packet (for -qh)\n"); + *error = rtsTrue; + } + IF_PAR_DEBUG(verbose, + belch("-qh: thunks per packet set to %d", + RtsFlags.ParFlags.thunksToPack)); + break; + case 'P': /* -qP for writing a log file */ - RtsFlags.ParFlags.ParStats.Full = rtsTrue; + //RtsFlags.ParFlags.ParStats.Full = rtsFalse; /* same encoding as in GranSim after -bP */ switch(rts_argv[arg][3]) { - case '\0': break; // nothing special, just an ordinary profile - //case '0': RtsFlags.ParFlags.ParStats.Suppressed = rtsTrue; - // break; + case '\0': RtsFlags.ParFlags.ParStats.Full = rtsTrue; + break; // nothing special, just an ordinary profile + case '0': RtsFlags.ParFlags.ParStats.Suppressed = rtsTrue; + RtsFlags.ParFlags.ParStats.Full = rtsFalse; + break; case 'b': RtsFlags.ParFlags.ParStats.Binary = rtsTrue; break; case 's': RtsFlags.ParFlags.ParStats.Sparks = rtsTrue; @@ -1683,7 +1971,13 @@ process_par_option(int arg, int *rts_argc, char *rts_argv[], rtsBool *error) // break; case 'n': RtsFlags.ParFlags.ParStats.NewLogfile = rtsTrue; break; - case 'g': RtsFlags.ParFlags.ParStats.Global = rtsTrue; + case 'g': +# if defined(PAR_TICKY) + RtsFlags.ParFlags.ParStats.Global = rtsTrue; +# else + fprintf(stderr,"-qPg is only possible for a PAR_TICKY RTS, which this is not"); + stg_exit(EXIT_FAILURE); +# endif break; default: barf("Unknown option -qP%c", rts_argv[arg][2]); } @@ -1696,14 +1990,20 @@ process_par_option(int arg, int *rts_argc, char *rts_argv[], rtsBool *error) if (rts_argv[arg][3] != '\0') { RtsFlags.ParFlags.packBufferSize = decode(rts_argv[arg]+3); } else { - belch("setupRtsFlags: missing size of PackBuffer (for -Q)\n"); - error = rtsTrue; + belch("setupRtsFlags: missing size of PackBuffer (for -qQ)\n"); + *error = rtsTrue; } IF_PAR_DEBUG(verbose, belch("-qQ: pack buffer size set to %d", RtsFlags.ParFlags.packBufferSize)); break; + case 'R': + RtsFlags.ParFlags.doFairScheduling = rtsTrue; + IF_PAR_DEBUG(verbose, + belch("-qR: fair-ish scheduling")); + break; + # if defined(DEBUG) case 'w': if (rts_argv[arg][3] != '\0') { @@ -1739,7 +2039,8 @@ process_par_option(int arg, int *rts_argc, char *rts_argv[], rtsBool *error) break; # endif default: - belch("Unknown option -q%c", rts_argv[arg][2]); + belch("Unknown option -q%c (%d opts in total)", + rts_argv[arg][2], *rts_argc); break; } /* switch */ } @@ -1757,7 +2058,7 @@ set_par_debug_options(nat n) { fprintf(stderr, par_debug_opts_strs[i]); switch (i) { case 0: RtsFlags.ParFlags.Debug.verbose = rtsTrue; break; - case 1: RtsFlags.ParFlags.Debug.trace = rtsTrue; break; + case 1: RtsFlags.ParFlags.Debug.bq = rtsTrue; break; case 2: RtsFlags.ParFlags.Debug.schedule = rtsTrue; break; case 3: RtsFlags.ParFlags.Debug.free = rtsTrue; break; case 4: RtsFlags.ParFlags.Debug.resume = rtsTrue; break; @@ -1767,8 +2068,10 @@ set_par_debug_options(nat n) { case 7: RtsFlags.ParFlags.Debug.fish = rtsTrue; break; case 8: RtsFlags.ParFlags.Debug.tables = rtsTrue; break; case 9: RtsFlags.ParFlags.Debug.packet = rtsTrue; break; - case 10: RtsFlags.ParFlags.Debug.pack = rtsTrue; break; - default: barf("set_par_debug_options: only %d debug options expected"); + case 10: RtsFlags.ParFlags.Debug.pack = rtsTrue; break; + case 11: RtsFlags.ParFlags.Debug.paranoia = rtsTrue; break; + default: barf("set_par_debug_options: only %d debug options expected", + MAX_PAR_DEBUG_OPTION); } /* switch */ } /* if */ } @@ -1788,42 +2091,6 @@ help_par_debug_options(nat n) { #endif /* PAR */ -#ifdef DEBUG -static void -set_debug_options(nat n) { - nat i; - - for (i=0; i<=MAX_DEBUG_OPTION; i++) - if ((n>>i)&1) { - fprintf(stderr, debug_opts_strs[i]); - switch (i) { - case 0: RtsFlags.DebugFlags.scheduler = rtsTrue; break; - case 1: RtsFlags.DebugFlags.evaluator = rtsTrue; break; - case 2: RtsFlags.DebugFlags.codegen = rtsTrue; break; - case 3: RtsFlags.DebugFlags.weak = rtsTrue; break; - case 4: RtsFlags.DebugFlags.gccafs = rtsTrue; break; - case 5: RtsFlags.DebugFlags.gc = rtsTrue; break; - case 6: RtsFlags.DebugFlags.block_alloc = rtsTrue; break; - case 7: RtsFlags.DebugFlags.sanity = rtsTrue; break; - case 8: RtsFlags.DebugFlags.stable = rtsTrue; break; - case 9: RtsFlags.DebugFlags.prof = rtsTrue; break; - case 10: RtsFlags.DebugFlags.gran = rtsTrue; break; - case 11: RtsFlags.DebugFlags.par = rtsTrue; break; - case 12: RtsFlags.DebugFlags.linker = rtsTrue; break; - } /* switch */ - } /* if */ -} - -static void -help_debug_options(nat n) { - nat i; - - for (i=0; i<=MAX_DEBUG_OPTION; i++) - if ((n>>i)&1) - fprintf(stderr, debug_opts_strs[i]); -} -#endif /* DEBUG */ - //@node Aux fcts, , GranSim specific options //@subsection Aux fcts