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

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 enum {
 modules_image_entry,
 jar_entry,
 signed_jar_entry,
 dir_entry,
+non_existent_entry,
 unknown_entry
 };
-protected:
+void set_name(const char* name, TRAPS);
 u1     _type;
+bool   _from_class_path_attr;
 time_t _timestamp;          // jar timestamp,  0 if is directory, modules image 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, bool is_modules_image, TRAPS);
+void init(bool is_modules_image, ClassPathEntry* cpe, TRAPS);
+void init_as_non_existent(const char* path, TRAPS);
 void metaspace_pointers_do(MetaspaceClosure* it);
-bool validate(bool is_class_path = true);
+bool validate(bool is_class_path = true) const;
 // The _timestamp only gets set for jar files.
-bool has_timestamp() {
+bool has_timestamp() const {
 return _timestamp != 0;
 }
-bool is_dir()            { return _type == dir_entry; }
+bool is_dir()           const { return _type == dir_entry; }
-bool is_modules_image()  { return _type == modules_image_entry; }
+bool is_modules_image() const { return _type == modules_image_entry; }
-bool is_jar()            { return _type == jar_entry; }
+bool is_jar()           const { return _type == jar_entry; }
-bool is_signed()         { return _type == signed_jar_entry; }
+bool is_signed()        const { return _type == signed_jar_entry; }
-void set_is_signed()     {
+void set_is_signed() {
 _type = signed_jar_entry;
 }
+bool from_class_path_attr() { return _from_class_path_attr; }
 time_t timestamp() const { return _timestamp; }
 long   filesize()  const { return _filesize; }
-const char* name() const { return _name->data(); }
+const char* name() const;
 const char* manifest() const {
 return (_manifest == NULL) ? NULL : (const char*)_manifest->data();
 }
 int manifest_size() const {
 return (_manifest == NULL) ? 0 : _manifest->length();
 }
 void set_manifest(Array<u1>* manifest) {
 _manifest = manifest;
 }
+bool check_non_existent() const;
 };
 struct ArchiveHeapOopmapInfo {
 address _oopmap;               // bitmap for relocating embedded oops
 size_t  _oopmap_size_in_bits;
 p += sizeof(SharedClassPathEntry) * index;
 return (SharedClassPathEntry*)p;
 }
 Array<u8>* table() {return _table;}
 void set_table(Array<u8>* table) {_table = table;}
 };
