1.1 --- a/src/share/vm/memory/filemap.cpp Thu Oct 18 13:09:47 2012 -0400
1.2 +++ b/src/share/vm/memory/filemap.cpp Fri Oct 19 21:40:07 2012 -0400
1.3 @@ -29,6 +29,7 @@
1.4 #include "runtime/arguments.hpp"
1.5 #include "runtime/java.hpp"
1.6 #include "runtime/os.hpp"
1.7 +#include "services/memTracker.hpp"
1.8 #include "utilities/defaultStream.hpp"
1.9
1.10 # include <sys/stat.h>
1.11 @@ -344,25 +345,14 @@
1.12 fail_continue(err_msg("Unable to reserved shared space at required address " INTPTR_FORMAT, requested_addr));
1.13 return rs;
1.14 }
1.15 + // the reserved virtual memory is for mapping class data sharing archive
1.16 + if (MemTracker::is_on()) {
1.17 + MemTracker::record_virtual_memory_type((address)rs.base(), mtClassShared);
1.18 + }
1.19 return rs;
1.20 }
1.21
1.22 // Memory map a region in the address space.
1.23 -
1.24 -char* FileMapInfo::map_region(int i, ReservedSpace rs) {
1.25 - struct FileMapInfo::FileMapHeader::space_info* si = &_header._space[i];
1.26 - size_t used = si->_used;
1.27 - size_t size = align_size_up(used, os::vm_allocation_granularity());
1.28 -
1.29 - ReservedSpace mapped_rs = rs.first_part(size, true, true);
1.30 - ReservedSpace unmapped_rs = rs.last_part(size);
1.31 - mapped_rs.release();
1.32 -
1.33 - return map_region(i);
1.34 -}
1.35 -
1.36 -
1.37 -// Memory map a region in the address space.
1.38 static const char* shared_region_name[] = { "ReadOnly", "ReadWrite", "MiscData", "MiscCode"};
1.39
1.40 char* FileMapInfo::map_region(int i) {
