jdk-sandbox: comparison src/hotspot/share/memory/filemap.cpp

equal deleted inserted replaced

-:db3c6bb7f856
+:83d8b3a25f25
 _verify_local = BytecodeVerificationLocal;
 _verify_remote = BytecodeVerificationRemote;
 _has_platform_or_app_classes = ClassLoaderExt::has_platform_or_app_classes();
 }
-void SharedClassPathEntry::init(const char* name, TRAPS) {
+void SharedClassPathEntry::init(const char* name, bool is_modules_image, TRAPS) {
+assert(DumpSharedSpaces, "dump time only");
 _timestamp = 0;
 _filesize  = 0;
 struct stat st;
 if (os::stat(name, &st) == 0) {
 if ((st.st_mode & S_IFMT) == S_IFDIR) {
-_is_dir = true;
+_type = dir_entry;
 } else {
-_is_dir = false;
+// The timestamp of the modules_image is not checked at runtime.
-_timestamp = st.st_mtime;
+if (is_modules_image) {
+_type = modules_image_entry;
+} else {
+_type = jar_entry;
+_timestamp = st.st_mtime;
+}
 _filesize = st.st_size;
 }
 } else {
 // The file/dir must exist, or it would not have been added
 // into ClassLoader::classpath_entry().
 bool SharedClassPathEntry::validate(bool is_class_path) {
 assert(UseSharedSpaces, "runtime only");
 struct stat st;
-const char* name = this->name();
+const char* name;
+// In order to validate the runtime modules image file size against the archived
+// size information, we need to obtain the runtime modules image path. The recorded
+// dump time modules image path in the archive may be different from the runtime path
+// if the JDK image has beed moved after generating the archive.
+if (is_modules_image()) {
+name = ClassLoader::get_jrt_entry()->name();
+} else {
+name = this->name();
+}
 bool ok = true;
 log_info(class, path)("checking shared classpath entry: %s", name);
 if (os::stat(name, &st) != 0 && is_class_path) {
 // If the archived module path entry does not exist at runtime, it is not fatal
 // (no need to invalid the shared archive) because the shared runtime visibility check
 } else if (is_dir()) {
 if (!os::dir_is_empty(name)) {
 FileMapInfo::fail_continue("directory is not empty: %s", name);
 ok = false;
 }
-} else if (is_jar_or_bootimage()) {
+} else if ((has_timestamp() && _timestamp != st.st_mtime) ||
-if (_timestamp != st.st_mtime ||
+_filesize != st.st_size) {
-_filesize != st.st_size) {
+ok = false;
-ok = false;
+if (PrintSharedArchiveAndExit) {
-if (PrintSharedArchiveAndExit) {
+FileMapInfo::fail_continue(_timestamp != st.st_mtime ?
-FileMapInfo::fail_continue(_timestamp != st.st_mtime ?
+"Timestamp mismatch" :
-"Timestamp mismatch" :
+"File size mismatch");
-"File size mismatch");
+} else {
-} else {
+FileMapInfo::fail_continue("A jar file is not the one used while building"
-FileMapInfo::fail_continue("A jar/jimage file is not the one used while building"
+" the shared archive file: %s", name);
-" the shared archive file: %s", name);
-}
 }
 }
 return ok;
 }
 // 1. boot class path
 int i = 0;
 ClassPathEntry* cpe = jrt;
 while (cpe != NULL) {
-const char* type = ((cpe == jrt) ? "jrt" : (cpe->is_jar_file() ? "jar" : "dir"));
+bool is_jrt = (cpe == jrt);
+const char* type = (is_jrt ? "jrt" : (cpe->is_jar_file() ? "jar" : "dir"));
 log_info(class, path)("add main shared path (%s) %s", type, cpe->name());
 SharedClassPathEntry* ent = shared_path(i);
-ent->init(cpe->name(), THREAD);
+ent->init(cpe->name(), is_jrt, THREAD);
-if (cpe != jrt) { // No need to do jimage.
+if (!is_jrt) {    // No need to do the modules image.
 EXCEPTION_MARK; // The following call should never throw, but would exit VM on error.
 update_shared_classpath(cpe, ent, THREAD);
 }
 cpe = ClassLoader::get_next_boot_classpath_entry(cpe);
 i++;
 // 2. app class path
 ClassPathEntry *acpe = ClassLoader::app_classpath_entries();
 while (acpe != NULL) {
 log_info(class, path)("add app shared path %s", acpe->name());
 SharedClassPathEntry* ent = shared_path(i);
-ent->init(acpe->name(), THREAD);
+ent->init(acpe->name(), false, THREAD);
 EXCEPTION_MARK;
 update_shared_classpath(acpe, ent, THREAD);
 acpe = acpe->next();
 i++;
 }
 // 3. module path
 ClassPathEntry *mpe = ClassLoader::module_path_entries();
 while (mpe != NULL) {
 log_info(class, path)("add module path %s",mpe->name());
 SharedClassPathEntry* ent = shared_path(i);
-ent->init(mpe->name(), THREAD);
+ent->init(mpe->name(), false, THREAD);
 EXCEPTION_MARK;
 update_shared_classpath(mpe, ent, THREAD);
 mpe = mpe->next();
 i++;
 }
 void FileMapInfo::update_shared_classpath(ClassPathEntry *cpe, SharedClassPathEntry* ent, TRAPS) {
 ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
 ResourceMark rm(THREAD);
 jint manifest_size;
-bool isSigned;
 if (cpe->is_jar_file()) {
+assert(ent->is_jar(), "the shared class path entry is not a JAR file");
 char* manifest = ClassLoaderExt::read_manifest(cpe, &manifest_size, CHECK);
 if (manifest != NULL) {
 ManifestStream* stream = new ManifestStream((u1*)manifest,
 manifest_size);
-isSigned = stream->check_is_signed();
+if (stream->check_is_signed()) {
-if (isSigned) {
+ent->set_is_signed();
-ent->set_is_signed(true);
 } else {
 // Copy the manifest into the shared archive
 manifest = ClassLoaderExt::read_raw_manifest(cpe, &manifest_size, CHECK);
 Array<u1>* buf = MetadataFactory::new_array<u1>(loader_data,
 manifest_size,
 THREAD);
 char* p = (char*)(buf->data());
 memcpy(p, manifest, manifest_size);
 ent->set_manifest(buf);
-ent->set_is_signed(false);
 }
 }
 }
 }

changeset 50199	83d8b3a25f25
parent 50039	9fec54fe663d
child 51070	2f4c3cac8556