File mem-used-bsc1181475.patch of Package saltbundlepy-psutil

Overview Repositories Revisions Requests Users Attributes Meta

File mem-used-bsc1181475.patch of Package saltbundlepy-psutil (Revision 1211571137f6ae3ebf2bd5dbeea2d133)

Currently displaying revision 1211571137f6ae3ebf2bd5dbeea2d133 , Show latest

---
 psutil/_pslinux.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: psutil-5.9.5/psutil/_pslinux.py
===================================================================
--- psutil-5.9.5.orig/psutil/_pslinux.py
+++ psutil-5.9.5/psutil/_pslinux.py
@@ -474,12 +474,6 @@ def virtual_memory():
     except KeyError:
         slab = 0
 
-    used = total - free - cached - buffers
-    if used < 0:
-        # May be symptomatic of running within a LCX container where such
-        # values will be dramatically distorted over those of the host.
-        used = total - free
-
     # - starting from 4.4.0 we match free's "available" column.
     #   Before 4.4.0 we calculated it as (free + buffers + cached)
     #   which matched htop.
@@ -510,6 +504,12 @@ def virtual_memory():
         #     24fd2605c51fccc375ab0287cec33aa767f06718/proc/sysinfo.c#L764
         avail = free
 
+    used = total - avail
+    if used < 0:
+        # May be symptomatic of running within a LCX container where such
+        # values will be dramatically distorted over those of the host.
+        used = total - free
+
     percent = usage_percent((total - avail), total, round_=1)
 
     # Warn about missing metrics which are set to 0.

Places

File mem-used-bsc1181475.patch of Package saltbundlepy-psutil (Revision 1211571137f6ae3ebf2bd5dbeea2d133)

Places