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

equal deleted inserted replaced

-:b2b76aba8e42
+:9739f8c767da
 /*
-* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2016, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #include "memory/filemap.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/logTimer.hpp"
 #include "runtime/os.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/vmThread.hpp"
 #include "runtime/vm_operations.hpp"
 #include "utilities/defaultStream.hpp"
 }
 // Preload classes from a list, populate the shared spaces and dump to a
 // file.
 void MetaspaceShared::preload_and_dump(TRAPS) {
-TraceTime timer("Dump Shared Spaces", TraceStartupTime);
+{ TraceStartupTime timer("Dump Shared Spaces");
 ResourceMark rm;
 char class_list_path_str[JVM_MAXPATHLEN];
 tty->print_cr("Allocated shared space: " SIZE_FORMAT " bytes at " PTR_FORMAT,
 MetaspaceShared::shared_rs()->size(),
 p2i(MetaspaceShared::shared_rs()->base()));
 // Preload classes to be shared.
 // Should use some os:: method rather than fopen() here. aB.
 const char* class_list_path;
 if (SharedClassListFile == NULL) {
 // Construct the path to the class list (in jre/lib)
 // Walk up two directories from the location of the VM and
 // optionally tack on "lib" (depending on platform)
 os::jvm_path(class_list_path_str, sizeof(class_list_path_str));
 for (int i = 0; i < 3; i++) {
 char *end = strrchr(class_list_path_str, *os::file_separator());
 if (end != NULL) *end = '\0';
 }
 int class_list_path_len = (int)strlen(class_list_path_str);
 if (class_list_path_len >= 3) {
 if (strcmp(class_list_path_str + class_list_path_len - 3, "lib") != 0) {
 if (class_list_path_len < JVM_MAXPATHLEN - 4) {
 jio_snprintf(class_list_path_str + class_list_path_len,
 sizeof(class_list_path_str) - class_list_path_len,
 "%slib", os::file_separator());
 class_list_path_len += 4;
+}
 }
 }
-}
+if (class_list_path_len < JVM_MAXPATHLEN - 10) {
-if (class_list_path_len < JVM_MAXPATHLEN - 10) {
+jio_snprintf(class_list_path_str + class_list_path_len,
-jio_snprintf(class_list_path_str + class_list_path_len,
+sizeof(class_list_path_str) - class_list_path_len,
-sizeof(class_list_path_str) - class_list_path_len,
+"%sclasslist", os::file_separator());
-"%sclasslist", os::file_separator());
+}
-}
+class_list_path = class_list_path_str;
-class_list_path = class_list_path_str;
+} else {
-} else {
+class_list_path = SharedClassListFile;
-class_list_path = SharedClassListFile;
+}
-}
+int class_count = 0;
-int class_count = 0;
+GrowableArray<Klass*>* class_promote_order = new GrowableArray<Klass*>();
-GrowableArray<Klass*>* class_promote_order = new GrowableArray<Klass*>();
+// sun.io.Converters
-// sun.io.Converters
+static const char obj_array_sig[] = "[[Ljava/lang/Object;";
-static const char obj_array_sig[] = "[[Ljava/lang/Object;";
+SymbolTable::new_permanent_symbol(obj_array_sig, THREAD);
-SymbolTable::new_permanent_symbol(obj_array_sig, THREAD);
+// java.util.HashMap
-// java.util.HashMap
+static const char map_entry_array_sig[] = "[Ljava/util/Map$Entry;";
-static const char map_entry_array_sig[] = "[Ljava/util/Map$Entry;";
+SymbolTable::new_permanent_symbol(map_entry_array_sig, THREAD);
-SymbolTable::new_permanent_symbol(map_entry_array_sig, THREAD);
+// Need to allocate the op here:
-// Need to allocate the op here:
+// op.misc_data_space_alloc() will be called during preload_and_dump().
-// op.misc_data_space_alloc() will be called during preload_and_dump().
+ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
-ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
+VM_PopulateDumpSharedSpace op(loader_data, class_promote_order);
-VM_PopulateDumpSharedSpace op(loader_data, class_promote_order);
+tty->print_cr("Loading classes to share ...");
-tty->print_cr("Loading classes to share ...");
+_has_error_classes = false;
-_has_error_classes = false;
+class_count += preload_and_dump(class_list_path, class_promote_order,
-class_count += preload_and_dump(class_list_path, class_promote_order,
-THREAD);
-if (ExtraSharedClassListFile) {
-class_count += preload_and_dump(ExtraSharedClassListFile, class_promote_order,
 THREAD);
-}
+if (ExtraSharedClassListFile) {
-tty->print_cr("Loading classes to share: done.");
+class_count += preload_and_dump(ExtraSharedClassListFile, class_promote_order,
+THREAD);
-if (PrintSharedSpaces) {
+}
-tty->print_cr("Shared spaces: preloaded %d classes", class_count);
+tty->print_cr("Loading classes to share: done.");
-}
+if (PrintSharedSpaces) {
-// Rewrite and link classes
+tty->print_cr("Shared spaces: preloaded %d classes", class_count);
-tty->print_cr("Rewriting and linking classes ...");
+}
-// Link any classes which got missed. This would happen if we have loaded classes that
+// Rewrite and link classes
-// were not explicitly specified in the classlist. E.g., if an interface implemented by class K
+tty->print_cr("Rewriting and linking classes ...");
-// fails verification, all other interfaces that were not specified in the classlist but
-// are implemented by K are not verified.
+// Link any classes which got missed. This would happen if we have loaded classes that
-link_and_cleanup_shared_classes(CATCH);
+// were not explicitly specified in the classlist. E.g., if an interface implemented by class K
-tty->print_cr("Rewriting and linking classes: done");
+// fails verification, all other interfaces that were not specified in the classlist but
+// are implemented by K are not verified.
-VMThread::execute(&op);
+link_and_cleanup_shared_classes(CATCH);
+tty->print_cr("Rewriting and linking classes: done");
+VMThread::execute(&op);
+}
 // Since various initialization steps have been undone by this process,
 // it is not reasonable to continue running a java process.
 exit(0);
 }

changeset 36178	9739f8c767da
parent 35231	e89989198037
child 37094	c12f414936a1
child 36508	5f9eee6b383b