fix #770: [NetBSD] disk_io_counters() metrics didn't update.

giampaolo · Jan 24, 2016 · 6ebf9d4 · 6ebf9d4
1 parent 4bec7e4
commit 6ebf9d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -36,6 +36,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
 - #764: [NetBSD] fix compilation on NetBSD-6.x.
 - #767: [Linux] disk_io_counters() may raise ValueError on 2.6 kernels and it's
   broken on 2.4 kernels.
+- #770: [NetBSD] disk_io_counters() metrics didn't update.
 
 
 3.4.2 - 2016-01-20

diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py
@@ -111,7 +111,7 @@
 else:
     sdiskio = namedtuple('sdiskio', ['read_count', 'write_count',
                                      'read_bytes', 'write_bytes',
-                                     'busy_time'])
+                                     ])
 
 # set later from __init__.py
 NoSuchProcess = None

diff --git a/psutil/arch/bsd/netbsd.c b/psutil/arch/bsd/netbsd.c
@@ -643,22 +643,19 @@ psutil_disk_io_counters(PyObject *self, PyObject *args) {
         PyErr_NoMemory();
         goto error;
     }
-    if (sysctl(mib, 2, stats, &len, NULL, 0) < 0 ) {
+    if (sysctl(mib, 3, stats, &len, NULL, 0) < 0 ) {
         PyErr_SetFromErrno(PyExc_OSError);
         goto error;
     }
 
     for (i = 0; i < dk_ndrive; i++) {
         py_disk_info = Py_BuildValue(
-            "(KKKKLL)",
+            "(KKKK)",
             stats[i].rxfer,
             stats[i].wxfer,
             stats[i].rbytes,
-            stats[i].wbytes,
-            // assume half read - half writes.
-            // TODO: why?
-            (long long) PSUTIL_KPT2DOUBLE(stats[i].time) / 2,
-            (long long) PSUTIL_KPT2DOUBLE(stats[i].time) / 2);
+            stats[i].wbytes
+        );
         if (!py_disk_info)
             goto error;
         if (PyDict_SetItemString(py_retdict, stats[i].name, py_disk_info))