X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=1403801b07fc2814628d1114988708ca6a9191d6;hb=6cf8982ac30be6836a0cdd8be5a6ac1a1a144213;hp=397ea8b5ec33a20f04b29523ea3fbba8fd805993;hpb=53628e913632cac29d54da914040e39add334784;p=ghc-hetmet.git diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index 397ea8b..1403801 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -135,7 +135,7 @@ void initRtsFlagsDefaults(void) #endif #ifdef TRACING - RtsFlags.TraceFlags.trace_stderr = rtsFalse; + RtsFlags.TraceFlags.tracing = TRACE_NONE; RtsFlags.TraceFlags.timestamp = rtsFalse; RtsFlags.TraceFlags.scheduler = rtsFalse; #endif @@ -652,7 +652,7 @@ error = rtsTrue; } // -Dx also turns on -v. Use -l to direct trace // events to the .eventlog file instead. - RtsFlags.TraceFlags.trace_stderr = rtsTrue; + RtsFlags.TraceFlags.tracing = TRACE_STDERR; break; } #endif @@ -760,20 +760,21 @@ error = rtsTrue; #ifdef TRACING switch(rts_argv[arg][2]) { case '\0': - RtsFlags.TraceFlags.trace_stderr = rtsFalse; - break; + RtsFlags.TraceFlags.tracing = TRACE_EVENTLOG; + break; case 's': - RtsFlags.TraceFlags.scheduler = rtsTrue; - break; + 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"); + errorBelch("not built for: -eventlog"); #endif - break; + break; case 'P': /* detailed cost centre profiling (time/alloc) */ case 'p': /* cost centre profiling (time/alloc) */ @@ -1080,7 +1081,7 @@ error = rtsTrue; switch(rts_argv[arg][2]) { #ifdef TRACING case '\0': - RtsFlags.TraceFlags.trace_stderr = rtsTrue; + RtsFlags.TraceFlags.tracing = TRACE_STDERR; break; case 't': RtsFlags.TraceFlags.timestamp = rtsTrue;