stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8261551: Remove special CDS handling in Metaspace::allocate

Browse Source 
Reviewed-by: minqi, dholmes, stuefe
This commit is contained in:
Ioi Lam 2021-03-26 03:37:14 +00:00
parent fe8ef3223d
commit 41657b15ac
5 changed files with 6 additions and 12 deletions
src/hotspot/share
memory
metaspace.cppmetaspaceShared.cppmetaspaceShared.hpp
runtime
thread.cpp
test/hotspot/jtreg/runtime/cds
MaxMetaspaceSize.java

7
src/hotspot/share/memory/metaspace.cpp

@ -822,13 +822,6 @@ MetaWord* Metaspace::allocate(ClassLoaderData* loader_data, size_t word_size,
}
if (result == NULL) {
if (DumpSharedSpaces) {
// CDS dumping keeps loading classes, so if we hit an OOM we probably will keep hitting OOM.
// We should abort to avoid generating a potentially bad archive.
vm_exit_during_cds_dumping(err_msg("Failed allocating metaspace object type %s of size " SIZE_FORMAT ". CDS dump aborted.",
MetaspaceObj::type_name(type), word_size * BytesPerWord),
err_msg("Please increase MaxMetaspaceSize (currently " SIZE_FORMAT " bytes).", MaxMetaspaceSize));
}
report_metadata_oome(loader_data, word_size, type, mdtype, THREAD);
assert(HAS_PENDING_EXCEPTION, "sanity");
return NULL;

3
src/hotspot/share/memory/metaspaceShared.cpp

@ -612,7 +612,8 @@ void MetaspaceShared::prepare_for_dumping() {
// Preload classes from a list, populate the shared spaces and dump to a
// file.
void MetaspaceShared::preload_and_dump(TRAPS) {
void MetaspaceShared::preload_and_dump() {
EXCEPTION_MARK;
ResourceMark rm(THREAD);
preload_and_dump_impl(THREAD);
if (HAS_PENDING_EXCEPTION) {

2
src/hotspot/share/memory/metaspaceShared.hpp

@ -77,7 +77,7 @@ class MetaspaceShared : AllStatic {
};
static void prepare_for_dumping() NOT_CDS_RETURN;
static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
static void preload_and_dump() NOT_CDS_RETURN;
private:
static void preload_and_dump_impl(TRAPS) NOT_CDS_RETURN;

2
src/hotspot/share/runtime/thread.cpp

@ -3413,7 +3413,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
#endif
if (DumpSharedSpaces) {
MetaspaceShared::preload_and_dump(CHECK_JNI_ERR);
MetaspaceShared::preload_and_dump();
ShouldNotReachHere();
}

4
test/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -50,7 +50,7 @@ public class MaxMetaspaceSize {
processArgs.add("-XX:MaxMetaspaceSize=1m");
}
String msg = "Failed allocating metaspace object";
String msg = "OutOfMemoryError: Metaspace";
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(processArgs);
CDSTestUtils.executeAndLog(pb, "dump").shouldContain(msg).shouldHaveExitValue(1);
}