1.1 --- a/src/share/vm/services/g1MemoryPool.cpp Thu Dec 03 15:01:57 2009 -0800
1.2 +++ b/src/share/vm/services/g1MemoryPool.cpp Fri Dec 04 07:44:35 2009 -0500
1.3 @@ -96,7 +96,7 @@
1.4
1.5 // See the comment at the top of g1MemoryPool.hpp
1.6 size_t G1MemoryPoolSuper::old_space_max(G1CollectedHeap* g1h) {
1.7 - size_t max = g1h->g1_reserved_obj_bytes();
1.8 + size_t max = overall_max(g1h);
1.9 size_t eden_max = eden_space_max(g1h);
1.10 size_t survivor_max = survivor_space_max(g1h);
1.11 max = subtract_up_to_zero(max, eden_max);
1.12 @@ -113,11 +113,12 @@
1.13 }
1.14
1.15 MemoryUsage G1EdenPool::get_memory_usage() {
1.16 - size_t maxSize = max_size();
1.17 - size_t used = used_in_bytes();
1.18 - size_t committed = eden_space_committed();
1.19 + size_t initial_sz = initial_size();
1.20 + size_t max_sz = max_size();
1.21 + size_t used = used_in_bytes();
1.22 + size_t committed = eden_space_committed();
1.23
1.24 - return MemoryUsage(initial_size(), used, committed, maxSize);
1.25 + return MemoryUsage(initial_sz, used, committed, max_sz);
1.26 }
1.27
1.28 G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h) :
1.29 @@ -129,11 +130,12 @@
1.30 }
1.31
1.32 MemoryUsage G1SurvivorPool::get_memory_usage() {
1.33 - size_t maxSize = max_size();
1.34 - size_t used = used_in_bytes();
1.35 - size_t committed = survivor_space_committed();
1.36 + size_t initial_sz = initial_size();
1.37 + size_t max_sz = max_size();
1.38 + size_t used = used_in_bytes();
1.39 + size_t committed = survivor_space_committed();
1.40
1.41 - return MemoryUsage(initial_size(), used, committed, maxSize);
1.42 + return MemoryUsage(initial_sz, used, committed, max_sz);
1.43 }
1.44
1.45 G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) :
1.46 @@ -145,9 +147,10 @@
1.47 }
1.48
1.49 MemoryUsage G1OldGenPool::get_memory_usage() {
1.50 - size_t maxSize = max_size();
1.51 - size_t used = used_in_bytes();
1.52 - size_t committed = old_space_committed();
1.53 + size_t initial_sz = initial_size();
1.54 + size_t max_sz = max_size();
1.55 + size_t used = used_in_bytes();
1.56 + size_t committed = old_space_committed();
1.57
1.58 - return MemoryUsage(initial_size(), used, committed, maxSize);
1.59 + return MemoryUsage(initial_sz, used, committed, max_sz);
1.60 }
