From 42551909f7c20d6b4c4c6e28695958729177455d Mon Sep 17 00:00:00 2001 From: cjihrig Date: Sun, 24 Feb 2019 12:31:19 -0500 Subject: [PATCH] report: use ru_stime for system CPU calculation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/26286 Reviewed-By: Richard Lau Reviewed-By: Anna Henningsen Reviewed-By: Michaël Zasso Reviewed-By: Luigi Pinca Reviewed-By: James M Snell --- src/node_report.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node_report.cc b/src/node_report.cc index 9f2a61be09372c..8ca35cabb9c73f 100644 --- a/src/node_report.cc +++ b/src/node_report.cc @@ -483,7 +483,7 @@ static void PrintResourceUsage(JSONWriter* writer) { double user_cpu = stats.ru_utime.tv_sec + SEC_PER_MICROS * stats.ru_utime.tv_usec; double kernel_cpu = - stats.ru_utime.tv_sec + SEC_PER_MICROS * stats.ru_utime.tv_usec; + stats.ru_stime.tv_sec + SEC_PER_MICROS * stats.ru_stime.tv_usec; writer->json_keyvalue("userCpuSeconds", user_cpu); writer->json_keyvalue("kernelCpuSeconds", kernel_cpu); double cpu_abs = user_cpu + kernel_cpu; @@ -506,7 +506,7 @@ static void PrintResourceUsage(JSONWriter* writer) { double user_cpu = stats.ru_utime.tv_sec + SEC_PER_MICROS * stats.ru_utime.tv_usec; double kernel_cpu = - stats.ru_utime.tv_sec + SEC_PER_MICROS * stats.ru_utime.tv_usec; + stats.ru_stime.tv_sec + SEC_PER_MICROS * stats.ru_stime.tv_usec; writer->json_keyvalue("userCpuSeconds", user_cpu); writer->json_keyvalue("kernelCpuSeconds", kernel_cpu); double cpu_abs = user_cpu + kernel_cpu;