--- a/src/hotspot/share/memory/filemap.hpp Tue Apr 10 10:06:42 2018 -0400
+++ b/src/hotspot/share/memory/filemap.hpp Tue Apr 10 11:43:40 2018 -0700
@@ -53,7 +53,7 @@
public:
void init(const char* name, TRAPS);
void metaspace_pointers_do(MetaspaceClosure* it);
- bool validate();
+ bool validate(bool is_class_path = true);
// The _timestamp only gets set for jar files and "modules" jimage.
bool is_jar_or_bootimage() {
@@ -85,10 +85,10 @@
size_t _file_offset;
private:
- static Array<u8>* _classpath_entry_table;
- static int _classpath_entry_table_size;
- static size_t _classpath_entry_size;
- static bool _validating_classpath_entry_table;
+ static Array<u8>* _shared_path_table;
+ static int _shared_path_table_size;
+ static size_t _shared_path_entry_size;
+ static bool _validating_shared_path_table;
// FileMapHeader describes the shared space data in the file to be
// mapped. This structure gets written to a file. It is not a class, so
@@ -153,7 +153,7 @@
// checking the validity of the archive and is deallocated after the archive is loaded.
//
// Note that the _paths_misc_info does NOT include information for JAR files
- // that existed during dump time. Their information is stored in _classpath_entry_table.
+ // that existed during dump time. Their information is stored in _shared_path_table.
int _paths_misc_info_size;
// The following is a table of all the class path entries that were used
@@ -167,9 +167,9 @@
// FIXME -- if JAR files in the tail of the list were specified but not used during dumping,
// they should be removed from this table, to save space and to avoid spurious
// loading failures during runtime.
- int _classpath_entry_table_size;
- size_t _classpath_entry_size;
- Array<u8>* _classpath_entry_table;
+ int _shared_path_table_size;
+ size_t _shared_path_entry_size;
+ Array<u8>* _shared_path_table;
char* region_addr(int idx);
@@ -270,25 +270,26 @@
// Stop CDS sharing and unmap CDS regions.
static void stop_sharing_and_unmap(const char* msg);
- static void allocate_classpath_entry_table();
- bool validate_classpath_entry_table();
+ static void allocate_shared_path_table();
+ bool validate_shared_path_table();
- static SharedClassPathEntry* shared_classpath(int index) {
+ static SharedClassPathEntry* shared_path(int index) {
if (index < 0) {
return NULL;
}
- assert(index < _classpath_entry_table_size, "sanity");
- char* p = (char*)_classpath_entry_table->data();
- p += _classpath_entry_size * index;
+ assert(index < _shared_path_table_size, "sanity");
+ char* p = (char*)_shared_path_table->data();
+ p += _shared_path_entry_size * index;
return (SharedClassPathEntry*)p;
}
- static const char* shared_classpath_name(int index) {
+
+ static const char* shared_path_name(int index) {
assert(index >= 0, "Sanity");
- return shared_classpath(index)->name();
+ return shared_path(index)->name();
}
- static int get_number_of_share_classpaths() {
- return _classpath_entry_table_size;
+ static int get_number_of_shared_paths() {
+ return _shared_path_table_size;
}
private: