# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1389192006 -3600
# Node ID ba72961e0d413ac839207d5ef6fcd76408ec61d2
# Parent  e64bc21493963ba91057ea9896dd3d8428391c7d
removed ability for the log indentation mechanism to also enable/disable logging which should be controlled only by the -G:Log command line option

diff -r e64bc2149396 -r ba72961e0d41 graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java	Wed Jan 08 14:50:05 2014 +0100
+++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java	Wed Jan 08 15:40:06 2014 +0100
@@ -263,10 +263,6 @@
         }
 
         @Override
-        public void setEnabled(boolean enabled) {
-        }
-
-        @Override
         public Indent indent() {
             return this;
         }
@@ -304,22 +300,6 @@
     }
 
     /**
-     * Creates a new indentation level based on the last used Indent of the current DebugScope and
-     * turns on/off logging.
-     * 
-     * @param enabled If true, logging is enabled, otherwise disabled
-     * @return The new indentation level
-     */
-    public static Indent indent(boolean enabled) {
-        if (ENABLED) {
-            Indent logger = DebugScope.getInstance().pushIndentLogger();
-            logger.setEnabled(enabled);
-            return logger;
-        }
-        return noLoggerInstance;
-    }
-
-    /**
      * A convenience function which combines {@link #log} and {@link #indent()}.
      * 
      * @param msg The format string of the log message
@@ -336,28 +316,6 @@
         return noLoggerInstance;
     }
 
-    /**
-     * A convenience function which combines {@link #log} and {@link #indent(boolean)}.
-     * 
-     * @param enabled If true, logging is enabled, otherwise disabled
-     * @param msg The format string of the log message
-     * @param args The arguments referenced by the log message string
-     * @return The new indentation level
-     */
-    public static Indent logAndIndent(boolean enabled, String msg, Object... args) {
-        if (ENABLED) {
-            DebugScope scope = DebugScope.getInstance();
-            boolean saveLogEnabled = scope.isLogEnabled();
-            scope.setLogEnabled(enabled);
-            scope.log(msg, args);
-            scope.setLogEnabled(saveLogEnabled);
-            Indent indent = scope.pushIndentLogger();
-            indent.setEnabled(enabled);
-            return indent;
-        }
-        return noLoggerInstance;
-    }
-
     public static Iterable<Object> context() {
         if (ENABLED) {
             return DebugScope.getInstance().getCurrentContext();
diff -r e64bc2149396 -r ba72961e0d41 graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Indent.java
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Indent.java	Wed Jan 08 14:50:05 2014 +0100
+++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Indent.java	Wed Jan 08 15:40:06 2014 +0100
@@ -73,13 +73,6 @@
     void log(String msg, Object... args);
 
     /**
-     * Turns on/off logging for this indentation level.
-     * 
-     * @param enabled If true, logging is enabled, otherwise disabled
-     */
-    void setEnabled(boolean enabled);
-
-    /**
      * Creates a new indentation level (by adding some spaces).
      * 
      * @return The new indentation level
diff -r e64bc2149396 -r ba72961e0d41 graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java	Wed Jan 08 14:50:05 2014 +0100
+++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java	Wed Jan 08 15:40:06 2014 +0100
@@ -35,13 +35,11 @@
         private static final String INDENTATION_INCREMENT = "  ";
 
         final String indent;
-        boolean enabled;
         final IndentImpl parentIndent;
 
-        IndentImpl(IndentImpl parentIndent, boolean enabled) {
+        IndentImpl(IndentImpl parentIndent) {
             this.parentIndent = parentIndent;
             this.indent = (parentIndent == null ? "" : parentIndent.indent + INDENTATION_INCREMENT);
-            this.enabled = enabled;
         }
 
         private void printScopeName() {
@@ -56,7 +54,7 @@
 
         @Override
         public void log(String msg, Object... args) {
-            if (enabled) {
+            if (isLogEnabled()) {
                 printScopeName();
                 output.println(indent + String.format(msg, args));
                 lastUsedIndent = this;
@@ -64,13 +62,8 @@
         }
 
         @Override
-        public void setEnabled(boolean enabled) {
-            this.enabled = enabled;
-        }
-
-        @Override
         public Indent indent() {
-            lastUsedIndent = new IndentImpl(this, enabled);
+            lastUsedIndent = new IndentImpl(this);
             return lastUsedIndent;
         }
 
@@ -115,6 +108,7 @@
     private boolean meterEnabled;
     private boolean timeEnabled;
     private boolean dumpEnabled;
+    private boolean logEnabled;
 
     private PrintStream output;
 
@@ -141,10 +135,10 @@
         this.context = context;
         this.qualifiedName = qualifiedName;
         if (parent != null) {
-            lastUsedIndent = new IndentImpl(parent.lastUsedIndent, parent.isLogEnabled());
+            lastUsedIndent = new IndentImpl(parent.lastUsedIndent);
             logScopeName = !parent.qualifiedName.equals(qualifiedName);
         } else {
-            lastUsedIndent = new IndentImpl(null, false);
+            lastUsedIndent = new IndentImpl(null);
             logScopeName = true;
         }
 
@@ -178,11 +172,7 @@
     }
 
     public boolean isLogEnabled() {
-        return lastUsedIndent.enabled;
-    }
-
-    public void setLogEnabled(boolean enabled) {
-        lastUsedIndent.setEnabled(enabled);
+        return logEnabled;
     }
 
     public boolean isMeterEnabled() {
@@ -251,7 +241,6 @@
             newScope = this.createChild(name, context);
         }
         instanceTL.set(newScope);
-        newScope.setLogEnabled(this.isLogEnabled());
         newScope.updateFlags();
         return newScope;
     }
@@ -297,10 +286,8 @@
             meterEnabled = config.isMeterEnabled();
             timeEnabled = config.isTimeEnabled();
             dumpEnabled = config.isDumpEnabled();
+            logEnabled = config.isLogEnabled();
             output = config.output();
-            if (config.isLogEnabled()) {
-                setLogEnabled(true);
-            }
         }
     }