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

8261167: print_process_memory_info add a close call after fopen

Browse source 
Reviewed-by: stuefe, dholmes
This commit is contained in:
Matthias Baesken 2021-02-05 13:37:44 +00:00
parent 48f5220c80
commit 43ae0cf878
1 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/hotspot/os/linux/os_linux.cpp
View file

@ -2195,29 +2195,35 @@ void os::Linux::print_process_memory_info(outputStream* st) {
int num_found = 0; int num_found = 0;
FILE* f = ::fopen("/proc/self/status", "r"); FILE* f = ::fopen("/proc/self/status", "r");
char buf[256]; char buf[256];
while (::fgets(buf, sizeof(buf), f) != NULL && num_found < num_values) { if (f != NULL) {
if ( (vmsize == -1 && sscanf(buf, "VmSize: " SSIZE_FORMAT " kB", &vmsize) == 1) || while (::fgets(buf, sizeof(buf), f) != NULL && num_found < num_values) {
(vmpeak == -1 && sscanf(buf, "VmPeak: " SSIZE_FORMAT " kB", &vmpeak) == 1) || if ( (vmsize == -1 && sscanf(buf, "VmSize: " SSIZE_FORMAT " kB", &vmsize) == 1) ||
(vmswap == -1 && sscanf(buf, "VmSwap: " SSIZE_FORMAT " kB", &vmswap) == 1) || (vmpeak == -1 && sscanf(buf, "VmPeak: " SSIZE_FORMAT " kB", &vmpeak) == 1) ||
(vmhwm == -1 && sscanf(buf, "VmHWM: " SSIZE_FORMAT " kB", &vmhwm) == 1) || (vmswap == -1 && sscanf(buf, "VmSwap: " SSIZE_FORMAT " kB", &vmswap) == 1) ||
(vmrss == -1 && sscanf(buf, "VmRSS: " SSIZE_FORMAT " kB", &vmrss) == 1) || (vmhwm == -1 && sscanf(buf, "VmHWM: " SSIZE_FORMAT " kB", &vmhwm) == 1) ||
(rssanon == -1 && sscanf(buf, "RssAnon: " SSIZE_FORMAT " kB", &rssanon) == 1) || (vmrss == -1 && sscanf(buf, "VmRSS: " SSIZE_FORMAT " kB", &vmrss) == 1) ||
(rssfile == -1 && sscanf(buf, "RssFile: " SSIZE_FORMAT " kB", &rssfile) == 1) || (rssanon == -1 && sscanf(buf, "RssAnon: " SSIZE_FORMAT " kB", &rssanon) == 1) ||
(rssshmem == -1 && sscanf(buf, "RssShmem: " SSIZE_FORMAT " kB", &rssshmem) == 1) (rssfile == -1 && sscanf(buf, "RssFile: " SSIZE_FORMAT " kB", &rssfile) == 1) ||
) (rssshmem == -1 && sscanf(buf, "RssShmem: " SSIZE_FORMAT " kB", &rssshmem) == 1)
{ )
num_found ++; {
num_found ++;
}
} }
} fclose(f);
st->print_cr("Virtual Size: " SSIZE_FORMAT "K (peak: " SSIZE_FORMAT "K)", vmsize, vmpeak);
st->print("Resident Set Size: " SSIZE_FORMAT "K (peak: " SSIZE_FORMAT "K)", vmrss, vmhwm); st->print_cr("Virtual Size: " SSIZE_FORMAT "K (peak: " SSIZE_FORMAT "K)", vmsize, vmpeak);
if (rssanon != -1) { // requires kernel >= 4.5 st->print("Resident Set Size: " SSIZE_FORMAT "K (peak: " SSIZE_FORMAT "K)", vmrss, vmhwm);
st->print(" (anon: " SSIZE_FORMAT "K, file: " SSIZE_FORMAT "K, shmem: " SSIZE_FORMAT "K)", if (rssanon != -1) { // requires kernel >= 4.5
rssanon, rssfile, rssshmem); st->print(" (anon: " SSIZE_FORMAT "K, file: " SSIZE_FORMAT "K, shmem: " SSIZE_FORMAT "K)",
} rssanon, rssfile, rssshmem);
st->cr(); }
if (vmswap != -1) { // requires kernel >= 2.6.34 st->cr();
st->print_cr("Swapped out: " SSIZE_FORMAT "K", vmswap); if (vmswap != -1) { // requires kernel >= 2.6.34
st->print_cr("Swapped out: " SSIZE_FORMAT "K", vmswap);
}
} else {
st->print_cr("Could not open /proc/self/status to get process memory related information");
} }
// Print glibc outstanding allocations. // Print glibc outstanding allocations.