Move psutil_percent_swap to mem.c

Signed-off-by: Daniel Widdis <[email protected]>
giampaolo · Apr 12, 2023 · e3ce8a3 · e3ce8a3
1 parent aa910e2
commit e3ce8a3
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 54 deletions.
diff --git a/psutil/arch/windows/mem.c b/psutil/arch/windows/mem.c
@@ -7,6 +7,7 @@
 #include <Python.h>
 #include <windows.h>
 #include <Psapi.h>
+#include <pdh.h>
 
 #include "../../_psutil_common.h"
 
@@ -41,3 +42,52 @@ psutil_virtual_mem(PyObject *self, PyObject *args) {
         totalSys,
         availSys);
 }
+
+/*
+ * Return a Python float representing the percent usage of all paging files on
+ * the system.
+ */
+PyObject *
+psutil_swap_percent(PyObject *self, PyObject *args) {
+    WCHAR *szCounterPath = L"\\Paging File(_Total)\\% Usage";
+    PDH_STATUS s;
+    HQUERY hQuery;
+    HCOUNTER hCounter;
+    PDH_FMT_COUNTERVALUE counterValue;
+    double percentUsage;
+
+    if ((PdhOpenQueryW(NULL, 0, &hQuery)) != ERROR_SUCCESS) {
+        PyErr_Format(PyExc_RuntimeError, "PdhOpenQueryW failed");
+        return NULL;
+    }
+
+    s = PdhAddEnglishCounterW(hQuery, szCounterPath, 0, &hCounter);
+    if (s != ERROR_SUCCESS) {
+        PdhCloseQuery(hQuery);
+        PyErr_Format(
+            PyExc_RuntimeError,
+            "PdhAddEnglishCounterW failed. Performance counters may be disabled."
+        );
+        return NULL;
+    }
+
+    s = PdhCollectQueryData(hQuery);
+    if (s != ERROR_SUCCESS) {
+        // 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;
+        }
+    }
+
+    PdhRemoveCounter(hCounter);
+
+    PdhCloseQuery(hQuery);
+
+    return Py_BuildValue("d", percentUsage);
+}
diff --git a/psutil/arch/windows/mem.h b/psutil/arch/windows/mem.h
@@ -8,3 +8,4 @@
 
 PyObject *psutil_getpagesize(PyObject *self, PyObject *args);
 PyObject *psutil_virtual_mem(PyObject *self, PyObject *args);
+PyObject *psutil_swap_percent(PyObject *self, PyObject *args);
diff --git a/psutil/arch/windows/wmi.c b/psutil/arch/windows/wmi.c
@@ -121,56 +121,3 @@ PyObject *
 psutil_get_loadavg(PyObject *self, PyObject *args) {
     return Py_BuildValue("(ddd)", load_avg_1m, load_avg_5m, load_avg_15m);
 }
-
-/*
- * Percent swap implementation using "\Paging File(_Total)\% Usage" counter
- */
-
-/*
- * Return a Python float representing the percent usage of all paging files on
- * the system.
- */
-PyObject *
-psutil_swap_percent(PyObject *self, PyObject *args) {
-    WCHAR *szCounterPath = L"\\Paging File(_Total)\\% Usage";
-    PDH_STATUS s;
-    HQUERY hQuery;
-    HCOUNTER hCounter;
-    PDH_FMT_COUNTERVALUE counterValue;
-    double percentUsage;
-
-    if ((PdhOpenQueryW(NULL, 0, &hQuery)) != ERROR_SUCCESS) {
-        PyErr_Format(PyExc_RuntimeError, "PdhOpenQueryW failed");
-        return NULL;
-    }
-
-    s = PdhAddEnglishCounterW(hQuery, szCounterPath, 0, &hCounter);
-    if (s != ERROR_SUCCESS) {
-        PdhCloseQuery(hQuery);
-        PyErr_Format(
-            PyExc_RuntimeError,
-            "PdhAddEnglishCounterW failed. Performance counters may be disabled."
-        );
-        return NULL;
-    }
-
-    s = PdhCollectQueryData(hQuery);
-    if (s != ERROR_SUCCESS) {
-        // 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;
-        }
-    }
-
-    PdhRemoveCounter(hCounter);
-
-    PdhCloseQuery(hQuery);
-
-    return Py_BuildValue("d", percentUsage);
-}
diff --git a/psutil/arch/windows/wmi.h b/psutil/arch/windows/wmi.h
@@ -8,4 +8,3 @@
 
 PyObject* psutil_init_loadavg_counter();
 PyObject* psutil_get_loadavg();
-PyObject* psutil_swap_percent();