projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a9fd21c
)
tracing wibble (make -ls work with a -debug RTS)
author
Simon Marlow
<marlowsd@gmail.com>
Tue, 6 Oct 2009 15:47:47 +0000
(15:47 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Tue, 6 Oct 2009 15:47:47 +0000
(15:47 +0000)
rts/Trace.c
patch
|
blob
|
history
diff --git
a/rts/Trace.c
b/rts/Trace.c
index
a26a919
..
81a2eb2
100644
(file)
--- a/
rts/Trace.c
+++ b/
rts/Trace.c
@@
-58,17
+58,11
@@
void initTracing (void)
initMutex(&trace_utx);
#endif
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);
#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);
DEBUG_FLAG(interpreter, DEBUG_interp);
DEBUG_FLAG(weak, DEBUG_weak);
@@
-85,6
+79,11
@@
void initTracing (void)
DEBUG_FLAG(sparks, DEBUG_sparks);
#endif
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) {
eventlog_enabled = RtsFlags.TraceFlags.tracing == TRACE_EVENTLOG;
if (eventlog_enabled) {