#357: does not support cpu_num() on Net and Open BSD

giampaolo · Nov 26, 2016 · 4b52141 · 4b52141
1 parent d7aed98
commit 4b52141
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -837,7 +837,7 @@ Process class
     +------------------------------+-------------------------------+------------------------------+------------------------------+--------------------------+
     | :meth:`memory_maps`          |                               |                              |                              |                          |
     +------------------------------+-------------------------------+------------------------------+------------------------------+--------------------------+
-    | *speedup: +2.5x*             | *speedup: +1.8x / +6.5x*      | *speedup: +1.9x*             | *speedup: +2.0x*             | *speedup: +1.3x*         |
+    | *speedup: +2.6x*             | *speedup: +1.8x / +6.5x*      | *speedup: +1.9x*             | *speedup: +2.0x*             | *speedup: +1.3x*         |
     +------------------------------+-------------------------------+------------------------------+------------------------------+--------------------------+
 
     .. versionadded:: 5.0.0

diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py
@@ -590,9 +590,10 @@ def cpu_times(self):
             rawtuple[kinfo_proc_map['ch_user_time']],
             rawtuple[kinfo_proc_map['ch_sys_time']])
 
-    @wrap_exceptions
-    def cpu_num(self):
-        return self.oneshot()[kinfo_proc_map['cpunum']]
+    if FREEBSD:
+        @wrap_exceptions
+        def cpu_num(self):
+            return self.oneshot()[kinfo_proc_map['cpunum']]
 
     @wrap_exceptions
     def memory_info(self):

diff --git a/psutil/_psutil_bsd.c b/psutil/_psutil_bsd.c
@@ -258,13 +258,21 @@ psutil_proc_oneshot_info(PyObject *self, PyObject *args) {
         memstack = (long)kp.p_vm_ssize * pagesize;
 #endif
 
+#ifdef __FreeBSD__
     // what CPU we're on; top was used as an example:
     // https://svnweb.freebsd.org/base/head/usr.bin/top/machine.c?
     //     view=markup&pathrev=273835
     if (kp.ki_stat == SRUN && kp.ki_oncpu != NOCPU)
         oncpu = kp.ki_oncpu;
     else
         oncpu = kp.ki_lastcpu;
+#else
+    // On Net/OpenBSD we have kp.p_cpuid but it appears it's always
+    // set to KI_NOCPU. Even if it's not, ki_lastcpu does not exist
+    // so there's no way to determine where "sleeping" processes
+    // were. Not supported.
+    oncpu = -1;
+#endif
 
     // Return a single big tuple with all process info.
     py_retlist = Py_BuildValue(

diff --git a/scripts/internal/bench_oneshot.py b/scripts/internal/bench_oneshot.py
@@ -37,10 +37,11 @@
 
 if psutil.LINUX:
     names += [
-        'cpu_times',
-        'gids',
         # 'memory_full_info',
         # 'memory_maps',
+        'cpu_num',
+        'cpu_times',
+        'gids',
         'name',
         'num_ctx_switches',
         'num_threads',
@@ -63,6 +64,8 @@
         'terminal',
         'uids',
     ]
+    if psutil.FREEBSD:
+        names.append('cpu_num')
 elif psutil.SUNOS:
     names += [
         'cmdline',