--- old/src/share/vm/runtime/vmThread.cpp 2020-01-16 16:56:34.799326910 +0300 +++ new/src/share/vm/runtime/vmThread.cpp 2020-01-16 16:56:34.751328459 +0300 @@ -25,8 +25,10 @@ #include "precompiled.hpp" #include "compiler/compileBroker.hpp" #include "gc_interface/collectedHeap.hpp" +#if INCLUDE_JFR #include "jfr/jfrEvents.hpp" #include "jfr/support/jfrThreadId.hpp" +#endif #include "memory/resourceArea.hpp" #include "oops/method.hpp" #include "oops/oop.inline.hpp" @@ -360,6 +362,7 @@ st->cr(); } +#if INCLUDE_JFR static void post_vm_operation_event(EventExecuteVMOperation* event, VM_Operation* op) { assert(event != NULL, "invariant"); assert(event->should_commit(), "invariant"); @@ -376,6 +379,7 @@ event->set_safepointId(evaluate_at_safepoint ? SafepointSynchronize::safepoint_counter() : 0); event->commit(); } +#endif void VMThread::evaluate_operation(VM_Operation* op) { ResourceMark rm; @@ -391,11 +395,15 @@ op->evaluation_mode()); #endif /* USDT2 */ +#if INCLUDE_JFR EventExecuteVMOperation event; +#endif op->evaluate(); +#if INCLUDE_JFR if (event.should_commit()) { post_vm_operation_event(&event, op); } +#endif #ifndef USDT2 HS_DTRACE_PROBE3(hotspot, vmops__end, op->name(), strlen(op->name()),