Adapt fix

Author: hicham-amazigh

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/CompilationAlarm.java

@@ -38,6 +38,7 @@
 import jdk.graal.compiler.options.OptionType;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.serviceprovider.GraalServices;
+import jdk.graal.compiler.serviceprovider.JMXService;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
@@ -73,6 +74,11 @@ public static class Options {
     private CompilationAlarm(double period) {
         this.previous = currentAlarm.get();
         reset(period);
+        JMXService.GCTimeStatistics timing = null;
+        if (period != 0) {
+            timing = GraalServices.getGCTimeStatistics();
+        }
+        this.gcTiming = timing;
     }
 
     /**
@@ -216,6 +222,11 @@ public void close() {
      */
     private long expirationNS;
 
+    /**
+     * Time spent in the garbage collector if it's available.
+     */
+    private final JMXService.GCTimeStatistics gcTiming;
+
     /**
      * Signal the execution of the phase identified by {@code name} starts.
      */

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/BaseTimerKey.java

@@ -48,6 +48,11 @@ public TimeUnit getTimeUnit() {
             return accm.getTimeUnit();
         }
 
+        @Override
+        public void add(DebugContext debug, long value, TimeUnit units) {
+            accm.add(debug, value, units);
+        }
+
         @Override
         public DebugCloseable start(DebugContext debug) {
             return accm.start(debug);
@@ -90,6 +95,13 @@ public DebugCloseable start(DebugContext debug) {
         }
     }
 
+    @Override
+    public void add(DebugContext debug, long value, TimeUnit units) {
+        if (debug.isTimerEnabled(this)) {
+            addToCurrentValue(debug, getTimeUnit().convert(value, units));
+        }
+    }
+
     @Override
     public TimerKey getFlat() {
         return (FlatTimer) flat;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugContext.java

@@ -203,6 +203,17 @@ static final class Immutable {
 
         final boolean listMetrics;
 
+        /**
+         * Names of counters. A counter is active if this set is empty or contains the counter's
+         * name.
+         */
+        final EconomicSet<String> counters;
+
+        /**
+         * Names of timers. A timer is active if this set is empty or contains the timer's name.
+         */
+        final EconomicSet<String> timers;
+
         /**
          * Names of unscoped counters. A counter is unscoped if this set is empty or contains the
          * counter's name.
@@ -221,6 +232,25 @@ static final class Immutable {
          */
         final EconomicSet<String> unscopedMemUseTrackers;
 
+        private static EconomicSet<String> parseMetricSpec(String spec, boolean accumulatedKey) {
+            if (spec == null) {
+                return null;
+            } else if (spec.isEmpty()) {
+                return EconomicSet.emptySet();
+            } else {
+                EconomicSet<String> res = EconomicSet.create();
+                if (!accumulatedKey) {
+                    res.addAll(Arrays.asList(spec.split(",")));
+                } else {
+                    for (String n : spec.split(",")) {
+                        res.add(n + AccumulatedKey.ACCUMULATED_KEY_SUFFIX);
+                        res.add(n + AccumulatedKey.FLAT_KEY_SUFFIX);
+                    }
+                }
+                return res;
+            }
+        }
+
         private static EconomicSet<String> parseUnscopedMetricSpec(String spec, boolean unconditional, boolean accumulatedKey) {
             EconomicSet<String> res;
             if (spec == null) {
@@ -271,6 +301,8 @@ private static boolean isNotEmpty(OptionKey<String> option, OptionValues options
 
         private Immutable(OptionValues options) {
             this.options = options;
+            this.counters = parseMetricSpec(DebugOptions.Counters.getValue(options), false);
+            this.timers = parseMetricSpec(DebugOptions.Timers.getValue(options), true);
             String timeValue = DebugOptions.Time.getValue(options);
             String trackMemUseValue = DebugOptions.TrackMemUse.getValue(options);
             this.unscopedCounters = parseUnscopedMetricSpec(DebugOptions.Counters.getValue(options), "".equals(DebugOptions.Count.getValue(options)), false);
@@ -300,6 +332,8 @@ private Immutable() {
             this.unscopedMemUseTrackers = null;
             this.scopesEnabled = false;
             this.listMetrics = false;
+            this.counters = null;
+            this.timers = null;
         }
 
         public boolean hasUnscopedMetrics() {
@@ -754,6 +788,14 @@ public boolean isDumpEnabled(int dumpLevel) {
         return currentScope != null && currentScope.isDumpEnabled(dumpLevel);
     }
 
+    public boolean areCountersEnabled() {
+        return immutable.counters != null;
+    }
+
+    public boolean areTimersEnabled() {
+        return immutable.timers != null;
+    }
+
     /**
      * Determines if verification is enabled in the current scope.
      *

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimerKey.java

@@ -51,6 +51,11 @@ public interface TimerKey extends MetricKey {
      */
     long getCurrentValue(DebugContext debug);
 
+    /**
+     * Adds {@code value} to this timer.
+     */
+    void add(DebugContext debug, long value, TimeUnit units);
+
     /**
      * Gets the time unit of this timer.
      */