# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1385070308 -3600
# Node ID bdc836ef885eb3128119ecb52b28b823f4f5296d
# Parent  d3fc35a433769be1ed663dfde6535748756e9a5a
made CITimeEach work for Graal even if CITime is not enabled

diff -r d3fc35a43376 -r bdc836ef885e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Thu Nov 21 22:24:00 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Thu Nov 21 22:45:08 2013 +0100
@@ -200,7 +200,7 @@
                 System.exit(-1);
             }
         } finally {
-            if (config.ciTime && installedCode != null) {
+            if ((config.ciTime || config.ciTimeEach) && installedCode != null) {
                 long processedBytes = InlinedBytecodes.getCurrentValue() - previousInlinedBytecodes;
                 long time = CompilationTime.getCurrentValue() - previousCompilationTime;
                 TimeUnit timeUnit = CompilationTime.getTimeUnit();
diff -r d3fc35a43376 -r bdc836ef885e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java	Thu Nov 21 22:24:00 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java	Thu Nov 21 22:45:08 2013 +0100
@@ -219,10 +219,10 @@
      * Called from VM code once all Graal command line options have been processed by
      * {@link #setOption(String)}.
      * 
-     * @param ciTime the value of the CITime HotSpot VM option
+     * @param timeCompilations true if the CITime or CITimeEach HotSpot VM options are set
      */
-    public static void finalizeOptions(boolean ciTime) {
-        if (ciTime) {
+    public static void finalizeOptions(boolean timeCompilations) {
+        if (timeCompilations) {
             unconditionallyEnableTimerOrMetric(InliningUtil.class, "InlinedBytecodes");
             unconditionallyEnableTimerOrMetric(CompilationTask.class, "CompilationTime");
         }
diff -r d3fc35a43376 -r bdc836ef885e src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Thu Nov 21 22:24:00 2013 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Thu Nov 21 22:45:08 2013 +0100
@@ -98,7 +98,7 @@
         vm_abort(false);
       }
     }
-    VMToCompiler::finalizeOptions(CITime);
+    VMToCompiler::finalizeOptions(CITime || CITimeEach);
 
     if (UseCompiler) {
       bool bootstrap = GRAALVM_ONLY(BootstrapGraal) NOT_GRAALVM(false);