archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 12:04:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6880903: G1: G1 reports incorrect Runtime.maxMemory()

Browse source 
G1 reports committed memory instead of reserved memory from the Runtime.maxMemory() method

Reviewed-by: ysr, jmasa
This commit is contained in:
Antonios Printezis 2009-12-04 07:44:35 -05:00
parent d875a8e0f1
commit 8a125d9913
4 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
hotspot/src/share/vm/services/g1MemoryPool.cpp
View file

@ -96,7 +96,7 @@ size_t G1MemoryPoolSuper::old_space_used(G1CollectedHeap* g1h) {
// See the comment at the top of g1MemoryPool.hpp
size_t G1MemoryPoolSuper::old_space_max(G1CollectedHeap* g1h) {
size_t max = g1h->g1_reserved_obj_bytes();
size_t max = overall_max(g1h);
size_t eden_max = eden_space_max(g1h);
size_t survivor_max = survivor_space_max(g1h);
max = subtract_up_to_zero(max, eden_max);
@ -113,11 +113,12 @@ G1EdenPool::G1EdenPool(G1CollectedHeap* g1h) :
}
MemoryUsage G1EdenPool::get_memory_usage() {
size_t maxSize = max_size();
size_t used = used_in_bytes();
size_t committed = eden_space_committed();
size_t initial_sz = initial_size();
size_t max_sz = max_size();
size_t used = used_in_bytes();
size_t committed = eden_space_committed();
return MemoryUsage(initial_size(), used, committed, maxSize);
return MemoryUsage(initial_sz, used, committed, max_sz);
}
G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h) :
@ -129,11 +130,12 @@ G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h) :
}
MemoryUsage G1SurvivorPool::get_memory_usage() {
size_t maxSize = max_size();
size_t used = used_in_bytes();
size_t committed = survivor_space_committed();
size_t initial_sz = initial_size();
size_t max_sz = max_size();
size_t used = used_in_bytes();
size_t committed = survivor_space_committed();
return MemoryUsage(initial_size(), used, committed, maxSize);
return MemoryUsage(initial_sz, used, committed, max_sz);
}
G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) :
@ -145,9 +147,10 @@ G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) :
}
MemoryUsage G1OldGenPool::get_memory_usage() {
size_t maxSize = max_size();
size_t used = used_in_bytes();
size_t committed = old_space_committed();
size_t initial_sz = initial_size();
size_t max_sz = max_size();
size_t used = used_in_bytes();
size_t committed = old_space_committed();
return MemoryUsage(initial_size(), used, committed, maxSize);
return MemoryUsage(initial_sz, used, committed, max_sz);
}