summaryrefslogtreecommitdiff
path: root/rts/Trace.c
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2012-03-22 13:59:23 +0000
committerSimon Marlow <marlowsd@gmail.com>2012-03-23 15:01:10 +0000
commit68d00a07c99fd055a49cc4a71aa7c4b5ae480dbb (patch)
tree7e6a06f775e7d34403382b5954d4ac5c48e71f59 /rts/Trace.c
parent009058b28f1928e954eb958a77d4fb9dc012bee6 (diff)
downloadhaskell-68d00a07c99fd055a49cc4a71aa7c4b5ae480dbb.tar.gz
when tracing to stderr, make the capset events conditional on TRACE_sched
Diffstat (limited to 'rts/Trace.c')
-rw-r--r--rts/Trace.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/rts/Trace.c b/rts/Trace.c
index 7f314ba5d6..e3934d668e 100644
--- a/rts/Trace.c
+++ b/rts/Trace.c
@@ -308,9 +308,11 @@ void traceCapsetEvent_ (EventTypeNum tag,
CapsetID capset,
StgWord info)
{
-#if 0
#ifdef DEBUG
- if (RtsFlags.TraceFlags.tracing == TRACE_STDERR) {
+ if (RtsFlags.TraceFlags.tracing == TRACE_STDERR && TRACE_sched)
+ // When events go to stderr, it is annoying to see the capset
+ // events every time, so we only emit them with -Ds.
+ {
ACQUIRE_LOCK(&trace_utx);
tracePreface();
@@ -333,7 +335,6 @@ void traceCapsetEvent_ (EventTypeNum tag,
RELEASE_LOCK(&trace_utx);
} else
#endif
-#endif
{
if (eventlog_enabled) {
postCapsetEvent(tag, capset, info);