--- a/hotspot/src/share/vm/memory/filemap.hpp Sat Jul 22 15:54:27 2017 -0400
+++ b/hotspot/src/share/vm/memory/filemap.hpp Wed Aug 02 18:06:38 2017 -0700
@@ -42,24 +42,33 @@
static const int JVM_IDENT_MAX = 256;
-class Metaspace;
-
class SharedClassPathEntry VALUE_OBJ_CLASS_SPEC {
-public:
- const char *_name;
+protected:
+ bool _is_dir;
time_t _timestamp; // jar/jimage timestamp, 0 if is directory or other
long _filesize; // jar/jimage file size, -1 if is directory, -2 if other
+ Array<char>* _name;
+ Array<u1>* _manifest;
+
+public:
+ void init(const char* name, TRAPS);
+ void metaspace_pointers_do(MetaspaceClosure* it);
+ bool validate();
// The _timestamp only gets set for jar files and "modules" jimage.
bool is_jar_or_bootimage() {
return _timestamp != 0;
}
- bool is_dir() {
- return _filesize == -1;
+ bool is_dir() { return _is_dir; }
+ bool is_jrt() { return ClassLoader::is_jrt(name()); }
+ time_t timestamp() const { return _timestamp; }
+ long filesize() const { return _filesize; }
+ const char* name() const { return _name->data(); }
+ const char* manifest() const {
+ return (_manifest == NULL) ? NULL : (const char*)_manifest->data();
}
-
- bool is_jrt() {
- return ClassLoader::is_jrt(_name);
+ int manifest_size() const {
+ return (_manifest == NULL) ? 0 : _manifest->length();
}
};
@@ -68,7 +77,7 @@
friend class ManifestStream;
enum {
_invalid_version = -1,
- _current_version = 2
+ _current_version = 3
};
bool _file_open;
@@ -76,7 +85,7 @@
size_t _file_offset;
private:
- static SharedClassPathEntry* _classpath_entry_table;
+ static Array<u8>* _classpath_entry_table;
static int _classpath_entry_table_size;
static size_t _classpath_entry_size;
static bool _validating_classpath_entry_table;
@@ -110,8 +119,11 @@
int _narrow_klass_shift; // save narrow klass base and shift
address _narrow_klass_base;
char* _misc_data_patching_start;
+ char* _read_only_tables_start;
address _cds_i2i_entry_code_buffers;
size_t _cds_i2i_entry_code_buffers_size;
+ size_t _core_spaces_size; // number of bytes allocated by the core spaces
+ // (mc, md, ro, rw and od).
struct space_info {
int _crc; // crc checksum of the current space
@@ -121,7 +133,6 @@
intx _offset; // offset from the compressed oop encoding base, only used
// by string space
} _addr;
- size_t _capacity; // for validity checking
size_t _used; // for setting space top on read
bool _read_only; // read only space?
bool _allow_exec; // executable code in space?
@@ -158,7 +169,7 @@
// loading failures during runtime.
int _classpath_entry_table_size;
size_t _classpath_entry_size;
- SharedClassPathEntry* _classpath_entry_table;
+ Array<u8>* _classpath_entry_table;
char* region_addr(int idx);
@@ -177,6 +188,7 @@
bool init_from_file(int fd);
void align_file_position();
bool validate_header_impl();
+ static void metaspace_pointers_do(MetaspaceClosure* it);
public:
FileMapInfo();
@@ -195,10 +207,11 @@
uintx max_heap_size() { return _header->_max_heap_size; }
address narrow_klass_base() const { return _header->_narrow_klass_base; }
int narrow_klass_shift() const { return _header->_narrow_klass_shift; }
- size_t space_capacity(int i) { return _header->_space[i]._capacity; }
struct FileMapHeader* header() { return _header; }
char* misc_data_patching_start() { return _header->_misc_data_patching_start; }
void set_misc_data_patching_start(char* p) { _header->_misc_data_patching_start = p; }
+ char* read_only_tables_start() { return _header->_read_only_tables_start; }
+ void set_read_only_tables_start(char* p) { _header->_read_only_tables_start = p; }
address cds_i2i_entry_code_buffers() {
return _header->_cds_i2i_entry_code_buffers;
@@ -212,6 +225,8 @@
void set_cds_i2i_entry_code_buffers_size(size_t s) {
_header->_cds_i2i_entry_code_buffers_size = s;
}
+ void set_core_spaces_size(size_t s) { _header->_core_spaces_size = s; }
+ size_t core_spaces_size() { return _header->_core_spaces_size; }
static FileMapInfo* current_info() {
CDS_ONLY(return _current_info;)
@@ -225,10 +240,11 @@
bool open_for_read();
void open_for_write();
void write_header();
- void write_space(int i, Metaspace* space, bool read_only);
void write_region(int region, char* base, size_t size,
- size_t capacity, bool read_only, bool allow_exec);
- void write_string_regions(GrowableArray<MemRegion> *regions);
+ bool read_only, bool allow_exec);
+ void write_string_regions(GrowableArray<MemRegion> *regions,
+ char** s0_start, char** s0_top, char** s0_end,
+ char** s1_start, char** s1_top, char** s1_end);
void write_bytes(const void* buffer, int count);
void write_bytes_aligned(const void* buffer, int count);
char* map_region(int i);
@@ -255,29 +271,6 @@
bool is_in_shared_region(const void* p, int idx) NOT_CDS_RETURN_(false);
void print_shared_spaces() NOT_CDS_RETURN;
- // The ro+rw+md+mc spaces size
- static size_t core_spaces_size() {
- return align_up((SharedReadOnlySize + SharedReadWriteSize +
- SharedMiscDataSize + SharedMiscCodeSize),
- os::vm_allocation_granularity());
- }
-
- // The estimated optional space size.
- //
- // Currently the optional space only has archived class bytes.
- // The core_spaces_size is the size of all class metadata, which is a good
- // estimate of the total class bytes to be archived. Only the portion
- // containing data is written out to the archive and mapped at runtime.
- // There is no memory waste due to unused portion in optional space.
- static size_t optional_space_size() {
- return core_spaces_size();
- }
-
- // Total shared_spaces size includes the ro, rw, md, mc and od spaces
- static size_t shared_spaces_size() {
- return core_spaces_size() + optional_space_size();
- }
-
// Stop CDS sharing and unmap CDS regions.
static void stop_sharing_and_unmap(const char* msg);
@@ -288,13 +281,14 @@
if (index < 0) {
return NULL;
}
- char* p = (char*)_classpath_entry_table;
+ assert(index < _classpath_entry_table_size, "sanity");
+ char* p = (char*)_classpath_entry_table->data();
p += _classpath_entry_size * index;
return (SharedClassPathEntry*)p;
}
static const char* shared_classpath_name(int index) {
assert(index >= 0, "Sanity");
- return shared_classpath(index)->_name;
+ return shared_classpath(index)->name();
}
static int get_number_of_share_classpaths() {