profiler

Author: iwanowww

src/hotspot/share/logging/logTag.hpp

@@ -167,6 +167,7 @@ class outputStream;
   LOG_TAG(preempt) \
   LOG_TAG(preorder)  /* Trace all classes loaded in order referenced (not loaded) */ \
   LOG_TAG(preview)   /* Trace loading of preview feature types */ \
+  LOG_TAG(profile) \
   LOG_TAG(profiling) \
   LOG_TAG(promotion) \
   LOG_TAG(protectiondomain) /* "Trace protection domain verification" */ \

src/hotspot/share/runtime/frame.cpp

@@ -262,6 +262,22 @@ bool frame::is_safepoint_blob_frame() const {
   return (_cb != nullptr && _cb->is_safepoint_stub());
 }
 
+bool frame::is_exception_blob_frame() const {
+  return (_cb != nullptr && _cb->is_exception_stub());
+}
+
+bool frame::is_deoptimization_blob_frame() const {
+  return (_cb != nullptr && _cb->is_deoptimization_stub());
+}
+
+bool frame::is_uncommon_trap_blob_frame() const {
+  return (_cb != nullptr && _cb->is_uncommon_trap_stub());
+}
+
+//_cb->is_adapter_blob()
+//_cb->is_vtable_blob()
+//_cb->is_method_handles_adapter_blob()
+
 // testers
 
 bool frame::is_first_java_frame() const {

src/hotspot/share/runtime/frame.hpp

@@ -192,6 +192,9 @@ class frame {
   bool is_runtime_frame()        const;
   bool is_compiled_frame()       const;
   bool is_safepoint_blob_frame() const;
+  bool is_exception_blob_frame() const;
+  bool is_deoptimization_blob_frame() const;
+  bool is_uncommon_trap_blob_frame() const;
   bool is_deoptimized_frame()    const;
   bool is_upcall_stub_frame()    const;
   bool is_heap_frame()             const { return _on_heap; }

src/hotspot/share/runtime/thread.cpp

@@ -142,6 +142,7 @@ Thread::Thread(MemTag mem_tag) {
   _profile_vm_ops   = false;
   _profile_rt_calls = false;
   _profile_upcalls  = false;
+  _profile_execution = false;
 
   _all_bc_counter_value = 0;
   _clinit_bc_counter_value = 0;

src/hotspot/share/runtime/thread.hpp

@@ -636,6 +636,7 @@ class Thread: public ThreadShadow {
   bool  _profile_vm_ops;
   bool  _profile_rt_calls;
   bool  _profile_upcalls;
+  bool  _profile_execution;
 
   jlong    _all_bc_counter_value;
   jlong _clinit_bc_counter_value;
@@ -657,6 +658,9 @@ class Thread: public ThreadShadow {
   bool     profile_upcalls() const { return _profile_upcalls; }
   void set_profile_upcalls(bool v) { _profile_upcalls = v; }
 
+  bool     profile_execution() const { return _profile_execution; }
+  void set_profile_execution(bool v) { _profile_execution = v; }
+
   PerfTraceTime*     current_rt_call_timer() const           { return _current_rt_call_timer;            }
   void           set_current_rt_call_timer(PerfTraceTime* c) {        _current_rt_call_timer = c;        }
   bool           has_current_rt_call_timer() const           { return _current_rt_call_timer != nullptr; }

src/hotspot/share/runtime/threads.cpp

@@ -802,6 +802,13 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     }
   }
 
+  if (log_is_enabled(Info, thermostat) || log_is_enabled(Info, profile)) {
+    main_thread->set_profile_execution(true);
+  }
+
+  // Start the VMThermostat thread
+  VMThermostat::initialize();
+
   // Launch -Xrun agents if EagerXrunInit is not set.
   if (!EagerXrunInit) {
     JvmtiAgentList::load_xrun_agents();
@@ -990,9 +997,6 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     }
   }
 
-  // Start the VMThermostat thread
-  VMThermostat::initialize();
-
   return JNI_OK;
 }
 

src/hotspot/share/runtime/vframeArray.cpp

@@ -579,7 +579,7 @@ void vframeArray::fill_in(JavaThread* thread,
       // in frame_amd64.cpp and the values of the phantom high half registers
       // in amd64.ad.
       //      if (VMReg::Name(i) < SharedInfo::stack0 && is_even(i)) {
-        intptr_t* src = (intptr_t*) reg_map->location(VMRegImpl::as_VMReg(i), _caller.sp());
+        intptr_t* src = (intptr_t*) reg_map->location(VMRegImpl::as_VMReg(i), _caller_mode.sp());
         _callee_registers[i] = src != nullptr ? *src : NULL_WORD;
         //      } else {
         //      jint* src = (jint*) reg_map->location(VMReg::Name(i));