# HG changeset patch # User Doug Simon # Date 1441823380 -7200 # Node ID b87d1bf3cd9acb6bc199d51d4e769b3a2bfdf65a # Parent 97ca867d36223c174b58f8e29f3aa4d420149cef renamed TraceJVMCI option to JVMCITraceLevel and ensured all tracing controlled by this option uses the TRACE_jvmci_* macros diff -r 97ca867d3622 -r b87d1bf3cd9a src/share/vm/jvmci/jvmciCodeInstaller.cpp --- a/src/share/vm/jvmci/jvmciCodeInstaller.cpp Wed Sep 09 11:17:58 2015 -0700 +++ b/src/share/vm/jvmci/jvmciCodeInstaller.cpp Wed Sep 09 20:29:40 2015 +0200 @@ -748,9 +748,7 @@ bci = SynchronizationEntryBCI; } - if (TraceJVMCI >= 2) { - tty->print_cr("Recording scope pc_offset=%d bci=%d method=%s", pc_offset, bci, method->name_and_sig_as_C_string()); - } + TRACE_jvmci_2("Recording scope pc_offset=%d bci=%d method=%s", pc_offset, bci, method->name_and_sig_as_C_string()); bool reexecute = false; if (frame != NULL) { @@ -784,10 +782,8 @@ GrowableArray* expressions = expression_count > 0 ? new GrowableArray (expression_count) : NULL; GrowableArray* monitors = monitor_count > 0 ? new GrowableArray (monitor_count) : NULL; - if (TraceJVMCI >= 2) { - tty->print_cr("Scope at bci %d with %d values", bci, values->length()); - tty->print_cr("%d locals %d expressions, %d monitors", local_count, expression_count, monitor_count); - } + TRACE_jvmci_2("Scope at bci %d with %d values", bci, values->length()); + TRACE_jvmci_2("%d locals %d expressions, %d monitors", local_count, expression_count, monitor_count); for (jint i = 0; i < values->length(); i++) { ScopeValue* second = NULL; diff -r 97ca867d3622 -r b87d1bf3cd9a src/share/vm/jvmci/jvmciRuntime.cpp --- a/src/share/vm/jvmci/jvmciRuntime.cpp Wed Sep 09 11:17:58 2015 -0700 +++ b/src/share/vm/jvmci/jvmciRuntime.cpp Wed Sep 09 20:29:40 2015 +0200 @@ -399,11 +399,11 @@ JRT_END JRT_ENTRY_NO_ASYNC(void, JVMCIRuntime::monitorenter(JavaThread* thread, oopDesc* obj, BasicLock* lock)) - if (TraceJVMCI >= 3) { + IF_TRACE_jvmci_3 { char type[O_BUFLEN]; obj->klass()->name()->as_C_string(type, O_BUFLEN); markOop mark = obj->mark(); - tty->print_cr("%s: entered locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(mark), p2i(lock)); + TRACE_jvmci_3("%s: entered locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(mark), p2i(lock)); tty->flush(); } #ifdef ASSERT @@ -424,9 +424,7 @@ ObjectSynchronizer::fast_enter(h_obj, lock, false, THREAD); } } - if (TraceJVMCI >= 3) { - tty->print_cr("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), p2i(obj)); - } + TRACE_jvmci_3("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), p2i(obj)); JRT_END JRT_LEAF(void, JVMCIRuntime::monitorexit(JavaThread* thread, oopDesc* obj, BasicLock* lock)) @@ -453,10 +451,10 @@ } else { ObjectSynchronizer::fast_exit(obj, lock, THREAD); } - if (TraceJVMCI >= 3) { + IF_TRACE_jvmci_3 { char type[O_BUFLEN]; obj->klass()->name()->as_C_string(type, O_BUFLEN); - tty->print_cr("%s: exited locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(obj->mark()), p2i(lock)); + TRACE_jvmci_3("%s: exited locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(obj->mark()), p2i(lock)); tty->flush(); } JRT_END diff -r 97ca867d3622 -r b87d1bf3cd9a src/share/vm/jvmci/jvmciRuntime.hpp --- a/src/share/vm/jvmci/jvmciRuntime.hpp Wed Sep 09 11:17:58 2015 -0700 +++ b/src/share/vm/jvmci/jvmciRuntime.hpp Wed Sep 09 20:29:40 2015 +0200 @@ -221,20 +221,18 @@ static int test_deoptimize_call_int(JavaThread* thread, int value); }; -// Tracing macros - -#define IF_TRACE_jvmci_1 if (!(TraceJVMCI >= 1)) ; else -#define IF_TRACE_jvmci_2 if (!(TraceJVMCI >= 2)) ; else -#define IF_TRACE_jvmci_3 if (!(TraceJVMCI >= 3)) ; else -#define IF_TRACE_jvmci_4 if (!(TraceJVMCI >= 4)) ; else -#define IF_TRACE_jvmci_5 if (!(TraceJVMCI >= 5)) ; else +// Tracing macros. -// using commas and else to keep one-instruction semantics +#define IF_TRACE_jvmci_1 if (!(JVMCITraceLevel >= 1)) ; else +#define IF_TRACE_jvmci_2 if (!(JVMCITraceLevel >= 2)) ; else +#define IF_TRACE_jvmci_3 if (!(JVMCITraceLevel >= 3)) ; else +#define IF_TRACE_jvmci_4 if (!(JVMCITraceLevel >= 4)) ; else +#define IF_TRACE_jvmci_5 if (!(JVMCITraceLevel >= 5)) ; else -#define TRACE_jvmci_1 if (!(TraceJVMCI >= 1 && (tty->print("TraceJVMCI-1: "), true))) ; else tty->print_cr -#define TRACE_jvmci_2 if (!(TraceJVMCI >= 2 && (tty->print(" TraceJVMCI-2: "), true))) ; else tty->print_cr -#define TRACE_jvmci_3 if (!(TraceJVMCI >= 3 && (tty->print(" TraceJVMCI-3: "), true))) ; else tty->print_cr -#define TRACE_jvmci_4 if (!(TraceJVMCI >= 4 && (tty->print(" TraceJVMCI-4: "), true))) ; else tty->print_cr -#define TRACE_jvmci_5 if (!(TraceJVMCI >= 5 && (tty->print(" TraceJVMCI-5: "), true))) ; else tty->print_cr +#define TRACE_jvmci_1 if (!(JVMCITraceLevel >= 1 && (tty->print("JVMCITrace-1: "), true))) ; else tty->print_cr +#define TRACE_jvmci_2 if (!(JVMCITraceLevel >= 2 && (tty->print(" JVMCITrace-2: "), true))) ; else tty->print_cr +#define TRACE_jvmci_3 if (!(JVMCITraceLevel >= 3 && (tty->print(" JVMCITrace-3: "), true))) ; else tty->print_cr +#define TRACE_jvmci_4 if (!(JVMCITraceLevel >= 4 && (tty->print(" JVMCITrace-4: "), true))) ; else tty->print_cr +#define TRACE_jvmci_5 if (!(JVMCITraceLevel >= 5 && (tty->print(" JVMCITrace-5: "), true))) ; else tty->print_cr #endif // SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP diff -r 97ca867d3622 -r b87d1bf3cd9a src/share/vm/jvmci/jvmci_globals.hpp --- a/src/share/vm/jvmci/jvmci_globals.hpp Wed Sep 09 11:17:58 2015 -0700 +++ b/src/share/vm/jvmci/jvmci_globals.hpp Wed Sep 09 20:29:40 2015 +0200 @@ -77,10 +77,10 @@ NOT_COMPILER2(product(bool, ReduceInitialCardMarks, true, \ "Defer write barriers of young objects")) \ \ - product(intx, TraceJVMCI, 0, \ + product(intx, JVMCITraceLevel, 0, \ "Trace level for JVMCI: " \ - "1 means emit messages for each CompilerToVM call," \ - "levels greater than one provide progressively greater detail") \ + "1 means emit a message for each CompilerToVM call," \ + "levels greater than 1 provide progressively greater detail") \ \ product(intx, JVMCICounterSize, 0, \ "Reserved size for benchmark counters") \