Mercurial > hg > truffle

changeset 18272:c7d99b3d1f15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: changed depth argument to represent the number of indendations instead of spaces.
author Christian Humer <christian.humer@gmail.com>
date Wed, 05 Nov 2014 19:17:05 +0100
parents b0a8fb72c721
children ad913bc76b90
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationCallTreeListener.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceInliningListener.java
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java	Wed Nov 05 19:14:25 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java	Wed Nov 05 19:17:05 2014 +0100
@@ -68,12 +68,13 @@
     }
 
     public static void log(int indent, String msg, String details, Map<String, Object> properties) {
+        int spaceIndent = indent * 2;
         StringBuilder sb = new StringBuilder();
         sb.append(String.format("[truffle] %-16s ", msg));
-        for (int i = 0; i < indent; i++) {
+        for (int i = 0; i < spaceIndent; i++) {
             sb.append(' ');
         }
-        sb.append(String.format("%-" + (60 - indent) + "s", details));
+        sb.append(String.format("%-" + (60 - spaceIndent) + "s", details));
         if (properties != null) {
             for (String property : properties.keySet()) {
                 Object value = properties.get(property);
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationCallTreeListener.java	Wed Nov 05 19:14:25 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationCallTreeListener.java	Wed Nov 05 19:17:05 2014 +0100
@@ -65,10 +65,10 @@
                     addASTSizeProperty(callNode.getCurrentCallTarget(), properties);
                     properties.putAll(callNode.getCurrentCallTarget().getDebugProperties());
                     properties.put("Stamp", callNode.getCurrentCallTarget().getArgumentStamp());
-                    log((depth * 2), "opt call tree", callNode.getCurrentCallTarget().toString() + dispatched, properties);
+                    log(depth, "opt call tree", callNode.getCurrentCallTarget().toString() + dispatched, properties);
                 } else if (node instanceof OptimizedIndirectCallNode) {
                     int depth = decisionStack == null ? 0 : decisionStack.size() - 1;
-                    log((depth * 2), "opt call tree", "<indirect>", new LinkedHashMap<String, Object>());
+                    log(depth, "opt call tree", "<indirect>", new LinkedHashMap<String, Object>());
                 }
                 return true;
             }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceInliningListener.java	Wed Nov 05 19:14:25 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceInliningListener.java	Wed Nov 05 19:17:05 2014 +0100
@@ -69,7 +69,7 @@
         if (profile != null) {
             properties.putAll(profile.getDebugProperties());
         }
-        log((depth * 2), status, callNode.getCurrentCallTarget().toString(), properties);
+        log(depth, status, callNode.getCurrentCallTarget().toString(), properties);
     }
 
 }