equal
deleted
inserted
replaced
36 #include "logging/logMessage.hpp" |
36 #include "logging/logMessage.hpp" |
37 #include "memory/dynamicArchive.hpp" |
37 #include "memory/dynamicArchive.hpp" |
38 #include "memory/filemap.hpp" |
38 #include "memory/filemap.hpp" |
39 #include "memory/heapShared.inline.hpp" |
39 #include "memory/heapShared.inline.hpp" |
40 #include "memory/iterator.inline.hpp" |
40 #include "memory/iterator.inline.hpp" |
|
41 #include "memory/metaspace.hpp" |
41 #include "memory/metadataFactory.hpp" |
42 #include "memory/metadataFactory.hpp" |
42 #include "memory/metaspaceClosure.hpp" |
43 #include "memory/metaspaceClosure.hpp" |
43 #include "memory/metaspaceShared.hpp" |
44 #include "memory/metaspaceShared.hpp" |
44 #include "memory/oopFactory.hpp" |
45 #include "memory/oopFactory.hpp" |
45 #include "memory/universe.hpp" |
46 #include "memory/universe.hpp" |
1367 |
1368 |
1368 char* FileMapInfo::map_region(int i, char** top_ret) { |
1369 char* FileMapInfo::map_region(int i, char** top_ret) { |
1369 assert(!HeapShared::is_heap_region(i), "sanity"); |
1370 assert(!HeapShared::is_heap_region(i), "sanity"); |
1370 CDSFileMapRegion* si = space_at(i); |
1371 CDSFileMapRegion* si = space_at(i); |
1371 size_t used = si->_used; |
1372 size_t used = si->_used; |
1372 size_t alignment = os::vm_allocation_granularity(); |
1373 size_t alignment = Metaspace::reserve_alignment(); |
1373 size_t size = align_up(used, alignment); |
1374 size_t size = align_up(used, alignment); |
1374 char *requested_addr = region_addr(i); |
1375 char *requested_addr = region_addr(i); |
1375 |
1376 |
1376 #ifdef _WINDOWS |
1377 #ifdef _WINDOWS |
1377 // Windows cannot remap read-only shared memory to read-write when required for |
1378 // Windows cannot remap read-only shared memory to read-write when required for |