Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/68d00a07c99fd055a49cc4a71aa7c4b5ae480dbb

>---------------------------------------------------------------

commit 68d00a07c99fd055a49cc4a71aa7c4b5ae480dbb
Author: Simon Marlow <[email protected]>
Date:   Thu Mar 22 13:59:23 2012 +0000

    when tracing to stderr, make the capset events conditional on TRACE_sched

>---------------------------------------------------------------

 rts/Trace.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rts/Trace.c b/rts/Trace.c
index 7f314ba..e3934d6 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);



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to