archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7196298: Better fix for 7195789

Browse source 
Reviewed-by: jcoomes, brutisso
This commit is contained in:
Jon Masamitsu 2012-09-06 07:28:30 -07:00
parent 8536f548db
commit cd5df1082a
3 changed files with 5 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

33
hotspot/src/share/vm/memory/metaspace.cpp
View file

@ -2541,41 +2541,14 @@ void SpaceManager::mangle_freed_chunks() {
// MetaspaceAux
size_t MetaspaceAux::used_in_bytes_unsafe(Metaspace::MetadataType mdtype) {
size_t used = 0;
ClassLoaderDataGraphMetaspaceIterator iter;
while (iter.repeat()) {
Metaspace* msp = iter.get_next();
// Sum allocation_total for each metaspace
if (msp != NULL) {
used += msp->used_words(mdtype);
}
}
return used * BytesPerWord;
}
size_t MetaspaceAux::used_in_bytes(Metaspace::MetadataType mdtype) {
assert(SafepointSynchronize::is_at_safepoint(),
"Consistency checks require being at a safepoint");
size_t used = 0;
#ifdef ASSERT
size_t free = 0;
size_t capacity = 0;
#endif
ClassLoaderDataGraphMetaspaceIterator iter;
while (iter.repeat()) {
Metaspace* msp = iter.get_next();
// Sum allocation_total for each metaspace
if (msp != NULL) {
used += msp->used_words(mdtype);
#ifdef ASSERT
free += msp->free_words(mdtype);
capacity += msp->capacity_words(mdtype);
assert(used + free == capacity,
err_msg("Accounting is wrong used " SIZE_FORMAT
" free " SIZE_FORMAT " capacity " SIZE_FORMAT,
used, free, capacity));
#endif
}
}
return used * BytesPerWord;
@ -2661,15 +2634,15 @@ void MetaspaceAux::print_on(outputStream* out) {
out->print_cr(" Metaspace total "
SIZE_FORMAT "K, used " SIZE_FORMAT "K,"
" reserved " SIZE_FORMAT "K",
capacity_in_bytes()/K, used_in_bytes_unsafe()/K, reserved_in_bytes()/K);
capacity_in_bytes()/K, used_in_bytes()/K, reserved_in_bytes()/K);
out->print_cr(" data space "
SIZE_FORMAT "K, used " SIZE_FORMAT "K,"
" reserved " SIZE_FORMAT "K",
capacity_in_bytes(nct)/K, used_in_bytes_unsafe(nct)/K, reserved_in_bytes(nct)/K);
capacity_in_bytes(nct)/K, used_in_bytes(nct)/K, reserved_in_bytes(nct)/K);
out->print_cr(" class space "
SIZE_FORMAT "K, used " SIZE_FORMAT "K,"
" reserved " SIZE_FORMAT "K",
capacity_in_bytes(ct)/K, used_in_bytes_unsafe(ct)/K, reserved_in_bytes(ct)/K);
capacity_in_bytes(ct)/K, used_in_bytes(ct)/K, reserved_in_bytes(ct)/K);
}
// Print information for class space and data space separately.