Cache mach timebase conversion factor

Signed-off-by: Olivier Dormond <[email protected]>
giampaolo · Nov 4, 2021 · a71fedb · a71fedb
1 parent f168f77
commit a71fedb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/psutil/_psutil_common.c b/psutil/_psutil_common.c
@@ -170,6 +170,15 @@ convert_kvm_err(const char *syscall, char *errbuf) {
 }
 #endif
 
+// ====================================================================
+// --- macOS
+// ====================================================================
+
+#ifdef PSUTIL_OSX
+#include <mach/mach_time.h>
+
+struct mach_timebase_info MACH_TIMEBASE_INFO;
+#endif
 
 // ====================================================================
 // --- Windows
@@ -405,5 +414,9 @@ psutil_setup(void) {
     InitializeCriticalSection(&PSUTIL_CRITICAL_SECTION);
 #endif
 
+#ifdef PSUTIL_OSX
+    mach_timebase_info(&MACH_TIMEBASE_INFO);
+#endif
+
     return 0;
 }
diff --git a/psutil/_psutil_common.h b/psutil/_psutil_common.h
@@ -118,6 +118,16 @@ int psutil_setup(void);
 
 void convert_kvm_err(const char *syscall, char *errbuf);
 
+// ====================================================================
+// --- macOS
+// ====================================================================
+
+#ifdef PSUTIL_OSX
+#include <mach/mach_time.h>
+
+extern struct mach_timebase_info MACH_TIMEBASE_INFO;
+#endif
+
 // ====================================================================
 // --- Windows
 // ====================================================================

diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c
@@ -22,7 +22,6 @@
 #include <pwd.h>
 #include <unistd.h>
 #include <mach/mach.h>
-#include <mach/mach_time.h>
 #include <mach/mach_vm.h>
 #include <mach/shared_region.h>
 
@@ -280,19 +279,17 @@ static PyObject *
 psutil_proc_pidtaskinfo_oneshot(PyObject *self, PyObject *args) {
     pid_t pid;
     struct proc_taskinfo pti;
-    struct mach_timebase_info info;
     uint64_t total_user, total_system;
 
     if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
         return NULL;
     if (psutil_proc_pidinfo(pid, PROC_PIDTASKINFO, 0, &pti, sizeof(pti)) <= 0)
         return NULL;
 
-    mach_timebase_info(&info);
-    total_user = pti.pti_total_user * info.numer;
-    total_user /= info.denom;
-    total_system = pti.pti_total_system * info.numer;
-    total_system /= info.denom;
+    total_user = pti.pti_total_user * MACH_TIMEBASE_INFO.numer;
+    total_user /= MACH_TIMEBASE_INFO.denom;
+    total_system = pti.pti_total_system * MACH_TIMEBASE_INFO.numer;
+    total_system /= MACH_TIMEBASE_INFO.denom;
 
     return Py_BuildValue(
         "(ddKKkkkk)",