From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 27 Aug 2019 04:31:27 +0000 (-0700)
Subject: bpo-36205: Fix the rusage implementation of time.process_time() (GH-15538)
X-Git-Tag: v3.7.5rc1~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bf672f53a83c471e6fc4599d2d5149fd6842ff2;p=thirdparty%2FPython%2Fcpython.git

bpo-36205: Fix the rusage implementation of time.process_time() (GH-15538)

(cherry picked from commit 8bf5fef8737fdd12724b9340d76a4ed391c4ad8a)

Co-authored-by: vrajivk <3413293+vrajivk@users.noreply.github.com>
---

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 000000000000..50cda34fbbd3
--- /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 4c8e2cb2344b..0ae4fcc32364 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -1189,7 +1189,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;
     }