Handle disabled swap/counter failure case

Signed-off-by: Daniel Widdis <[email protected]>

psutil/_pswindows.py

@@ -251,10 +251,13 @@ def swap_memory():
     total = total_system - total_phys
     # commit total is incremented immediately (decrementing free_system)
     # while the corresponding free physical value is not decremented until
-    # pages are accessed, so we ignore free system memory and calculate
-    # page file usage based on performance counter
-    percentswap = cext.getpercentswap()
-    used = int(0.01 * percentswap * total)
+    # pages are accessed, so we can't use free system memory for swap.
+    # instead, we calculate page file usage based on performance counter
+    if (total > 0):
+        percentswap = cext.getpercentswap()
+        used = int(0.01 * percentswap * total)
+    else:
+        used = 0
     free = total - used
     percent = usage_percent(used, total, round_=1)
     return _common.sswap(total, used, free, percent, 0, 0)

psutil/arch/windows/wmi.c

@@ -155,27 +155,21 @@ psutil_get_percentswap(PyObject *self, PyObject *args) {
 
     s = PdhCollectQueryData(hQuery);
     if (s != ERROR_SUCCESS) {
-        PyErr_Format(PyExc_RuntimeError, "PdhCollectQueryData failed");
-        return NULL;
-    }
-
-    s = PdhGetFormattedCounterValue(
-        (PDH_HCOUNTER)hCounter, PDH_FMT_DOUBLE, 0, &counterValue);
-    if (s != ERROR_SUCCESS) {
-        return NULL;
+        // If swap disabled this will fail
+        percentUsage = 0;
+    } else {
+        s = PdhGetFormattedCounterValue(
+            (PDH_HCOUNTER)hCounter, PDH_FMT_DOUBLE, 0, &counterValue);
+        if (s != ERROR_SUCCESS) {
+            percentUsage = 0;
+        } else {
+            percentUsage = counterValue.doubleValue;
+        }
     }
 
-    percentUsage = counterValue.doubleValue;
+    PdhRemoveCounter(hCounter);
 
-    if ((PdhRemoveCounter(hCounter)) != ERROR_SUCCESS) {
-        PyErr_Format(PyExc_RuntimeError, "PdhRemoveCounter failed");
-        return NULL;
-    }
-
-    if ((PdhCloseQuery(hQuery)) != ERROR_SUCCESS) {
-        PyErr_Format(PyExc_RuntimeError, "PdhCloseQuery failed");
-        return NULL;
-    }
+    PdhCloseQuery(hQuery);
 
     return Py_BuildValue("d", percentUsage);
 }