X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=2e8ee9e9c8809b4a8a0e9653c486e14b99b3e925;hb=d108044bef62f6a0d579c92ced5e8188f72edc2d;hp=1403801b07fc2814628d1114988708ca6a9191d6;hpb=5407ad8e0a5c08ac5193c1a9ede2a12570baee0b;p=ghc-hetmet.git diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index 1403801..2e8ee9e 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -10,6 +10,7 @@ #include "PosixSource.h" #include "Rts.h" +#include "RtsOpts.h" #include "RtsUtils.h" #include "Profiling.h" @@ -51,8 +52,11 @@ open_stats_file ( const char *FILENAME_FMT, FILE **file_ret); -static I_ decode(const char *s); +static StgWord64 decodeSize(const char *flag, nat offset, StgWord64 min, StgWord64 max); static void bad_option(const char *s); +#ifdef TRACING +static void read_trace_flags(char *arg); +#endif /* ----------------------------------------------------------------------------- * Command-line option parsing routines. @@ -70,10 +74,10 @@ void initRtsFlagsDefaults(void) RtsFlags.GcFlags.minOldGenSize = (1024 * 1024) / BLOCK_SIZE; RtsFlags.GcFlags.maxHeapSize = 0; /* off by default */ RtsFlags.GcFlags.heapSizeSuggestion = 0; /* none */ + RtsFlags.GcFlags.heapSizeSuggestionAuto = rtsFalse; RtsFlags.GcFlags.pcFreeHeap = 3; /* 3% */ RtsFlags.GcFlags.oldGenFactor = 2; RtsFlags.GcFlags.generations = 2; - RtsFlags.GcFlags.steps = 2; RtsFlags.GcFlags.squeezeUpdFrames = rtsTrue; RtsFlags.GcFlags.compact = rtsFalse; RtsFlags.GcFlags.compactThreshold = 30.0; @@ -197,7 +201,6 @@ usage_text[] = { " -H Sets the minimum heap size (default 0M) Egs: -H24m -H1G", " -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)", " -c Use in-place compaction instead of copying in the oldest generation", " when live data is at least % of the maximum heap size set with", " -M (default: 30%)", @@ -252,18 +255,20 @@ usage_text[] = { " -xt Include threads (TSOs) in a heap profile", "", " -xc Show current cost centre stack on raising an exception", -"", # endif #endif /* PROFILING or PAR */ #ifdef TRACING "", -" -v Log events to stderr", -" -l Log events in binary format to the file .eventlog", -" -vt Include time stamps when tracing events to stderr with -v", -"", -" -ls Log scheduler events", -"", +" -l[flags] Log events in binary format to the file .eventlog", +# ifdef DEBUG +" -v[flags] Log events to stderr", +# endif +" where [flags] can contain:", +" s scheduler events", +# ifdef DEBUG +" t add time stamps (only useful with -v)", +# endif #endif #if !defined(PROFILING) @@ -301,7 +306,7 @@ usage_text[] = { " -Dc DEBUG: program coverage", " -Dr DEBUG: sparks", "", -" NOTE: all -D options also enable -v automatically. Use -l to create a", +" NOTE: DEBUG events are sent to stderr by default; add -l to create a", " binary event log file instead.", "", #endif /* DEBUG */ @@ -319,9 +324,6 @@ usage_text[] = { " --install-signal-handlers=", " Install signal handlers (default: yes)", #if defined(THREADED_RTS) -" -e Size of spark pools (default 100)", -#endif -#if defined(THREADED_RTS) " -e Maximum number of outstanding local sparks (default: 4096)", #endif #if defined(x86_64_HOST_ARCH) @@ -338,6 +340,8 @@ usage_text[] = { " b - branch mispredictions", " s - stalled cycles", " e - cache miss and branch misprediction events", +" +PAPI_EVENT - collect papi preset event PAPI_EVENT", +" #NATIVE_EVENT - collect native event NATIVE_EVENT (in hex)", #endif "", "RTS options may also be specified using the GHCRTS environment variable.", @@ -409,7 +413,13 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) char *ghc_rts = getenv("GHCRTS"); if (ghc_rts != NULL) { - splitRtsFlags(ghc_rts, rts_argc, rts_argv); + if (rtsOptsEnabled != rtsOptsNone) { + splitRtsFlags(ghc_rts, rts_argc, rts_argv); + } + else { + errorBelch("Warning: Ignoring GHCRTS variable as RTS options are disabled.\n Link with -rtsopts to enable them."); + // We don't actually exit, just warn + } } } @@ -428,13 +438,26 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) break; } else if (strequal("+RTS", argv[arg])) { - mode = RTS; + if (rtsOptsEnabled != rtsOptsNone) { + mode = RTS; + } + else { + errorBelch("RTS options are disabled. Link with -rtsopts to enable them."); + stg_exit(EXIT_FAILURE); + } } else if (strequal("-RTS", argv[arg])) { mode = PGM; } else if (mode == RTS && *rts_argc < MAX_RTS_ARGS-1) { - rts_argv[(*rts_argc)++] = argv[arg]; + if ((rtsOptsEnabled == rtsOptsAll) || + strequal(argv[arg], "--info")) { + rts_argv[(*rts_argc)++] = argv[arg]; + } + else { + errorBelch("Most RTS options are disabled. Link with -rtsopts to enable them."); + stg_exit(EXIT_FAILURE); + } } else if (mode == PGM) { argv[(*argc)++] = argv[arg]; @@ -471,7 +494,7 @@ setupRtsFlags(int *argc, char *argv[], int *rts_argc, char *rts_argv[]) # define TICKY_BUILD_ONLY(x) x #else # define TICKY_BUILD_ONLY(x) \ -errorBelch("not built for: ticky-ticky stats"); \ +errorBelch("the flag %s requires the program to be built with -ticky", rts_argv[arg]); \ error = rtsTrue; #endif @@ -479,7 +502,7 @@ error = rtsTrue; # define PROFILING_BUILD_ONLY(x) x #else # define PROFILING_BUILD_ONLY(x) \ -errorBelch("not built for: -prof"); \ +errorBelch("the flag %s requires the program to be built with -prof", rts_argv[arg]); \ error = rtsTrue; #endif @@ -487,7 +510,7 @@ error = rtsTrue; # define TRACING_BUILD_ONLY(x) x #else # define TRACING_BUILD_ONLY(x) \ -errorBelch("not built for: -par-prof"); \ +errorBelch("the flag %s requires the program to be built with -eventlog or -debug", rts_argv[arg]); \ error = rtsTrue; #endif @@ -495,7 +518,15 @@ error = rtsTrue; # define THREADED_BUILD_ONLY(x) x #else # define THREADED_BUILD_ONLY(x) \ -errorBelch("not built for: -smp"); \ +errorBelch("the flag %s requires the program to be built with -threaded", rts_argv[arg]); \ +error = rtsTrue; +#endif + +#ifdef DEBUG +# define DEBUG_BUILD_ONLY(x) x +#else +# define DEBUG_BUILD_ONLY(x) \ +errorBelch("the flag %s requires the program to be built with -debug", rts_argv[arg]); \ error = rtsTrue; #endif @@ -531,12 +562,10 @@ error = rtsTrue; } break; case 'A': - RtsFlags.GcFlags.minAllocAreaSize - = decode(rts_argv[arg]+2) / BLOCK_SIZE; - if (RtsFlags.GcFlags.minAllocAreaSize <= 0) { - bad_option(rts_argv[arg]); - } - break; + RtsFlags.GcFlags.minAllocAreaSize + = decodeSize(rts_argv[arg], 2, BLOCK_SIZE, HS_INT_MAX) + / BLOCK_SIZE; + break; #ifdef USE_PAPI case 'a': @@ -557,12 +586,18 @@ error = rtsTrue; RtsFlags.PapiFlags.eventType = PAPI_FLAG_CB_EVENTS; break; case '+': + case '#': if (RtsFlags.PapiFlags.numUserEvents >= MAX_PAPI_USER_EVENTS) { errorBelch("maximum number of PAPI events reached"); stg_exit(EXIT_FAILURE); } + nat eventNum = RtsFlags.PapiFlags.numUserEvents++; + char kind = rts_argv[arg][2]; + nat eventKind = kind == '+' ? PAPI_PRESET_EVENT_KIND : PAPI_NATIVE_EVENT_KIND; + + RtsFlags.PapiFlags.userEvents[eventNum] = rts_argv[arg] + 3; RtsFlags.PapiFlags.eventType = PAPI_USER_EVENTS; - RtsFlags.PapiFlags.userEvents[RtsFlags.PapiFlags.numUserEvents++] = rts_argv[arg] + 3; + RtsFlags.PapiFlags.userEventsKind[eventNum] = eventKind; break; default: bad_option( rts_argv[arg] ); @@ -594,8 +629,8 @@ error = rtsTrue; bad_option( rts_argv[arg] ); break; -#ifdef DEBUG case 'D': + DEBUG_BUILD_ONLY( { char *c; @@ -653,62 +688,46 @@ error = rtsTrue; // -Dx also turns on -v. Use -l to direct trace // events to the .eventlog file instead. RtsFlags.TraceFlags.tracing = TRACE_STDERR; - break; - } -#endif + }) + break; case 'K': - RtsFlags.GcFlags.maxStkSize = - decode(rts_argv[arg]+2) / sizeof(W_); - - if (RtsFlags.GcFlags.maxStkSize == 0) - bad_option( rts_argv[arg] ); - break; + RtsFlags.GcFlags.maxStkSize = + decodeSize(rts_argv[arg], 2, 1, HS_WORD_MAX) / sizeof(W_); + break; case 'k': - RtsFlags.GcFlags.initialStkSize = - decode(rts_argv[arg]+2) / sizeof(W_); - - if (RtsFlags.GcFlags.initialStkSize == 0) - bad_option( rts_argv[arg] ); - break; + RtsFlags.GcFlags.initialStkSize = + decodeSize(rts_argv[arg], 2, 1, HS_WORD_MAX) / sizeof(W_); + break; case 'M': - RtsFlags.GcFlags.maxHeapSize = - decode(rts_argv[arg]+2) / BLOCK_SIZE; - /* user give size in *bytes* but "maxHeapSize" is in *blocks* */ - - if (RtsFlags.GcFlags.maxHeapSize <= 0) { - bad_option(rts_argv[arg]); - } - break; + RtsFlags.GcFlags.maxHeapSize = + decodeSize(rts_argv[arg], 2, BLOCK_SIZE, HS_WORD_MAX) / BLOCK_SIZE; + /* user give size in *bytes* but "maxHeapSize" is in *blocks* */ + break; case 'm': - RtsFlags.GcFlags.pcFreeHeap = atof(rts_argv[arg]+2); + RtsFlags.GcFlags.pcFreeHeap = atof(rts_argv[arg]+2); - if (RtsFlags.GcFlags.pcFreeHeap < 0 || - RtsFlags.GcFlags.pcFreeHeap > 100) - bad_option( rts_argv[arg] ); - break; + if (RtsFlags.GcFlags.pcFreeHeap < 0 || + RtsFlags.GcFlags.pcFreeHeap > 100) + bad_option( rts_argv[arg] ); + break; case 'G': - RtsFlags.GcFlags.generations = decode(rts_argv[arg]+2); - if (RtsFlags.GcFlags.generations < 1) { - bad_option(rts_argv[arg]); - } - break; - - case 'T': - RtsFlags.GcFlags.steps = decode(rts_argv[arg]+2); - if (RtsFlags.GcFlags.steps < 1) { - bad_option(rts_argv[arg]); - } - break; + RtsFlags.GcFlags.generations = + decodeSize(rts_argv[arg], 2, 1, HS_INT_MAX); + break; case 'H': - RtsFlags.GcFlags.heapSizeSuggestion = - decode(rts_argv[arg]+2) / BLOCK_SIZE; - break; + if (rts_argv[arg][2] == '\0') { + RtsFlags.GcFlags.heapSizeSuggestionAuto = rtsTrue; + } else { + RtsFlags.GcFlags.heapSizeSuggestion = + (nat)(decodeSize(rts_argv[arg], 2, BLOCK_SIZE, HS_WORD_MAX) / BLOCK_SIZE); + } + break; #ifdef RTS_GTK_FRONTPANEL case 'f': @@ -756,26 +775,6 @@ error = rtsTrue; /* =========== PROFILING ========================== */ - case 'l': -#ifdef TRACING - switch(rts_argv[arg][2]) { - case '\0': - RtsFlags.TraceFlags.tracing = TRACE_EVENTLOG; - break; - case 's': - RtsFlags.TraceFlags.tracing = TRACE_EVENTLOG; - RtsFlags.TraceFlags.scheduler = rtsTrue; - break; - default: - errorBelch("unknown RTS option: %s",rts_argv[arg]); - error = rtsTrue; - break; - } -#else - errorBelch("not built for: -eventlog"); -#endif - break; - case 'P': /* detailed cost centre profiling (time/alloc) */ case 'p': /* cost centre profiling (time/alloc) */ PROFILING_BUILD_ONLY( @@ -966,7 +965,7 @@ error = rtsTrue; } break; -#if defined(THREADED_RTS) && !defined(NOSMP) +#if !defined(NOSMP) case 'N': THREADED_BUILD_ONLY( if (rts_argv[arg][2] == '\0') { @@ -1006,6 +1005,7 @@ error = rtsTrue; ) break; case 'q': + THREADED_BUILD_ONLY( switch (rts_argv[arg][2]) { case '\0': errorBelch("incomplete RTS option: %s",rts_argv[arg]); @@ -1044,7 +1044,7 @@ error = rtsTrue; error = rtsTrue; break; } - break; + ) break; #endif /* =========== PARALLEL =========================== */ case 'e': @@ -1077,26 +1077,19 @@ error = rtsTrue; /* =========== TRACING ---------=================== */ + case 'l': + TRACING_BUILD_ONLY( + RtsFlags.TraceFlags.tracing = TRACE_EVENTLOG; + read_trace_flags(&rts_argv[arg][2]); + ); + break; + case 'v': - switch(rts_argv[arg][2]) { -#ifdef TRACING - case '\0': - RtsFlags.TraceFlags.tracing = TRACE_STDERR; - break; - case 't': - RtsFlags.TraceFlags.timestamp = rtsTrue; - break; -#endif - case 's': - case 'g': - // ignored for backwards-compat - break; - default: - errorBelch("unknown RTS option: %s",rts_argv[arg]); - error = rtsTrue; - break; - } - break; + DEBUG_BUILD_ONLY( + RtsFlags.TraceFlags.tracing = TRACE_STDERR; + read_trace_flags(&rts_argv[arg][2]); + ); + break; /* =========== EXTENDED OPTIONS =================== */ @@ -1278,30 +1271,73 @@ open_stats_file ( -static I_ -decode(const char *s) +static StgWord64 +decodeSize(const char *flag, nat offset, StgWord64 min, StgWord64 max) { - I_ c; + char c; + const char *s; StgDouble m; + StgWord64 val; + + s = flag + offset; if (!*s) - return 0; + { + m = 0; + } + else + { + m = atof(s); + c = s[strlen(s)-1]; + + if (c == 'g' || c == 'G') + m *= 1024*1024*1024; + else if (c == 'm' || c == 'M') + m *= 1024*1024; + else if (c == 'k' || c == 'K') + m *= 1024; + else if (c == 'w' || c == 'W') + m *= sizeof(W_); + } - m = atof(s); - c = s[strlen(s)-1]; + val = (StgWord64)m; - if (c == 'g' || c == 'G') - m *= 1000*1000*1000; /* UNchecked! */ - else if (c == 'm' || c == 'M') - m *= 1000*1000; /* We do not use powers of 2 (1024) */ - else if (c == 'k' || c == 'K') /* to avoid possible bad effects on */ - m *= 1000; /* a direct-mapped cache. */ - else if (c == 'w' || c == 'W') - m *= sizeof(W_); + if (m < 0 || val < min || val > max) { + // printf doesn't like 64-bit format specs on Windows + // apparently, so fall back to unsigned long. + errorBelch("error in RTS option %s: size outside allowed range (%lu - %lu)", flag, (lnat)min, (lnat)max); + stg_exit(EXIT_FAILURE); + } - return (I_)m; + return val; } +#if defined(TRACING) +static void read_trace_flags(char *arg) +{ + char *c; + + for (c = arg; *c != '\0'; c++) { + switch(*c) { + case '\0': + break; + case 's': + RtsFlags.TraceFlags.scheduler = rtsTrue; + break; + case 't': + RtsFlags.TraceFlags.timestamp = rtsTrue; + break; + case 'g': + // ignored for backwards-compat + break; + default: + errorBelch("unknown trace option: %c",*c); + break; + } + } +} +#endif + static void GNU_ATTRIBUTE(__noreturn__) bad_option(const char *s) { @@ -1384,3 +1420,18 @@ setFullProgArgv(int argc, char *argv[]) full_prog_argv[argc] = NULL; } +void +freeFullProgArgv (void) +{ + int i; + + if (full_prog_argv != NULL) { + for (i = 0; i < full_prog_argc; i++) { + stgFree(full_prog_argv[i]); + } + stgFree(full_prog_argv); + } + + full_prog_argc = 0; + full_prog_argv = NULL; +}