Mercurial > hg > truffle
changeset 11585:516b93ccf7c9
pass the value of the -XX:+CITime VM option explicitly to HotSpotOptions.finalize()
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 10 Sep 2013 21:26:44 +0200 |
parents | 65cedae2647e |
children | 9652640fae42 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java src/share/vm/graal/graalCompiler.cpp src/share/vm/graal/graalVMToCompiler.cpp src/share/vm/graal/graalVMToCompiler.hpp |
diffstat | 4 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java Tue Sep 10 19:18:24 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptions.java Tue Sep 10 21:26:44 2013 +0200 @@ -24,7 +24,6 @@ package com.oracle.graal.hotspot; import static com.oracle.graal.compiler.GraalDebugConfig.*; -import static com.oracle.graal.hotspot.HotSpotVMConfig.*; import static java.nio.file.Files.*; import java.io.*; @@ -179,9 +178,11 @@ /** * 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 */ - public static void finalizeOptions() { - if (areDebugScopePatternsEnabled() || getVMOption("CITime")) { + public static void finalizeOptions(boolean ciTime) { + if (areDebugScopePatternsEnabled() || ciTime) { Debug.enable(); } }
--- a/src/share/vm/graal/graalCompiler.cpp Tue Sep 10 19:18:24 2013 +0200 +++ b/src/share/vm/graal/graalCompiler.cpp Tue Sep 10 21:26:44 2013 +0200 @@ -95,7 +95,7 @@ vm_abort(false); } } - VMToCompiler::finalizeOptions(); + VMToCompiler::finalizeOptions(CITime); if (UseCompiler) { VMToCompiler::startCompiler(BootstrapGraal);
--- a/src/share/vm/graal/graalVMToCompiler.cpp Tue Sep 10 19:18:24 2013 +0200 +++ b/src/share/vm/graal/graalVMToCompiler.cpp Tue Sep 10 21:26:44 2013 +0200 @@ -107,11 +107,13 @@ return result.get_jboolean(); } -void VMToCompiler::finalizeOptions() { +void VMToCompiler::finalizeOptions(jboolean ciTime) { KlassHandle optionsKlass = loadClass(vmSymbols::com_oracle_graal_hotspot_HotSpotOptions()); Thread* THREAD = Thread::current(); JavaValue result(T_VOID); - JavaCalls::call_static(&result, optionsKlass, vmSymbols::finalizeOptions_name(), vmSymbols::void_method_signature(), THREAD); + JavaCallArguments args; + args.push_int(ciTime); + JavaCalls::call_static(&result, optionsKlass, vmSymbols::finalizeOptions_name(), vmSymbols::bool_void_signature(), &args, THREAD); check_pending_exception("Error while calling finalizeOptions"); }
--- a/src/share/vm/graal/graalVMToCompiler.hpp Tue Sep 10 19:18:24 2013 +0200 +++ b/src/share/vm/graal/graalVMToCompiler.hpp Tue Sep 10 21:26:44 2013 +0200 @@ -57,8 +57,8 @@ // public static boolean HotSpotOptions.setOption(String option); static jboolean setOption(Handle option); - // public static void HotSpotOptions.finalizeOptions(); - static void finalizeOptions(); + // public static void HotSpotOptions.finalizeOptions(boolean ciTime); + static void finalizeOptions(jboolean ciTime); // public abstract boolean compileMethod(long vmId, String name, int entry_bci, boolean blocking); static void compileMethod(Method* method, Handle holder, int entry_bci, jboolean blocking);