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

Merge

Browse source
This commit is contained in:
Poonam Bajaj 2013-08-22 21:23:31 -07:00
commit 626bd19644
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hotspot/src/share/vm/services/management.cpp
View file

@ -876,8 +876,6 @@ JVM_ENTRY(jobject, jmm_GetMemoryUsage(JNIEnv* env, jboolean heap))
total_used += u.used(); total_used += u.used();
total_committed += u.committed(); total_committed += u.committed();
// if any one of the memory pool has undefined init_size or max_size,
// set it to -1
if (u.init_size() == (size_t)-1) { if (u.init_size() == (size_t)-1) {
has_undefined_init_size = true; has_undefined_init_size = true;
} }
@ -894,6 +892,15 @@ JVM_ENTRY(jobject, jmm_GetMemoryUsage(JNIEnv* env, jboolean heap))
} }
} }
// if any one of the memory pool has undefined init_size or max_size,
// set it to -1
if (has_undefined_init_size) {
total_init = (size_t)-1;
}
if (has_undefined_max_size) {
total_max = (size_t)-1;
}
MemoryUsage usage((heap ? InitialHeapSize : total_init), MemoryUsage usage((heap ? InitialHeapSize : total_init),
total_used, total_used,
total_committed, total_committed,