1.1 --- a/src/share/vm/memory/metaspace.cpp Tue Jul 02 08:42:37 2013 -0400
1.2 +++ b/src/share/vm/memory/metaspace.cpp Tue Jul 02 16:54:24 2013 +0200
1.3 @@ -1561,19 +1561,7 @@
1.4
1.5 // ChunkManager methods
1.6
1.7 -// Verification of _free_chunks_total and _free_chunks_count does not
1.8 -// work with the CMS collector because its use of additional locks
1.9 -// complicate the mutex deadlock detection but it can still be useful
1.10 -// for detecting errors in the chunk accounting with other collectors.
1.11 -
1.12 size_t ChunkManager::free_chunks_total() {
1.13 -#ifdef ASSERT
1.14 - if (!UseConcMarkSweepGC && !SpaceManager::expand_lock()->is_locked()) {
1.15 - MutexLockerEx cl(SpaceManager::expand_lock(),
1.16 - Mutex::_no_safepoint_check_flag);
1.17 - slow_locked_verify_free_chunks_total();
1.18 - }
1.19 -#endif
1.20 return _free_chunks_total;
1.21 }
1.22
1.23 @@ -2610,14 +2598,14 @@
1.24 "->" SIZE_FORMAT
1.25 "(" SIZE_FORMAT ")",
1.26 prev_metadata_used,
1.27 - allocated_capacity_bytes(),
1.28 + allocated_used_bytes(),
1.29 reserved_in_bytes());
1.30 } else {
1.31 gclog_or_tty->print(" " SIZE_FORMAT "K"
1.32 "->" SIZE_FORMAT "K"
1.33 "(" SIZE_FORMAT "K)",
1.34 prev_metadata_used / K,
1.35 - allocated_capacity_bytes() / K,
1.36 + allocated_used_bytes() / K,
1.37 reserved_in_bytes()/ K);
1.38 }
1.39
