Mercurial > hg > truffle
changeset 11628:febd01be55e0
moved 'conditional' field and related methods down in DebugValue
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 13 Sep 2013 15:20:53 +0200 |
| parents | 46e708738717 |
| children | a0da0bff042e |
| files | graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugValue.java graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/MetricImpl.java graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/TimerImpl.java |
| diffstat | 3 files changed, 19 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugValue.java Fri Sep 13 11:57:18 2013 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugValue.java Fri Sep 13 15:20:53 2013 +0200 @@ -30,10 +30,12 @@ private final String name; private int index; + private boolean conditional; - protected DebugValue(String name) { + protected DebugValue(String name, boolean conditional) { this.name = name; this.index = -1; + this.conditional = conditional; } protected long getCurrentValue() { @@ -46,6 +48,14 @@ DebugScope.getInstance().setCurrentValue(index, l); } + public void setConditional(boolean flag) { + conditional = flag; + } + + public boolean isConditional() { + return conditional; + } + private void ensureInitialized() { if (index == -1) { index = KeyRegistry.register(this);
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/MetricImpl.java Fri Sep 13 11:57:18 2013 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/MetricImpl.java Fri Sep 13 15:20:53 2013 +0200 @@ -26,11 +26,8 @@ public final class MetricImpl extends DebugValue implements DebugMetric { - private boolean conditional; - public MetricImpl(String name, boolean conditional) { - super(name); - this.conditional = conditional; + super(name, conditional); } public void increment() { @@ -38,7 +35,7 @@ } public void add(long value) { - if (!conditional || Debug.isMeterEnabled()) { + if (!isConditional() || Debug.isMeterEnabled()) { super.addToCurrentValue(value); } } @@ -47,12 +44,4 @@ public String toString(long value) { return Long.toString(value); } - - public void setConditional(boolean flag) { - conditional = flag; - } - - public boolean isConditional() { - return conditional; - } }
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/TimerImpl.java Fri Sep 13 11:57:18 2013 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/TimerImpl.java Fri Sep 13 15:20:53 2013 +0200 @@ -42,19 +42,8 @@ */ private static ThreadLocal<AbstractTimer> currentTimer = new ThreadLocal<>(); - private boolean conditional; - public TimerImpl(String name, boolean conditional) { - super(name); - this.conditional = conditional; - } - - public void setConditional(boolean flag) { - conditional = flag; - } - - public boolean isConditional() { - return conditional; + super(name, conditional); } @Override @@ -80,9 +69,13 @@ } } + public static String valueToString(long value) { + return String.format("%d.%d ms", value / 1000000, (value / 100000) % 10); + } + @Override public String toString(long value) { - return String.format("%d.%d ms", value / 1000000, (value / 100000) % 10); + return valueToString(value); } private abstract class AbstractTimer implements TimerCloseable {