diff options
| author | vrajivk <3413293+vrajivk@users.noreply.github.com> | 2019-08-26 21:13:12 -0700 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2019-08-27 00:13:12 -0400 |
| commit | 8bf5fef8737fdd12724b9340d76a4ed391c4ad8a (patch) | |
| tree | fcabf93bda1a331df4ac77b2a490b565a67f0e6e | |
| parent | fae0ed5099de594a9204071d555cb8b76368cbf4 (diff) | |
| download | cpython-git-8bf5fef8737fdd12724b9340d76a4ed391c4ad8a.tar.gz | |
bpo-36205: Fix the rusage implementation of time.process_time() (GH-15538)
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-08-27-03-53-26.bpo-36205.AfkGRl.rst | 1 | ||||
| -rw-r--r-- | Modules/timemodule.c | 2 |
2 files changed, 2 insertions, 1 deletions
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; } |