74 lines
3.7 KiB
Diff
74 lines
3.7 KiB
Diff
From 959f2dfd0868274f202c313a24784b0be8da3d32 Mon Sep 17 00:00:00 2001
|
|
From: eapen <zhangyipeng7@huawei.com>
|
|
Date: Mon, 12 Dec 2022 17:00:02 +0800
|
|
Subject: [PATCH 11/33] I68TO2: 8261167: print_process_memory_info add a close call
|
|
after fopen
|
|
---
|
|
hotspot/src/os/linux/vm/os_linux.cpp | 50 ++++++++++++++++++++----------------
|
|
1 file changed, 28 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
|
|
index 4c265d5..1a3504f 100644
|
|
--- a/hotspot/src/os/linux/vm/os_linux.cpp
|
|
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
|
|
@@ -2302,29 +2302,35 @@ void os::Linux::print_process_memory_info(outputStream* st) {
|
|
int num_found = 0;
|
|
FILE* f = ::fopen("/proc/self/status", "r");
|
|
char buf[256];
|
|
- while (::fgets(buf, sizeof(buf), f) != NULL && num_found < num_values) {
|
|
- if ( (vmsize == -1 && sscanf(buf, "VmSize: " SSIZE_FORMAT " kB", &vmsize) == 1) ||
|
|
- (vmpeak == -1 && sscanf(buf, "VmPeak: " SSIZE_FORMAT " kB", &vmpeak) == 1) ||
|
|
- (vmswap == -1 && sscanf(buf, "VmSwap: " SSIZE_FORMAT " kB", &vmswap) == 1) ||
|
|
- (vmhwm == -1 && sscanf(buf, "VmHWM: " SSIZE_FORMAT " kB", &vmhwm) == 1) ||
|
|
- (vmrss == -1 && sscanf(buf, "VmRSS: " SSIZE_FORMAT " kB", &vmrss) == 1) ||
|
|
- (rssanon == -1 && sscanf(buf, "RssAnon: " SSIZE_FORMAT " kB", &rssanon) == 1) ||
|
|
- (rssfile == -1 && sscanf(buf, "RssFile: " SSIZE_FORMAT " kB", &rssfile) == 1) ||
|
|
- (rssshmem == -1 && sscanf(buf, "RssShmem: " SSIZE_FORMAT " kB", &rssshmem) == 1)
|
|
- )
|
|
- {
|
|
- num_found ++;
|
|
+ if (f != NULL) {
|
|
+ while (::fgets(buf, sizeof(buf), f) != NULL && num_found < num_values) {
|
|
+ if ( (vmsize == -1 && sscanf(buf, "VmSize: " SSIZE_FORMAT " kB", &vmsize) == 1) ||
|
|
+ (vmpeak == -1 && sscanf(buf, "VmPeak: " SSIZE_FORMAT " kB", &vmpeak) == 1) ||
|
|
+ (vmswap == -1 && sscanf(buf, "VmSwap: " SSIZE_FORMAT " kB", &vmswap) == 1) ||
|
|
+ (vmhwm == -1 && sscanf(buf, "VmHWM: " SSIZE_FORMAT " kB", &vmhwm) == 1) ||
|
|
+ (vmrss == -1 && sscanf(buf, "VmRSS: " SSIZE_FORMAT " kB", &vmrss) == 1) ||
|
|
+ (rssanon == -1 && sscanf(buf, "RssAnon: " SSIZE_FORMAT " kB", &rssanon) == 1) ||
|
|
+ (rssfile == -1 && sscanf(buf, "RssFile: " SSIZE_FORMAT " kB", &rssfile) == 1) ||
|
|
+ (rssshmem == -1 && sscanf(buf, "RssShmem: " SSIZE_FORMAT " kB", &rssshmem) == 1)
|
|
+ )
|
|
+ {
|
|
+ num_found ++;
|
|
+ }
|
|
}
|
|
- }
|
|
- 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);
|
|
- if (rssanon != -1) { // requires kernel >= 4.5
|
|
- 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->print_cr("Swapped out: " SSIZE_FORMAT "K", vmswap);
|
|
+ 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);
|
|
+ if (rssanon != -1) { // requires kernel >= 4.5
|
|
+ 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->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.
|
|
--
|
|
1.8.3.1
|