1.1 --- a/src/share/vm/memory/metaspaceShared.cpp Wed Jun 26 11:00:11 2013 +0200
1.2 +++ b/src/share/vm/memory/metaspaceShared.cpp Thu Jun 27 10:03:21 2013 -0700
1.3 @@ -826,35 +826,15 @@
1.4 bool reading() const { return true; }
1.5 };
1.6
1.7 -
1.8 -// Save bounds of shared spaces mapped in.
1.9 -static char* _ro_base = NULL;
1.10 -static char* _rw_base = NULL;
1.11 -static char* _md_base = NULL;
1.12 -static char* _mc_base = NULL;
1.13 -
1.14 // Return true if given address is in the mapped shared space.
1.15 bool MetaspaceShared::is_in_shared_space(const void* p) {
1.16 - if (_ro_base == NULL || _rw_base == NULL) {
1.17 - return false;
1.18 - } else {
1.19 - return ((p >= _ro_base && p < (_ro_base + SharedReadOnlySize)) ||
1.20 - (p >= _rw_base && p < (_rw_base + SharedReadWriteSize)));
1.21 - }
1.22 + return UseSharedSpaces && FileMapInfo::current_info()->is_in_shared_space(p);
1.23 }
1.24
1.25 void MetaspaceShared::print_shared_spaces() {
1.26 - gclog_or_tty->print_cr("Shared Spaces:");
1.27 - gclog_or_tty->print(" read-only " INTPTR_FORMAT "-" INTPTR_FORMAT,
1.28 - _ro_base, _ro_base + SharedReadOnlySize);
1.29 - gclog_or_tty->print(" read-write " INTPTR_FORMAT "-" INTPTR_FORMAT,
1.30 - _rw_base, _rw_base + SharedReadWriteSize);
1.31 - gclog_or_tty->cr();
1.32 - gclog_or_tty->print(" misc-data " INTPTR_FORMAT "-" INTPTR_FORMAT,
1.33 - _md_base, _md_base + SharedMiscDataSize);
1.34 - gclog_or_tty->print(" misc-code " INTPTR_FORMAT "-" INTPTR_FORMAT,
1.35 - _mc_base, _mc_base + SharedMiscCodeSize);
1.36 - gclog_or_tty->cr();
1.37 + if (UseSharedSpaces) {
1.38 + FileMapInfo::current_info()->print_shared_spaces();
1.39 + }
1.40 }
1.41
1.42
1.43 @@ -874,6 +854,11 @@
1.44
1.45 assert(!DumpSharedSpaces, "Should not be called with DumpSharedSpaces");
1.46
1.47 + char* _ro_base = NULL;
1.48 + char* _rw_base = NULL;
1.49 + char* _md_base = NULL;
1.50 + char* _mc_base = NULL;
1.51 +
1.52 // Map each shared region
1.53 if ((_ro_base = mapinfo->map_region(ro)) != NULL &&
1.54 (_rw_base = mapinfo->map_region(rw)) != NULL &&
