X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsFlags.c;h=789d73de8c7e47265537b502da5bed903463cc5b;hb=b1c5d8c6dc8b08e6963897eadf70d8bcbfa8fa7b;hp=d070c130fe7c33bca0e2f3cfa0ec32e18490a8d8;hpb=e38fdaa5279c579dc9fe573bcd6e268dae0326ff;p=ghc-hetmet.git diff --git a/ghc/rts/RtsFlags.c b/ghc/rts/RtsFlags.c index d070c13..789d73d 100644 --- a/ghc/rts/RtsFlags.c +++ b/ghc/rts/RtsFlags.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsFlags.c,v 1.51 2001/10/01 11:36:28 simonmar Exp $ + * $Id: RtsFlags.c,v 1.65 2003/01/28 16:23:53 simonmar Exp $ * * (c) The AQUA Project, Glasgow University, 1994-1997 * (c) The GHC Team, 1998-1999 @@ -37,14 +37,17 @@ #include #endif +#include +#include + extern struct 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 */ +int rts_argc = 0; /* ditto */ char *rts_argv[MAX_RTS_ARGS]; //@node Constants, Static function decls, Includes @@ -56,25 +59,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 */ + "_.", /* interpreter */ "_,", /* codegen */ "_;", /* weak */ "_~", /* gccafs */ @@ -202,10 +189,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 @@ -244,18 +227,40 @@ void initRtsFlagsDefaults(void) 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.profileFrequency = 20; + 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; #endif @@ -413,17 +418,28 @@ usage_text[] = { # 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{cc, cc ...} specific cost centre(s) (NOT STACKS!)", -" -hm{mod,mod...} all cost centres from the specified modules(s)", -" -hd{des,des...} closures with specified closure descriptions", -" -hy{typ,typ...} closures with specified type descriptions", +" -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)", "", -" -i Time between heap samples (msec, default: 20)", +" -xt Include threads (TSOs) in a heap profile", "", " -xc Show current cost centre stack on raising an exception", # endif @@ -447,6 +463,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 @@ -539,7 +572,7 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) } } - // process arguments from the GHCRTS environment variable first + // process arguments from the GHCRTS environment variable next // (arguments from the command line override these). { char *ghc_rts = getenv("GHCRTS"); @@ -695,12 +728,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': @@ -820,6 +900,11 @@ error = rtsTrue; } ) 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]) { @@ -837,58 +922,109 @@ 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; - case 'c': /* cost centre label select */ - case 'm': /* cost centre module select */ - case 'd': /* closure descr select */ - case 'y': /* closure type select */ - {char *left = strchr(rts_argv[arg], '{'); - char *right = strrchr(rts_argv[arg], '}'); - if (! left || ! right || - strrchr(rts_argv[arg], '{') != left || - strchr(rts_argv[arg], '}') != right) { - prog_belch( - "Invalid heap profiling selection bracketing\n %s\n", - rts_argv[arg]); - error = rtsTrue; - } else { - *right = '\0'; - switch (rts_argv[arg][2]) { - case 'c': /* cost centre label select */ - RtsFlags.ProfFlags.ccSelector = left + 1; - break; - case 'm': /* cost centre module select */ - RtsFlags.ProfFlags.modSelector = left + 1; - break; - case 'd': /* closure descr select */ - RtsFlags.ProfFlags.descrSelector = left + 1; - break; - case 'y': /* closure type select */ - RtsFlags.ProfFlags.typeSelector = left + 1; - break; - } - } - } - break; - default: + + default: prog_belch("invalid heap profile option: %s",rts_argv[arg]); error = rtsTrue; } ) - -#endif +#endif // PROFILING break; #if defined(PROFILING) @@ -904,11 +1040,9 @@ error = rtsTrue; if (cst != 0 && cst < CS_MIN_MILLISECS) cst = CS_MIN_MILLISECS; - RtsFlags.ProfFlags.profileFrequency = cst; + RtsFlags.ProfFlags.profileInterval = cst; } - break; - #endif /* =========== CONCURRENT ========================= */ @@ -990,8 +1124,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. */ @@ -1311,8 +1452,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; } @@ -1997,44 +2137,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; - default: barf("set_debug_options: only %d debug options expected", - MAX_DEBUG_OPTION); - } /* 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