From 41a801223a8bd07659ea1178df67912f5dc3d588 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 6 Oct 2009 15:47:47 +0000 Subject: [PATCH] tracing wibble (make -ls work with a -debug RTS) --- rts/Trace.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rts/Trace.c b/rts/Trace.c index a26a919..81a2eb2 100644 --- a/rts/Trace.c +++ b/rts/Trace.c @@ -58,17 +58,11 @@ void initTracing (void) initMutex(&trace_utx); #endif -#define TRACE_FLAG(name, class) \ - class = RtsFlags.TraceFlags.name ? 1 : 0; - - TRACE_FLAG(scheduler, TRACE_sched); - #ifdef DEBUG #define DEBUG_FLAG(name, class) \ class = RtsFlags.DebugFlags.name ? 1 : 0; DEBUG_FLAG(scheduler, DEBUG_sched); - DEBUG_FLAG(scheduler, TRACE_sched); // -Ds enabled all sched events DEBUG_FLAG(interpreter, DEBUG_interp); DEBUG_FLAG(weak, DEBUG_weak); @@ -85,6 +79,11 @@ void initTracing (void) DEBUG_FLAG(sparks, DEBUG_sparks); #endif + // -Ds turns on scheduler tracing too + TRACE_sched = + RtsFlags.TraceFlags.scheduler || + RtsFlags.DebugFlags.scheduler; + eventlog_enabled = RtsFlags.TraceFlags.tracing == TRACE_EVENTLOG; if (eventlog_enabled) { -- 1.7.10.4