archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8235629: Remove unnecessary calls to Thread::current

Browse source 
Reviewed-by: coleenp, ccheung, hseigel
This commit is contained in:
Ioi Lam 2019-12-11 15:25:38 -08:00
parent dca6e34397
commit cb75b6ee22
9 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/share/classfile/classLoader.cpp
View file

@ -1042,7 +1042,7 @@ bool ClassLoader::add_package(const char *fullq_class_name, s2 classpath_index,
assert(fullq_class_name != NULL, "just checking");
// Get package name from fully qualified class name.
ResourceMark rm;
ResourceMark rm(THREAD);
const char *cp = package_from_name(fullq_class_name);
if (cp != NULL) {
PackageEntryTable* pkg_entry_tbl = ClassLoaderData::the_null_class_loader_data()->packages();

4
src/hotspot/share/classfile/javaClasses.cpp
View file

@ -1317,9 +1317,11 @@ bool java_lang_Class::restore_archived_mirror(Klass *k,
set_mirror_module_field(k, mirror, module, THREAD);
ResourceMark rm;
if (log_is_enabled(Trace, cds, heap, mirror)) {
ResourceMark rm(THREAD);
log_trace(cds, heap, mirror)(
"Restored %s archived mirror " PTR_FORMAT, k->external_name(), p2i(mirror()));
}
return true;
}

12
src/hotspot/share/classfile/systemDictionary.cpp
View file

@ -448,7 +448,7 @@ void SystemDictionary::validate_protection_domain(InstanceKlass* klass,
JavaValue result(T_VOID);
LogTarget(Debug, protectiondomain) lt;
if (lt.is_enabled()) {
ResourceMark rm;
ResourceMark rm(THREAD);
// Print out trace information
LogStream ls(lt);
ls.print_cr("Checking package access");
@ -1176,7 +1176,7 @@ bool SystemDictionary::is_shared_class_visible(Symbol* class_name,
Handle class_loader, TRAPS) {
assert(!ModuleEntryTable::javabase_moduleEntry()->is_patched(),
"Cannot use sharing if java.base is patched");
ResourceMark rm;
ResourceMark rm(THREAD);
int path_index = ik->shared_classpath_index();
ClassLoaderData* loader_data = class_loader_data(class_loader);
if (path_index < 0) {
@ -1341,7 +1341,7 @@ InstanceKlass* SystemDictionary::load_shared_class(InstanceKlass* ik,
// package was loaded.
if (class_loader.is_null()) {
int path_index = ik->shared_classpath_index();
ResourceMark rm;
ResourceMark rm(THREAD);
ClassLoader::add_package(ik->name()->as_C_string(), path_index, THREAD);
}
@ -1365,10 +1365,12 @@ InstanceKlass* SystemDictionary::load_shared_class(InstanceKlass* ik,
// This class matches with a class saved in an AOT library
ik->set_has_passed_fingerprint_check(true);
} else {
ResourceMark rm;
if (log_is_enabled(Info, class, fingerprint)) {
ResourceMark rm(THREAD);
log_info(class, fingerprint)("%s : expected = " PTR64_FORMAT " actual = " PTR64_FORMAT, ik->external_name(), aot_fp, cds_fp);
}
}
}
return ik;
}
@ -1377,7 +1379,7 @@ InstanceKlass* SystemDictionary::load_shared_class(InstanceKlass* ik,
InstanceKlass* SystemDictionary::load_instance_class(Symbol* class_name, Handle class_loader, TRAPS) {
if (class_loader.is_null()) {
ResourceMark rm;
ResourceMark rm(THREAD);
PackageEntry* pkg_entry = NULL;
bool search_only_bootloader_append = false;
ClassLoaderData *loader_data = class_loader_data(class_loader);

6
src/hotspot/share/memory/metaspaceShared.cpp
View file

@ -1774,7 +1774,7 @@ void MetaspaceShared::prepare_for_dumping() {
// file.
void MetaspaceShared::preload_and_dump(TRAPS) {
{ TraceTime timer("Dump Shared Spaces", TRACETIME_LOG(Info, startuptime));
ResourceMark rm;
ResourceMark rm(THREAD);
char class_list_path_str[JVM_MAXPATHLEN];
// Preload classes to be shared.
const char* class_list_path;
@ -1865,7 +1865,7 @@ int MetaspaceShared::preload_classes(const char* class_list_path, TRAPS) {
}
if (klass != NULL) {
if (log_is_enabled(Trace, cds)) {
ResourceMark rm;
ResourceMark rm(THREAD);
log_trace(cds)("Shared spaces preloaded: %s", klass->external_name());
}
@ -1904,7 +1904,7 @@ bool MetaspaceShared::try_link_class(InstanceKlass* ik, TRAPS) {
}
ik->link_class(THREAD);
if (HAS_PENDING_EXCEPTION) {
ResourceMark rm;
ResourceMark rm(THREAD);
log_warning(cds)("Preload Warning: Verification failed for %s",
ik->external_name());
CLEAR_PENDING_EXCEPTION;

12
src/hotspot/share/oops/instanceKlass.cpp
View file

@ -1319,7 +1319,7 @@ Klass* InstanceKlass::array_klass_impl(bool or_null, int n, TRAPS) {
if (array_klasses_acquire() == NULL) {
if (or_null) return NULL;
ResourceMark rm;
ResourceMark rm(THREAD);
JavaThread *jt = (JavaThread *)THREAD;
{
// Atomic creation of array_klasses
@ -1368,7 +1368,7 @@ void InstanceKlass::call_class_initializer(TRAPS) {
assert(!is_initialized(), "we cannot initialize twice");
LogTarget(Info, class, init) lt;
if (lt.is_enabled()) {
ResourceMark rm;
ResourceMark rm(THREAD);
LogStream ls(lt);
ls.print("%d Initializing ", call_class_initializer_counter++);
name()->print_value_on(&ls);
@ -2678,7 +2678,7 @@ Symbol* InstanceKlass::package_from_name(const Symbol* name, TRAPS) {
if (name->utf8_length() <= 0) {
return NULL;
}
ResourceMark rm;
ResourceMark rm(THREAD);
const char* package_name = ClassLoader::package_from_name((const char*) name->as_C_string());
if (package_name == NULL) {
return NULL;
@ -2720,7 +2720,7 @@ void InstanceKlass::set_package(ClassLoaderData* loader_data, TRAPS) {
// entry table, it is an indication that the package has not
// been defined. Consider it defined within the unnamed module.
if (_package_entry == NULL) {
ResourceMark rm;
ResourceMark rm(THREAD);
if (!ModuleEntryTable::javabase_defined()) {
// Before java.base is defined during bootstrapping, define all packages in
@ -2741,7 +2741,7 @@ void InstanceKlass::set_package(ClassLoaderData* loader_data, TRAPS) {
}
if (log_is_enabled(Debug, module)) {
ResourceMark rm;
ResourceMark rm(THREAD);
ModuleEntry* m = _package_entry->module();
log_trace(module)("Setting package: class: %s, package: %s, loader: %s, module: %s",
external_name(),
@ -2750,7 +2750,7 @@ void InstanceKlass::set_package(ClassLoaderData* loader_data, TRAPS) {
(m->is_named() ? m->name()->as_C_string() : UNNAMED_MODULE));
}
} else {
ResourceMark rm;
ResourceMark rm(THREAD);
log_trace(module)("Setting package: class: %s, package: unnamed, loader: %s, module: %s",
external_name(),
(loader_data != NULL) ? loader_data->loader_name_and_id() : "NULL",

4
src/hotspot/share/oops/klass.cpp
View file

@ -552,7 +552,7 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
assert(is_shared(), "must be set");
JFR_ONLY(RESTORE_ID(this);)
if (log_is_enabled(Trace, cds, unshareable)) {
ResourceMark rm;
ResourceMark rm(THREAD);
log_trace(cds, unshareable)("restore: %s", external_name());
}
@ -585,7 +585,7 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
Handle module_handle(THREAD, ((module_entry != NULL) ? module_entry->module() : (oop)NULL));
if (this->has_raw_archived_mirror()) {
ResourceMark rm;
ResourceMark rm(THREAD);
log_debug(cds, mirror)("%s has raw archived mirror", external_name());
if (HeapShared::open_archive_heap_region_mapped()) {
bool present = java_lang_Class::restore_archived_mirror(this, loader, module_handle,

2
src/hotspot/share/oops/klassVtable.cpp
View file

@ -625,7 +625,7 @@ bool klassVtable::needs_new_vtable_entry(const methodHandle& target_method,
// search through the super class hierarchy to see if we need
// a new entry
ResourceMark rm;
ResourceMark rm(THREAD);
Symbol* name = target_method()->name();
Symbol* signature = target_method()->signature();
const Klass* k = super;

2
src/hotspot/share/oops/method.cpp
View file

@ -1399,7 +1399,7 @@ bool Method::has_member_arg() const {
methodHandle Method::make_method_handle_intrinsic(vmIntrinsics::ID iid,
Symbol* signature,
TRAPS) {
ResourceMark rm;
ResourceMark rm(THREAD);
methodHandle empty;
InstanceKlass* holder = SystemDictionary::MethodHandle_klass();

6
src/hotspot/share/runtime/mutex.cpp
View file

@ -157,18 +157,18 @@ void Mutex::release_for_safepoint() {
}
void Mutex::unlock() {
assert_owner(Thread::current());
DEBUG_ONLY(assert_owner(Thread::current()));
set_owner(NULL);
_lock.unlock();
}
void Monitor::notify() {
assert_owner(Thread::current());
DEBUG_ONLY(assert_owner(Thread::current()));
_lock.notify();
}
void Monitor::notify_all() {
assert_owner(Thread::current());
DEBUG_ONLY(assert_owner(Thread::current()));
_lock.notify_all();
}