-struct FileMapHeader : public CDSFileMapHeaderBase {
+class FileMapRegion: private CDSFileMapRegion {
+void assert_is_heap_region() const {
+assert(_is_heap_region, "must be heap region");
+}
+void assert_is_not_heap_region() const {
+assert(!_is_heap_region, "must not be heap region");
+}
+public:
+static FileMapRegion* cast(CDSFileMapRegion* p) {
+return (FileMapRegion*)p;
+}
+// Accessors
+int crc()                      const { return _crc; }
+size_t file_offset()           const { return _file_offset; }
+char*  base()                  const { assert_is_not_heap_region(); return _addr._base;  }
+narrowOop offset()             const { assert_is_heap_region();     return (narrowOop)(_addr._offset); }
+size_t used()                  const { return _used; }
+bool read_only()               const { return _read_only != 0; }
+bool allow_exec()              const { return _allow_exec != 0; }
+void* oopmap()                 const { return _oopmap; }
+size_t oopmap_size_in_bits()   const { return _oopmap_size_in_bits; }
+void set_file_offset(size_t s) { _file_offset = s; }
+void set_read_only(bool v)     { _read_only = v; }
+void mark_invalid()            { _addr._base = NULL; }
+void init(bool is_heap_region, char* base, size_t size, bool read_only,
+bool allow_exec, int crc);
+void init_oopmap(void* map, size_t size_in_bits) {
+_oopmap = map;
+_oopmap_size_in_bits = size_in_bits;
+}
+};
+class FileMapHeader: private CDSFileMapHeaderBase {
+friend class CDSOffsets;
+friend class VMStructs;
 size_t _header_size;
+// The following fields record the states of the VM during dump time.
+// They are compared with the runtime states to see if the archive
+// can be used.
 size_t _alignment;                // how shared archive should be aligned
 int    _obj_alignment;            // value of ObjectAlignmentInBytes
 address _narrow_oop_base;         // compressed oop encoding base
 int    _narrow_oop_shift;         // compressed oop encoding shift
-bool    _compact_strings;         // value of CompactStrings
+bool   _compact_strings;          // value of CompactStrings
 uintx  _max_heap_size;            // java max heap size during dumping
 CompressedOops::Mode _narrow_oop_mode; // compressed oop encoding mode
 int     _narrow_klass_shift;      // save narrow klass base and shift
 address _narrow_klass_base;
 char*   _misc_data_patching_start;
-char*   _read_only_tables_start;
+char*   _serialized_data_start;  // Data accessed using {ReadClosure,WriteClosure}::serialize()
-address _cds_i2i_entry_code_buffers;
+address _i2i_entry_code_buffers;
-size_t  _cds_i2i_entry_code_buffers_size;
+size_t  _i2i_entry_code_buffers_size;
 size_t  _core_spaces_size;        // number of bytes allocated by the core spaces
 // (mc, md, ro, rw and od).
-MemRegion _heap_reserved;         // reserved region for the entire heap at dump time.
+address _heap_end;                // heap end at dump time.
 bool _base_archive_is_default;    // indicates if the base archive is the system default one
 // The following fields are all sanity checks for whether this archive
 // will function correctly with this JVM and the bootclasspath it's
 // invoked with.
-char  _jvm_ident[JVM_IDENT_MAX];      // identifier for jvm
+char  _jvm_ident[JVM_IDENT_MAX];  // identifier string of the jvm that created this dump
 // size of the base archive name including NULL terminator
-int _base_archive_name_size;
+size_t _base_archive_name_size;
-// The _paths_misc_info is a variable-size structure that records "miscellaneous"
+// The following is a table of all the boot/app/module path entries that were used
-// information during dumping. It is generated and validated by the
+// during dumping. At run time, we validate these entries according to their
-// SharedPathsMiscInfo class. See SharedPathsMiscInfo.hpp for
+// SharedClassPathEntry::_type. See:
-// detailed description.
+//      check_nonempty_dir_in_shared_path_table()
-//
+//      validate_shared_path_table()
-// The _paths_misc_info data is stored as a byte array in the archive file header,
+//      validate_non_existent_class_paths()
-// immediately after the _header field. This information is used only when
-// 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 _shared_path_table.
-int _paths_misc_info_size;
-// The following is a table of all the class path entries that were used
-// during dumping. At run time, we require these files to exist and have the same
-// size/modification time, or else the archive will refuse to load.
-//
-// All of these entries must be JAR files. The dumping process would fail if a non-empty
-// directory was specified in the classpaths. If an empty directory was specified
-// it is checked by the _paths_misc_info as described above.
-//
-// 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.
 SharedPathTable _shared_path_table;
 jshort _app_class_paths_start_index;  // Index of first app classpath entry
 jshort _app_module_paths_start_index; // Index of first module path entry
 jshort _num_module_paths;             // number of module path entries
 bool   _verify_remote;                // BytecodeVerificationRemote setting
 bool   _has_platform_or_app_classes;  // Archive contains app classes
 size_t _shared_base_address;          // SharedBaseAddress used at dump time
 bool   _allow_archiving_with_java_agent; // setting of the AllowArchivingWithJavaAgent option
-void set_has_platform_or_app_classes(bool v) {
+public:
-_has_platform_or_app_classes = v;
+// Accessors -- fields declared in CDSFileMapHeaderBase
-}
+unsigned int magic() const {return _magic;}
-bool has_platform_or_app_classes() { return _has_platform_or_app_classes; }
+int crc()                               const { return _crc; }
-jshort max_used_path_index()       { return _max_used_path_index; }
+int version()                           const { return _version; }
-jshort app_module_paths_start_index() { return _app_module_paths_start_index; }
+void set_crc(int crc_value)                   { _crc = crc_value; }
+void set_version(int v)                       { _version = v; }
+// Accessors -- fields declared in FileMapHeader
+size_t header_size()                     const { return _header_size; }
+size_t alignment()                       const { return _alignment; }
+int obj_alignment()                      const { return _obj_alignment; }
+address narrow_oop_base()                const { return _narrow_oop_base; }
+int narrow_oop_shift()                   const { return _narrow_oop_shift; }
+bool compact_strings()                   const { return _compact_strings; }
+uintx max_heap_size()                    const { return _max_heap_size; }
+CompressedOops::Mode narrow_oop_mode()   const { return _narrow_oop_mode; }
+int narrow_klass_shift()                 const { return _narrow_klass_shift; }
+address narrow_klass_base()              const { return _narrow_klass_base; }
+char* misc_data_patching_start()         const { return _misc_data_patching_start; }
+char* serialized_data_start()            const { return _serialized_data_start; }
+address i2i_entry_code_buffers()         const { return _i2i_entry_code_buffers; }
+size_t i2i_entry_code_buffers_size()     const { return _i2i_entry_code_buffers_size; }
+size_t core_spaces_size()                const { return _core_spaces_size; }
+address heap_end()                       const { return _heap_end; }
+bool base_archive_is_default()           const { return _base_archive_is_default; }
+const char* jvm_ident()                  const { return _jvm_ident; }
+size_t base_archive_name_size()          const { return _base_archive_name_size; }
+size_t shared_base_address()             const { return _shared_base_address; }
+bool has_platform_or_app_classes()       const { return _has_platform_or_app_classes; }
+SharedPathTable shared_path_table()      const { return _shared_path_table; }
+// FIXME: These should really return int
+jshort max_used_path_index()             const { return _max_used_path_index; }
+jshort app_module_paths_start_index()    const { return _app_module_paths_start_index; }
+jshort app_class_paths_start_index()     const { return _app_class_paths_start_index; }
+jshort num_module_paths()                const { return _num_module_paths; }
+void set_core_spaces_size(size_t s)            { _core_spaces_size = s; }
+void set_has_platform_or_app_classes(bool v)   { _has_platform_or_app_classes = v; }
+void set_misc_data_patching_start(char* p)     { _misc_data_patching_start = p; }
+void set_serialized_data_start(char* p)        { _serialized_data_start   = p; }
+void set_base_archive_name_size(size_t s)      { _base_archive_name_size = s; }
+void set_base_archive_is_default(bool b)       { _base_archive_is_default = b; }
+void set_header_size(size_t s)                 { _header_size = s; }
+void set_i2i_entry_code_buffers(address p, size_t s) {
+_i2i_entry_code_buffers = p;
+_i2i_entry_code_buffers_size = s;
+}
+void relocate_shared_path_table(Array<u8>* t) {
+assert(DynamicDumpSharedSpaces, "only");
+_shared_path_table.set_table(t);
+}
+void shared_path_table_metaspace_pointers_do(MetaspaceClosure* it) {
+assert(DynamicDumpSharedSpaces, "only");
+_shared_path_table.metaspace_pointers_do(it);
+}
 bool validate();
 int compute_crc();
-CDSFileMapRegion* space_at(int i) {
+FileMapRegion* space_at(int i) {
-assert(i >= 0 && i < NUM_CDS_REGIONS, "invalid region");
+assert(is_valid_region(i), "invalid region");
-return &_space[i];
+return FileMapRegion::cast(&_space[i]);
 }
-public:
 void populate(FileMapInfo* info, size_t alignment);
+static bool is_valid_region(int region) {
+return (0 <= region && region < NUM_CDS_REGIONS);
+}
 };
 class FileMapInfo : public CHeapObj<mtInternal> {
 private:
 friend class ManifestStream;
 friend class VMStructs;
-friend struct FileMapHeader;
+friend class CDSOffsets;
+friend class FileMapHeader;
-bool    _is_static;
-bool    _file_open;
+bool           _is_static;
-int     _fd;
+bool           _file_open;
-size_t  _file_offset;
+int            _fd;
+size_t         _file_offset;
-private:
+const char*    _full_path;
+const char*    _base_archive_name;
+FileMapHeader* _header;
 // TODO: Probably change the following to be non-static
 static SharedPathTable       _shared_path_table;
 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
 // that the compilers don't add any compiler-private data to it.
-public:
-struct FileMapHeaderBase : public CHeapObj<mtClass> {
-// Need to put something here. Otherwise, in product build, because CHeapObj has no virtual
-// methods, we would get sizeof(FileMapHeaderBase) == 1 with gcc.
-intx _dummy;
-};
-FileMapHeader * _header;
-const char* _full_path;
-char* _paths_misc_info;
-char* _base_archive_name;
 static FileMapInfo* _current_info;
 static FileMapInfo* _dynamic_archive_info;
 static bool _heap_pointers_need_patching;
 static bool _memory_mapping_failed;
+static GrowableArray<const char*>* _non_existent_class_paths;
+FileMapHeader *header() const       { return _header; }
+public:
 static bool get_base_archive_name_from_header(const char* archive_name,
 int* size, char** base_archive_name);
 static bool check_archive(const char* archive_name, bool is_static);
-static bool  same_files(const char* file1, const char* file2);
 void restore_shared_path_table();
-bool  init_from_file(int fd, bool is_static);
+bool init_from_file(int fd, bool is_static);
 static void metaspace_pointers_do(MetaspaceClosure* it);
-public:
+void log_paths(const char* msg, int start_idx, int end_idx);
 FileMapInfo(bool is_static);
 ~FileMapInfo();
-int    compute_header_crc()         { return _header->compute_crc(); }
+// Accessors
-void   set_header_crc(int crc)      { _header->_crc = crc; }
+int    compute_header_crc()  const { return header()->compute_crc(); }
-int    space_crc(int i)             { return space_at(i)->_crc; }
+void   set_header_crc(int crc)     { header()->set_crc(crc); }
+int    space_crc(int i)      const { return space_at(i)->crc(); }
 void   populate_header(size_t alignment);
 bool   validate_header(bool is_static);
 void   invalidate();
-int    crc()                        { return _header->_crc; }
+int    crc()                 const { return header()->crc(); }
-int    version()                    { return _header->_version; }
+int    version()             const { return header()->version(); }
-size_t alignment()                  { return _header->_alignment; }
+size_t alignment()           const { return header()->alignment(); }
-CompressedOops::Mode narrow_oop_mode() { return _header->_narrow_oop_mode; }
+address narrow_oop_base()    const { return header()->narrow_oop_base(); }
-address narrow_oop_base()    const  { return _header->_narrow_oop_base; }
+int     narrow_oop_shift()   const { return header()->narrow_oop_shift(); }
-int     narrow_oop_shift()   const  { return _header->_narrow_oop_shift; }
+uintx   max_heap_size()      const { return header()->max_heap_size(); }
-uintx   max_heap_size()      const  { return _header->_max_heap_size; }
+address narrow_klass_base()  const { return header()->narrow_klass_base(); }
-address narrow_klass_base()  const  { return _header->_narrow_klass_base; }
+int     narrow_klass_shift() const { return header()->narrow_klass_shift(); }
-int     narrow_klass_shift() const  { return _header->_narrow_klass_shift; }
-struct  FileMapHeader* header()     { return _header; }
+CompressedOops::Mode narrow_oop_mode()      const { return header()->narrow_oop_mode(); }
-char*   misc_data_patching_start()          { return _header->_misc_data_patching_start; }
+jshort app_module_paths_start_index()       const { return header()->app_module_paths_start_index(); }
-void set_misc_data_patching_start(char* p)  { _header->_misc_data_patching_start = p; }
+jshort app_class_paths_start_index()        const { return header()->app_class_paths_start_index(); }
-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; }
+char* misc_data_patching_start()            const { return header()->misc_data_patching_start(); }
+void  set_misc_data_patching_start(char* p) const { header()->set_misc_data_patching_start(p); }
+char* serialized_data_start()               const { return header()->serialized_data_start(); }
+void  set_serialized_data_start(char* p)    const { header()->set_serialized_data_start(p); }
 bool  is_file_position_aligned() const;
 void  align_file_position();
-address cds_i2i_entry_code_buffers() {
+address i2i_entry_code_buffers()            const { return header()->i2i_entry_code_buffers();  }
-return _header->_cds_i2i_entry_code_buffers;
+size_t i2i_entry_code_buffers_size()        const { return header()->i2i_entry_code_buffers_size(); }
-}
+void set_i2i_entry_code_buffers(address addr, size_t s) const {
-void set_cds_i2i_entry_code_buffers(address addr) {
+header()->set_i2i_entry_code_buffers(addr, s);
-_header->_cds_i2i_entry_code_buffers = addr;
+}
-}
-size_t cds_i2i_entry_code_buffers_size() {
+void set_core_spaces_size(size_t s)         const { header()->set_core_spaces_size(s); }
-return _header->_cds_i2i_entry_code_buffers_size;
+size_t core_spaces_size()                   const { return header()->core_spaces_size(); }
-}
-void set_cds_i2i_entry_code_buffers_size(size_t s) {
+class DynamicArchiveHeader* dynamic_header() const {
-_header->_cds_i2i_entry_code_buffers_size = s;
+assert(!_is_static, "must be");
-}
+return (DynamicArchiveHeader*)header();
-void set_core_spaces_size(size_t s)    {  _header->_core_spaces_size = s; }
+}
-size_t core_spaces_size()              { return _header->_core_spaces_size; }
+void set_has_platform_or_app_classes(bool v) {
+header()->set_has_platform_or_app_classes(v);
+}
+bool has_platform_or_app_classes() const {
+return header()->has_platform_or_app_classes();
+}
 static FileMapInfo* current_info() {
 CDS_ONLY(return _current_info;)
 NOT_CDS(return NULL;)
 }
 void  write_header();
 void  write_region(int region, char* base, size_t size,
 bool read_only, bool allow_exec);
 size_t write_archive_heap_regions(GrowableArray<MemRegion> *heap_mem,
 GrowableArray<ArchiveHeapOopmapInfo> *oopmaps,
-int first_region_id, int max_num_regions,
+int first_region_id, int max_num_regions);
-bool print_log);
 void  write_bytes(const void* buffer, size_t count);
 void  write_bytes_aligned(const void* buffer, size_t count);
 size_t  read_bytes(void* buffer, size_t count);
 char* map_regions(int regions[], char* saved_base[], size_t len);
 char* map_region(int i, char** top_ret);
 // Stop CDS sharing and unmap CDS regions.
 static void stop_sharing_and_unmap(const char* msg);
 static void allocate_shared_path_table();
+static int add_shared_classpaths(int i, const char* which, ClassPathEntry *cpe, TRAPS);
 static void check_nonempty_dir_in_shared_path_table();
 bool validate_shared_path_table();
-static void update_shared_classpath(ClassPathEntry *cpe, SharedClassPathEntry* ent, TRAPS);
+void validate_non_existent_class_paths();
+static void update_jar_manifest(ClassPathEntry *cpe, SharedClassPathEntry* ent, TRAPS);
+static int num_non_existent_class_paths();
+static void record_non_existent_class_path_entry(const char* path);
 #if INCLUDE_JVMTI
 static ClassFileStream* open_stream_for_jvmti(InstanceKlass* ik, Handle class_loader, TRAPS);
 #endif
 }
 char* region_addr(int idx);
 private:
