# HG changeset patch # User Christian Humer # Date 1415211425 -3600 # Node ID c7d99b3d1f1516f99f09009cf71799993a947c8f # Parent b0a8fb72c72100adff30910d3814861e585925cd Truffle: changed depth argument to represent the number of indendations instead of spaces. diff -r b0a8fb72c721 -r c7d99b3d1f15 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java --- 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 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); diff -r b0a8fb72c721 -r c7d99b3d1f15 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationCallTreeListener.java --- 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", "", new LinkedHashMap()); + log(depth, "opt call tree", "", new LinkedHashMap()); } return true; } diff -r b0a8fb72c721 -r c7d99b3d1f15 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceInliningListener.java --- 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); } }