# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1326891280 -3600
# Node ID 249752adcb8d4ce7763754359180c424f3ae33ef
# Parent  636e2fcbbe32c2101c4046dc3d6525ea4a644353
Rename Timer DebugTimer and Metric DebugMetric.

diff -r 636e2fcbbe32 -r 249752adcb8d graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java	Wed Jan 18 12:28:41 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java	Wed Jan 18 13:54:40 2012 +0100
@@ -119,13 +119,10 @@
      */
     private final int firstVariableNumber;
 
-    private final StructuredGraph graph;
-
 
     public LinearScan(CiTarget target, RiResolvedMethod method, StructuredGraph graph, LIR ir, LIRGenerator gen, FrameMap frameMap) {
         this.target = target;
         this.method = method;
-        this.graph = graph;
         this.ir = ir;
         this.gen = gen;
         this.frameMap = frameMap;
@@ -1785,11 +1782,11 @@
         }
     }
 
-    private static final Debug.Timer timerLifetimeAnalysis = Debug.timer("LifetimeAnalysis");
-    private static final Debug.Timer timerLinearScan = Debug.timer("LinearScan");
-    private static final Debug.Timer timerLinearScanResolution = Debug.timer("LinearScanResolution");
-    private static final Debug.Timer timerDebugInfo = Debug.timer("DebugInfo");
-    private static final Debug.Timer timerControlFlowOptimizations = Debug.timer("ControlFlowOptimizations");
+    private static final DebugTimer timerLifetimeAnalysis = Debug.timer("LifetimeAnalysis");
+    private static final DebugTimer timerLinearScan = Debug.timer("LinearScan");
+    private static final DebugTimer timerLinearScanResolution = Debug.timer("LinearScanResolution");
+    private static final DebugTimer timerDebugInfo = Debug.timer("DebugInfo");
+    private static final DebugTimer timerControlFlowOptimizations = Debug.timer("ControlFlowOptimizations");
 
     public void allocate() {
 
diff -r 636e2fcbbe32 -r 249752adcb8d graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GlobalValueNumberingPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GlobalValueNumberingPhase.java	Wed Jan 18 12:28:41 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GlobalValueNumberingPhase.java	Wed Jan 18 13:54:40 2012 +0100
@@ -30,7 +30,7 @@
 
 public class GlobalValueNumberingPhase extends Phase {
 
-    public static final Debug.Metric metricGlobalValueNumberingHits = Debug.metric("GlobalValueNumberingHits");
+    public static final DebugMetric metricGlobalValueNumberingHits = Debug.metric("GlobalValueNumberingHits");
 
     @Override
     protected void run(StructuredGraph graph) {
diff -r 636e2fcbbe32 -r 249752adcb8d graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java	Wed Jan 18 12:28:41 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java	Wed Jan 18 13:54:40 2012 +0100
@@ -56,8 +56,8 @@
     private final PhasePlan plan;
 
     // Metrics
-    private static final Debug.Metric metricInliningPerformed = Debug.metric("InliningPerformed");
-    private static final Debug.Metric metricInliningConsidered = Debug.metric("InliningConsidered");
+    private static final DebugMetric metricInliningPerformed = Debug.metric("InliningPerformed");
+    private static final DebugMetric metricInliningConsidered = Debug.metric("InliningConsidered");
 
     public InliningPhase(CiTarget target, GraalRuntime runtime, Collection<Invoke> hints, CiAssumptions assumptions, PhasePlan plan) {
         this.target = target;
diff -r 636e2fcbbe32 -r 249752adcb8d graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/Debug.java
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/Debug.java	Wed Jan 18 12:28:41 2012 +0100
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/Debug.java	Wed Jan 18 13:54:40 2012 +0100
@@ -87,7 +87,7 @@
         }
     }
 
-    public static Metric metric(String name) {
+    public static DebugMetric metric(String name) {
         if (METER) {
             return new MetricImpl(name);
         } else {
@@ -95,19 +95,14 @@
         }
     }
 
-    public interface Metric {
-        void increment();
-        void add(int value);
-    }
-
-    private static final Metric VOID_METRIC = new Metric() {
+    private static final DebugMetric VOID_METRIC = new DebugMetric() {
         @Override
         public void increment() { }
         @Override
         public void add(int value) { }
     };
 
-    public static Timer timer(String name) {
+    public static DebugTimer timer(String name) {
         if (TIME) {
             return new TimerImpl(name);
         } else {
@@ -115,12 +110,7 @@
         }
     }
 
-    public interface Timer {
-        void start();
-        void stop();
-    }
-
-    private static final Timer VOID_TIMER = new Timer() {
+    private static final DebugTimer VOID_TIMER = new DebugTimer() {
         @Override
         public void start() { }
         @Override
diff -r 636e2fcbbe32 -r 249752adcb8d graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/MetricImpl.java
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/MetricImpl.java	Wed Jan 18 12:28:41 2012 +0100
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/MetricImpl.java	Wed Jan 18 13:54:40 2012 +0100
@@ -22,9 +22,9 @@
  */
 package com.oracle.max.graal.debug.internal;
 
-import com.oracle.max.graal.debug.Debug.Metric;
+import com.oracle.max.graal.debug.*;
 
-public final class MetricImpl extends DebugValue implements Metric {
+public final class MetricImpl extends DebugValue implements DebugMetric {
 
     public MetricImpl(String name) {
         super(name);
diff -r 636e2fcbbe32 -r 249752adcb8d graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/TimerImpl.java
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/TimerImpl.java	Wed Jan 18 12:28:41 2012 +0100
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/TimerImpl.java	Wed Jan 18 13:54:40 2012 +0100
@@ -22,9 +22,9 @@
  */
 package com.oracle.max.graal.debug.internal;
 
-import com.oracle.max.graal.debug.Debug;
+import com.oracle.max.graal.debug.*;
 
-public final class TimerImpl extends DebugValue implements Debug.Timer {
+public final class TimerImpl extends DebugValue implements DebugTimer {
 
     private long startTime = -1;