+void  seek_to_position(size_t pos);
+char* skip_first_path_entry(const char* path) NOT_CDS_RETURN_(NULL);
+int   num_paths(const char* path) NOT_CDS_RETURN_(0);
+GrowableArray<const char*>* create_path_array(const char* path) NOT_CDS_RETURN_(NULL);
+bool  fail(const char* msg, const char* name) NOT_CDS_RETURN_(false);
+bool  check_paths(int shared_path_start_idx, int num_paths,
+GrowableArray<const char*>* rp_array) NOT_CDS_RETURN_(false);
+bool  validate_boot_class_paths() NOT_CDS_RETURN_(false);
+bool  validate_app_class_paths(int shared_app_paths_len) NOT_CDS_RETURN_(false);
 bool  map_heap_data(MemRegion **heap_mem, int first, int max, int* num,
 bool is_open = false) NOT_CDS_JAVA_HEAP_RETURN_(false);
 bool  region_crc_check(char* buf, size_t size, int expected_crc) NOT_CDS_RETURN_(false);
 void  dealloc_archive_heap_regions(MemRegion* regions, int num, bool is_open) NOT_CDS_JAVA_HEAP_RETURN;
-CDSFileMapRegion* space_at(int i) {
+FileMapRegion* space_at(int i) const {
-return _header->space_at(i);
+return header()->space_at(i);
-}
-narrowOop offset_of_space(CDSFileMapRegion* spc) {
-return (narrowOop)(spc->_addr._offset);
 }
 // The starting address of spc, as calculated with CompressedOop::decode_non_null()
-address start_address_as_decoded_with_current_oop_encoding_mode(CDSFileMapRegion* spc) {
+address start_address_as_decoded_with_current_oop_encoding_mode(FileMapRegion* spc) {
 return decode_start_address(spc, true);
 }
 // The starting address of spc, as calculated with HeapShared::decode_from_archive()
-address start_address_as_decoded_from_archive(CDSFileMapRegion* spc) {
+address start_address_as_decoded_from_archive(FileMapRegion* spc) {
 return decode_start_address(spc, false);
 }
-address decode_start_address(CDSFileMapRegion* spc, bool with_current_oop_encoding_mode);
+address decode_start_address(FileMapRegion* spc, bool with_current_oop_encoding_mode);
 #if INCLUDE_JVMTI
 static ClassPathEntry** _classpath_entries_for_jvmti;
 static ClassPathEntry* get_classpath_entry_for_jvmti(int i, TRAPS);
 #endif

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 54927	1512d88b24c6
child 58679	9c3209ff7550