8141341: CDS should be disabled if JvmtiExport::should_post_class_file_load_hook() is true

Disable loading shared class if JvmtiExport::should_post_class_file_load_hook is true.

Reviewed-by: iklam, acorn, sspitsyn
This commit is contained in:
Jiangli Zhou 2016-07-19 13:52:14 -04:00
parent 5075c7b9a0
commit 6ed3f07f48
2 changed files with 52 additions and 34 deletions
hotspot/src/share/vm

@ -1246,6 +1246,9 @@ Klass* SystemDictionary::find_shared_class(Symbol* class_name) {
instanceKlassHandle SystemDictionary::load_shared_class(
Symbol* class_name, Handle class_loader, TRAPS) {
// Don't load shared class when JvmtiExport::should_post_class_file_load_hook()
// is enabled since posting CFLH is not supported when loading shared class.
if (!JvmtiExport::should_post_class_file_load_hook()) {
instanceKlassHandle ik (THREAD, find_shared_class(class_name));
// Make sure we only return the boot class for the NULL classloader.
if (ik.not_null() &&
@ -1253,6 +1256,7 @@ instanceKlassHandle SystemDictionary::load_shared_class(
Handle protection_domain;
return load_shared_class(ik, class_loader, protection_domain, THREAD);
}
}
return instanceKlassHandle();
}
@ -1334,8 +1338,14 @@ bool SystemDictionary::is_shared_class_visible(Symbol* class_name,
instanceKlassHandle SystemDictionary::load_shared_class(instanceKlassHandle ik,
Handle class_loader,
Handle protection_domain, TRAPS) {
if (ik.not_null()) {
instanceKlassHandle nh = instanceKlassHandle(); // null Handle
if (JvmtiExport::should_post_class_file_load_hook()) {
// Don't load shared class when JvmtiExport::should_post_class_file_load_hook()
// is enabled since posting CFLH is not supported when loading shared class.
return nh;
}
if (ik.not_null()) {
Symbol* class_name = ik->name();
bool visible = is_shared_class_visible(

@ -3164,14 +3164,21 @@ void Metaspace::global_initialize() {
#endif // _LP64
#endif // INCLUDE_CDS
} else {
#if INCLUDE_CDS
if (UseSharedSpaces) {
// If using shared space, open the file that contains the shared space
// and map in the memory before initializing the rest of metaspace (so
// the addresses don't conflict)
address cds_address = NULL;
if (UseSharedSpaces) {
#if INCLUDE_CDS
FileMapInfo* mapinfo = new FileMapInfo();
if (JvmtiExport::should_post_class_file_load_hook()) {
// Currently CDS does not support JVMTI CFLH when loading shared class.
// If JvmtiExport::should_post_class_file_load_hook is already enabled,
// just disable UseSharedSpaces.
FileMapInfo::fail_continue("Tool agent requires sharing to be disabled.");
delete mapinfo;
} else {
// Open the shared archive file, read and validate the header. If
// initialization fails, shared spaces [UseSharedSpaces] are
// disabled and the file is closed.
@ -3195,8 +3202,9 @@ void Metaspace::global_initialize() {
assert(!mapinfo->is_open() && !UseSharedSpaces,
"archive file not closed or shared spaces not disabled.");
}
#endif // INCLUDE_CDS
}
}
#endif // INCLUDE_CDS
#ifdef _LP64
if (!UseSharedSpaces && using_class_space()) {