archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Alejandro Murillo 2016-05-06 06:12:56 -07:00
commit b68bd82d9b
1246 changed files with 25722 additions and 41041 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hotspot/src/share/vm/memory/filemap.cpp
View file

@ -99,7 +99,8 @@ void FileMapInfo::fail_continue(const char *msg, ...) {
fail(msg, ap);
} else {
if (PrintSharedSpaces) {
tty->print_cr("UseSharedSpaces: %s", msg);
tty->print("UseSharedSpaces: ");
tty->vprint_cr(msg, ap);
}
}
UseSharedSpaces = false;
@ -208,7 +209,7 @@ void FileMapInfo::allocate_classpath_entry_table() {
count ++;
bytes += (int)entry_size;
bytes += name_bytes;
log_info(classpath)("add main shared path (%s) %s", (cpe->is_jar_file() ? "jar" : "dir"), name);
log_info(class, path)("add main shared path (%s) %s", (cpe->is_jar_file() ? "jar" : "dir"), name);
} else {
SharedClassPathEntry* ent = shared_classpath(cur_entry);
if (cpe->is_jar_file()) {
@ -282,7 +283,7 @@ bool FileMapInfo::validate_classpath_entry_table() {
struct stat st;
const char* name = ent->_name;
bool ok = true;
log_info(classpath)("checking shared classpath entry: %s", name);
log_info(class, path)("checking shared classpath entry: %s", name);
if (os::stat(name, &st) != 0) {
fail_continue("Required classpath entry does not exist: %s", name);
ok = false;
@ -306,7 +307,7 @@ bool FileMapInfo::validate_classpath_entry_table() {
}
}
if (ok) {
log_info(classpath)("ok");
log_info(class, path)("ok");
} else if (!PrintSharedArchiveAndExit) {
_validating_classpath_entry_table = false;
return false;
@ -896,8 +897,8 @@ bool FileMapInfo::FileMapHeader::validate() {
char header_version[JVM_IDENT_MAX];
get_header_version(header_version);
if (strncmp(_jvm_ident, header_version, JVM_IDENT_MAX-1) != 0) {
log_info(classpath)("expected: %s", header_version);
log_info(classpath)("actual: %s", _jvm_ident);
log_info(class, path)("expected: %s", header_version);
log_info(class, path)("actual: %s", _jvm_ident);
FileMapInfo::fail_continue("The shared archive file was created by a different"
" version or build of HotSpot");
return false;
@ -925,7 +926,7 @@ bool FileMapInfo::validate_header() {
if (status) {
if (!ClassLoader::check_shared_paths_misc_info(_paths_misc_info, _header->_paths_misc_info_size)) {
if (!PrintSharedArchiveAndExit) {
fail_continue("shared class paths mismatch (hint: enable -Xlog:classpath=info to diagnose the failure)");
fail_continue("shared class paths mismatch (hint: enable -Xlog:class+path=info to diagnose the failure)");
status = false;
}
}