From 197a2a3799cebd91ec623616c6b5fac850955b58 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 29 Apr 2020 15:06:21 -0400 Subject: [PATCH] runtime/pprof: fix units of MaxRSS on Linux Rusage.Maxrss is in bytes on Darwin but in KiB on Linux. Fix this discrepancy so it's always in bytes. Change-Id: Ic714abc3276566b8fe5e30565072092212610854 Reviewed-on: https://go-review.googlesource.com/c/go/+/230979 Run-TryBot: Austin Clements TryBot-Result: Gobot Gobot Reviewed-by: Michael Knyszek Reviewed-by: Jeremy Faller --- src/runtime/pprof/pprof_rusage.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/runtime/pprof/pprof_rusage.go b/src/runtime/pprof/pprof_rusage.go index 6eaf168444..d42e6ed473 100644 --- a/src/runtime/pprof/pprof_rusage.go +++ b/src/runtime/pprof/pprof_rusage.go @@ -9,12 +9,23 @@ package pprof import ( "fmt" "io" + "runtime" "syscall" ) // Adds MaxRSS to platforms that are supported. func addMaxRSS(w io.Writer) { + var rssToBytes uintptr + switch runtime.GOOS { + case "linux", "android": + rssToBytes = 1024 + case "darwin": + rssToBytes = 1 + default: + panic("unsupported OS") + } + var rusage syscall.Rusage syscall.Getrusage(0, &rusage) - fmt.Fprintf(w, "# MaxRSS = %d\n", rusage.Maxrss) + fmt.Fprintf(w, "# MaxRSS = %d\n", uintptr(rusage.Maxrss)*rssToBytes) } -- 2.48.1