archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 17:14:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8318484: Initial version of cdsConfig.hpp

Browse source 
Reviewed-by: dholmes, ccheung, sspitsyn
This commit is contained in:
Ioi Lam 2023-10-21 15:43:36 +00:00
parent a876beb63d
commit ecd25e7d6f
36 changed files with 220 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "cds/cds_globals.hpp"
#include "cds/cdsConfig.hpp"
#include "cds/filemap.hpp"
#include "classfile/classFileStream.hpp"
#include "classfile/classLoader.inline.hpp"
@ -446,7 +447,7 @@ bool ClassPathImageEntry::is_modules_image() const {
#if INCLUDE_CDS
void ClassLoader::exit_with_path_failure(const char* error, const char* message) {
Arguments::assert_is_dumping_archive();
assert(CDSConfig::is_dumping_archive(), "sanity");
tty->print_cr("Hint: enable -Xlog:class+path=info to diagnose the failure");
vm_exit_during_initialization(error, message);
}
@ -516,7 +517,7 @@ void ClassLoader::setup_bootstrap_search_path(JavaThread* current) {
#if INCLUDE_CDS
void ClassLoader::setup_app_search_path(JavaThread* current, const char *class_path) {
Arguments::assert_is_dumping_archive();
assert(CDSConfig::is_dumping_archive(), "sanity");
ResourceMark rm(current);
ClasspathStream cp_stream(class_path);
@ -531,7 +532,7 @@ void ClassLoader::setup_app_search_path(JavaThread* current, const char *class_p
void ClassLoader::add_to_module_path_entries(const char* path,
ClassPathEntry* entry) {
assert(entry != nullptr, "ClassPathEntry should not be nullptr");
Arguments::assert_is_dumping_archive();
assert(CDSConfig::is_dumping_archive(), "sanity");
// The entry does not exist, add to the list
if (_module_path_entries == nullptr) {
@ -545,7 +546,7 @@ void ClassLoader::add_to_module_path_entries(const char* path,
// Add a module path to the _module_path_entries list.
void ClassLoader::setup_module_search_path(JavaThread* current, const char* path) {
Arguments::assert_is_dumping_archive();
assert(CDSConfig::is_dumping_archive(), "sanity");
struct stat st;
if (os::stat(path, &st) != 0) {
tty->print_cr("os::stat error %d (%s). CDS dump aborted (path was \"%s\").",
@ -633,7 +634,7 @@ void ClassLoader::setup_bootstrap_search_path_impl(JavaThread* current, const ch
bool set_base_piece = true;
#if INCLUDE_CDS
if (Arguments::is_dumping_archive()) {
if (CDSConfig::is_dumping_archive()) {
if (!Arguments::has_jimage()) {
vm_exit_during_initialization("CDS is not supported in exploded JDK build", nullptr);
}
@ -1249,7 +1250,7 @@ char* ClassLoader::skip_uri_protocol(char* source) {
// by the builtin loaders at dump time.
void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
const ClassFileStream* stream, bool redefined) {
Arguments::assert_is_dumping_archive();
assert(CDSConfig::is_dumping_archive(), "sanity");
assert(stream != nullptr, "sanity");
if (ik->is_hidden()) {
@ -1443,13 +1444,13 @@ bool ClassLoader::is_module_observable(const char* module_name) {
#if INCLUDE_CDS
void ClassLoader::initialize_shared_path(JavaThread* current) {
if (Arguments::is_dumping_archive()) {
if (CDSConfig::is_dumping_archive()) {
ClassLoaderExt::setup_search_paths(current);
}
}
void ClassLoader::initialize_module_path(TRAPS) {
if (Arguments::is_dumping_archive()) {
if (CDSConfig::is_dumping_archive()) {
ClassLoaderExt::setup_module_paths(THREAD);
FileMapInfo::allocate_shared_path_table(CHECK);
}
@ -1458,7 +1459,7 @@ void ClassLoader::initialize_module_path(TRAPS) {
// Helper function used by CDS code to get the number of module path
// entries during shared classpath setup time.
int ClassLoader::num_module_path_entries() {
Arguments::assert_is_dumping_archive();
assert(CDSConfig::is_dumping_archive(), "sanity");
int num_entries = 0;
ClassPathEntry* e= ClassLoader::_module_path_entries;
while (e != nullptr) {