1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8221325: Add information about swap space to print_memory_info() on MacOS

Browse Source 
Reviewed-by: stuefe, dholmes
This commit is contained in:
Ralf Schmelter 2019-03-26 01:46:06 -07:00
parent 8e5a71de44
commit a801be79eb
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hotspot/os/bsd/os_bsd.cpp
View File

@ -1598,6 +1598,8 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
} }
void os::print_memory_info(outputStream* st) { void os::print_memory_info(outputStream* st) {
xsw_usage swap_usage;
size_t size = sizeof(swap_usage);
st->print("Memory:"); st->print("Memory:");
st->print(" %dk page", os::vm_page_size()>>10); st->print(" %dk page", os::vm_page_size()>>10);
@ -1606,6 +1608,16 @@ void os::print_memory_info(outputStream* st) {
os::physical_memory() >> 10); os::physical_memory() >> 10);
st->print("(" UINT64_FORMAT "k free)", st->print("(" UINT64_FORMAT "k free)",
os::available_memory() >> 10); os::available_memory() >> 10);
if((sysctlbyname("vm.swapusage", &swap_usage, &size, NULL, 0) == 0) || (errno == ENOMEM)) {
if (size >= offset_of(xsw_usage, xsu_used)) {
st->print(", swap " UINT64_FORMAT "k",
((julong) swap_usage.xsu_total) >> 10);
st->print("(" UINT64_FORMAT "k free)",
((julong) swap_usage.xsu_avail) >> 10);
}
}
st->cr(); st->cr();
} }