From 8bf5fef8737fdd12724b9340d76a4ed391c4ad8a Mon Sep 17 00:00:00 2001 From: vrajivk <3413293+vrajivk@users.noreply.github.com> Date: Mon, 26 Aug 2019 21:13:12 -0700 Subject: [PATCH] bpo-36205: Fix the rusage implementation of time.process_time() (GH-15538) --- .../next/Library/2019-08-27-03-53-26.bpo-36205.AfkGRl.rst | 1 + Modules/timemodule.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2019-08-27-03-53-26.bpo-36205.AfkGRl.rst diff --git a/Misc/NEWS.d/next/Library/2019-08-27-03-53-26.bpo-36205.AfkGRl.rst b/Misc/NEWS.d/next/Library/2019-08-27-03-53-26.bpo-36205.AfkGRl.rst new file mode 100644 index 0000000000..50cda34fbb --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-08-27-03-53-26.bpo-36205.AfkGRl.rst @@ -0,0 +1 @@ +Fix the rusage implementation of time.process_time() to correctly report the sum of the system and user CPU time. \ No newline at end of file diff --git a/Modules/timemodule.c b/Modules/timemodule.c index bdc93a2b7e..5e0010c8a8 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -1208,7 +1208,7 @@ _PyTime_GetProcessTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info) return -1; } - _PyTime_t total = utime + utime; + _PyTime_t total = utime + stime; *tp = total; return 0; } -- 2.40.0