Skip to content
Permalink
Browse files
8260902: CDS mapping errors should not lead to unconditional output
Reviewed-by: iklam
  • Loading branch information
tstuefe committed Feb 2, 2021
1 parent d7b1fc5 commit f546fd00978373d1c596ee4151696add58569274
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/hotspot/share/memory/filemap.cpp
  2. +2 −2 src/hotspot/share/memory/metaspaceShared.cpp
@@ -1667,7 +1667,7 @@ char* FileMapInfo::map_bitmap_region() {
char* bitmap_base = os::map_memory(_fd, _full_path, si->file_offset(),
requested_addr, si->used_aligned(), read_only, allow_exec, mtClassShared);
if (bitmap_base == NULL) {
log_error(cds)("failed to map relocation bitmap");
log_info(cds)("failed to map relocation bitmap");
return NULL;
}

@@ -1723,8 +1723,8 @@ MapArchiveResult MetaspaceShared::map_archive(FileMapInfo* mapinfo, char* mapped
mapinfo->set_is_mapped(false);

if (mapinfo->alignment() != (size_t)os::vm_allocation_granularity()) {
log_error(cds)("Unable to map CDS archive -- os::vm_allocation_granularity() expected: " SIZE_FORMAT
" actual: %d", mapinfo->alignment(), os::vm_allocation_granularity());
log_info(cds)("Unable to map CDS archive -- os::vm_allocation_granularity() expected: " SIZE_FORMAT
" actual: %d", mapinfo->alignment(), os::vm_allocation_granularity());
return MAP_ARCHIVE_OTHER_FAILURE;
}

0 comments on commit f546fd0

Please sign in to comment.