diff options
| author | Aleksey Shipilev <shade@openjdk.org> | 2023-11-27 15:55:46 +0000 |
|---|---|---|
| committer | Vitaly Provodin <vitaly.provodin@jetbrains.com> | 2024-01-17 20:31:44 +0700 |
| commit | 9e857e860d5ab5f963343fda38cfae33f428a09c (patch) | |
| tree | fd6da98a2a3d4210bdb3d6aa34ab5f548354842d | |
| parent | 961b8cd6e4f5d836af3f6dcd60c521fd6109e84c (diff) | |
| download | JetBrainsRuntime-9e857e860d5ab5f963343fda38cfae33f428a09c.tar.gz | |
8316967: Correct the scope of vmtimer in UnregisteredClasses::load_class
Backport-of: 83b6a1278f7ffa5bf6f30697e5fb39eb5846c04b
| -rw-r--r-- | src/hotspot/share/cds/unregisteredClasses.cpp | 8 | ||||
| -rw-r--r-- | src/hotspot/share/classfile/classLoader.cpp | 2 | ||||
| -rw-r--r-- | src/hotspot/share/classfile/classLoader.hpp | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/hotspot/share/cds/unregisteredClasses.cpp b/src/hotspot/share/cds/unregisteredClasses.cpp index 53b9debcd62..06d006ea1bb 100644 --- a/src/hotspot/share/cds/unregisteredClasses.cpp +++ b/src/hotspot/share/cds/unregisteredClasses.cpp @@ -46,11 +46,9 @@ InstanceKlass* UnregisteredClasses::load_class(Symbol* name, const char* path, T assert(name != nullptr, "invariant"); assert(DumpSharedSpaces, "this function is only used with -Xshare:dump"); - { - PerfClassTraceTime vmtimer(ClassLoader::perf_sys_class_lookup_time(), - THREAD->get_thread_stat()->perf_timers_addr(), - PerfClassTraceTime::CLASS_LOAD); - } + PerfClassTraceTime vmtimer(ClassLoader::perf_app_classload_time(), + THREAD->get_thread_stat()->perf_timers_addr(), + PerfClassTraceTime::CLASS_LOAD); Symbol* path_symbol = SymbolTable::new_symbol(path); Handle url_classloader = get_url_classloader(path_symbol, CHECK_NULL); diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp index c4b85d93a0b..231bd5dda39 100644 --- a/src/hotspot/share/classfile/classLoader.cpp +++ b/src/hotspot/share/classfile/classLoader.cpp @@ -122,7 +122,6 @@ PerfCounter* ClassLoader::_perf_class_verify_selftime = nullptr; PerfCounter* ClassLoader::_perf_classes_linked = nullptr; PerfCounter* ClassLoader::_perf_class_link_time = nullptr; PerfCounter* ClassLoader::_perf_class_link_selftime = nullptr; -PerfCounter* ClassLoader::_perf_sys_class_lookup_time = nullptr; PerfCounter* ClassLoader::_perf_shared_classload_time = nullptr; PerfCounter* ClassLoader::_perf_sys_classload_time = nullptr; PerfCounter* ClassLoader::_perf_app_classload_time = nullptr; @@ -1369,7 +1368,6 @@ void ClassLoader::initialize(TRAPS) { NEWPERFEVENTCOUNTER(_perf_classes_linked, SUN_CLS, "linkedClasses"); NEWPERFEVENTCOUNTER(_perf_classes_verified, SUN_CLS, "verifiedClasses"); - NEWPERFTICKCOUNTER(_perf_sys_class_lookup_time, SUN_CLS, "lookupSysClassTime"); NEWPERFTICKCOUNTER(_perf_shared_classload_time, SUN_CLS, "sharedClassLoadTime"); NEWPERFTICKCOUNTER(_perf_sys_classload_time, SUN_CLS, "sysClassLoadTime"); NEWPERFTICKCOUNTER(_perf_app_classload_time, SUN_CLS, "appClassLoadTime"); diff --git a/src/hotspot/share/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp index 0733a5a347c..5053005288c 100644 --- a/src/hotspot/share/classfile/classLoader.hpp +++ b/src/hotspot/share/classfile/classLoader.hpp @@ -168,7 +168,6 @@ class ClassLoader: AllStatic { static PerfCounter* _perf_classes_linked; static PerfCounter* _perf_class_link_time; static PerfCounter* _perf_class_link_selftime; - static PerfCounter* _perf_sys_class_lookup_time; static PerfCounter* _perf_shared_classload_time; static PerfCounter* _perf_sys_classload_time; static PerfCounter* _perf_app_classload_time; @@ -289,7 +288,6 @@ class ClassLoader: AllStatic { static PerfCounter* perf_classes_linked() { return _perf_classes_linked; } static PerfCounter* perf_class_link_time() { return _perf_class_link_time; } static PerfCounter* perf_class_link_selftime() { return _perf_class_link_selftime; } - static PerfCounter* perf_sys_class_lookup_time() { return _perf_sys_class_lookup_time; } static PerfCounter* perf_shared_classload_time() { return _perf_shared_classload_time; } static PerfCounter* perf_sys_classload_time() { return _perf_sys_classload_time; } static PerfCounter* perf_app_classload_time() { return _perf_app_classload_time; } |