Use MEMORYSTATUSEX values for (never used) virtual memory stats

Signed-off-by: Daniel Widdis <[email protected]>
giampaolo · Oct 20, 2022 · 9140ee6 · 9140ee6
1 parent 5ca7449
commit 9140ee6
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
@@ -610,8 +610,15 @@ psutil_proc_memory_uss(PyObject *self, PyObject *args) {
  */
 static PyObject *
 psutil_virtual_mem(PyObject *self, PyObject *args) {
-    size_t totalPhys, availPhys, totalPageFile, availPageFile, pageSize;
+    size_t totalPhys, availPhys, totalPageFile, usedPageFile, pageSize;
     PERFORMANCE_INFORMATION perfInfo;
+    MEMORYSTATUSEX memInfo;
+    memInfo.dwLength = sizeof(MEMORYSTATUSEX);
+
+    if (! GlobalMemoryStatusEx(&memInfo)) {
+        PyErr_SetFromWindowsErr(0);
+        return NULL;
+    }
     if (! GetPerformanceInfo(&perfInfo, sizeof(PERFORMANCE_INFORMATION))) {
         PyErr_SetFromWindowsErr(0);
         return NULL;
@@ -620,25 +627,25 @@ psutil_virtual_mem(PyObject *self, PyObject *args) {
     totalPhys = perfInfo.PhysicalTotal * pageSize;
     availPhys = perfInfo.PhysicalAvailable * pageSize;
     totalPageFile = perfInfo.CommitLimit * pageSize;
-    availPageFile = totalPageFile - perfInfo.CommitTotal * pageSize;
+    usedPageFile = perfInfo.CommitTotal * pageSize;
     // PERFORMANCE_INFORMATION values are defined as SIZE_T which on 64bits
     // is an (unsigned long long) and on 32bits is an (unsigned int).
 #if defined(_WIN64)
     return Py_BuildValue("(LLLLLL)",
                          (unsigned long long) totalPhys,
                          (unsigned long long) availPhys,
                          (unsigned long long) totalPageFile,
-                         (unsigned long long) availPageFile,
-                         (unsigned long long) (totalPhys + totalPageFile),
-                         (unsigned long long) (availPhys + availPageFile));
+                         (unsigned long long) (totalPageFile - usedPageFile),
+                         memInfo.ullTotalVirtual,
+                         memInfo.ullAvailVirtual);
 #else
-    return Py_BuildValue("(IIIIII)",
+    return Py_BuildValue("(IIIILL)",
                          (unsigned int) totalPhys,
                          (unsigned int) availPhys,
                          (unsigned int) totalPageFile,
-                         (unsigned int) availPageFile,
-                         (unsigned int) (totalPhys + totalPageFile),
-                         (unsigned int) (availPhys + availPageFile));
+                         (unsigned int) (totalPageFile - usedPageFile),
+                         memInfo.ullTotalVirtual,
+                         memInfo.ullAvailVirtual);
 #endif
 }