Mercurial > hg > truffle

changeset 11423:496cf245f023

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix logging for leaf scope
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 26 Aug 2013 18:06:06 +0200
parents 774e1c2f8741
children ece40b452e65 a7dd2d728500 b77721210bd6
files graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java	Mon Aug 26 18:04:53 2013 +0200
+++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java	Mon Aug 26 18:06:06 2013 +0200
@@ -239,7 +239,6 @@
         }
         instanceTL.set(newChild);
         newChild.updateFlags();
-        newChild.setLogEnabled(oldContext.isLogEnabled());
         try (TimerCloseable a = scopeTime.start()) {
             return executeScope(runnable, callable);
         } finally {
@@ -282,6 +281,7 @@
             meterEnabled = false;
             timeEnabled = false;
             dumpEnabled = false;
+            setLogEnabled(false);
 
             // Be pragmatic: provide a default log stream to prevent a crash if the stream is not
             // set while logging
@@ -291,6 +291,7 @@
             timeEnabled = config.isTimeEnabled();
             dumpEnabled = config.isDumpEnabled();
             output = config.output();
+            setLogEnabled(config.isLogEnabled());
         }
     }
 
@@ -390,7 +391,6 @@
     public void setConfig(DebugConfig newConfig) {
         configTL.set(newConfig);
         updateFlags();
-        setLogEnabled(newConfig != null && newConfig.isLogEnabled());
     }
 
     public String getQualifiedName() {