summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2021-11-10 23:34:05 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2021-11-10 23:34:05 +0100
commit2c43bb7b5b4fb45d667d16eb3239fd933b777322 (patch)
tree3b6feded6d5eb3932e955a0a25f9cae1dedcd7ce
parent324b297de09feb1d5982db1145db2b6a6a4609b8 (diff)
downloadpsutil-2c43bb7b5b4fb45d667d16eb3239fd933b777322.tar.gz
give credits to @odormond for #1956 and #2011
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
-rw-r--r--CREDITS4
-rw-r--r--HISTORY.rst2
-rw-r--r--psutil/_psutil_common.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index e7d9fa78..131bbfe9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -774,3 +774,7 @@ I: 1996
N: PetrPospisil
W: https://github.com/PetrPospisil
I: 1980
+
+N: Olivier Dormond
+W: https://github.com/odormond
+I: 1956
diff --git a/HISTORY.rst b/HISTORY.rst
index 5531f9d1..139560f7 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -52,6 +52,8 @@ XXXX-XX-XX
by PetrPospisil)
- 1991_: process_iter() can raise TypeError if invoked from multiple threads
(not thread-safe).
+- 1956_: [macOS] Process.cpu_times() reports incorrect timings on M1 machines.
+ (patch by Olivier Dormond)
5.8.0
=====
diff --git a/psutil/_psutil_common.c b/psutil/_psutil_common.c
index 683db9bd..9679da67 100644
--- a/psutil/_psutil_common.c
+++ b/psutil/_psutil_common.c
@@ -413,10 +413,8 @@ psutil_setup(void) {
GetSystemInfo(&PSUTIL_SYSTEM_INFO);
InitializeCriticalSection(&PSUTIL_CRITICAL_SECTION);
#endif
-
#ifdef PSUTIL_OSX
mach_timebase_info(&PSUTIL_MACH_TIMEBASE_INFO);
#endif
-
return 0;
}