archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8202951: Implementation of JEP 341: Default CDS Archives

Browse source 
8210592: Convert CDS-mode test sets in tier5 and tier6 to non-CDS-mode tests
8209739: [TESTBUG] javax/imageio/plugins/png/ItxtUtf8Test.java fails with OutOfMemoryError when running in CDS mode

Generate the default CDS archive at JDK build time.

Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Reviewed-by: erikj, ihse, dholmes, iklam, ccheung, mseledtsov
This commit is contained in:
Jiangli Zhou 2018-10-05 18:56:11 -04:00
parent ec0cbd58f4
commit 57b516dd0e
16 changed files with 234 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/hotspot/share/runtime/arguments.cpp
View file

@ -3450,21 +3450,27 @@ void Arguments::set_shared_spaces_flags() {
// Sharing support
// Construct the path to the archive
char* Arguments::get_default_shared_archive_path() {
char *default_archive_path;
char jvm_path[JVM_MAXPATHLEN];
os::jvm_path(jvm_path, sizeof(jvm_path));
char *end = strrchr(jvm_path, *os::file_separator());
if (end != NULL) *end = '\0';
size_t jvm_path_len = strlen(jvm_path);
size_t file_sep_len = strlen(os::file_separator());
const size_t len = jvm_path_len + file_sep_len + 20;
default_archive_path = NEW_C_HEAP_ARRAY(char, len, mtArguments);
if (default_archive_path != NULL) {
jio_snprintf(default_archive_path, len, "%s%sclasses.jsa",
jvm_path, os::file_separator());
}
return default_archive_path;
}
static char* get_shared_archive_path() {
char *shared_archive_path;
if (SharedArchiveFile == NULL) {
char jvm_path[JVM_MAXPATHLEN];
os::jvm_path(jvm_path, sizeof(jvm_path));
char *end = strrchr(jvm_path, *os::file_separator());
if (end != NULL) *end = '\0';
size_t jvm_path_len = strlen(jvm_path);
size_t file_sep_len = strlen(os::file_separator());
const size_t len = jvm_path_len + file_sep_len + 20;
shared_archive_path = NEW_C_HEAP_ARRAY(char, len, mtArguments);
if (shared_archive_path != NULL) {
jio_snprintf(shared_archive_path, len, "%s%sclasses.jsa",
jvm_path, os::file_separator());
}
shared_archive_path = Arguments::get_default_shared_archive_path();
} else {
shared_archive_path = os::strdup_check_oom(SharedArchiveFile, mtArguments);
}