#1222: [Linux] Process.memory_full_info() was summing both 'swap PSS'…

… (swap proportional set size) and plain 'swap'. Not anymore.
giampaolo · Mar 13, 2018 · d67e977 · d67e977
1 parent a160034
commit d67e977
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -14,6 +14,8 @@ XXXX-XX-XX
 **Bug fixes**
 
 - 1216_: fix compatibility with python 2.6 on Windows (patch by Dan Vinakovsky)
+- 1222_: [Linux] Process.memory_full_info() was summing both "swap PSS" (swap
+  proportional set size) and plain "swap". Not anymore.
 - 1240_: [Windows] cpu_times() float loses accuracy in a long running system.
   (patch by stswandering)
 - 1245_: [Linux] sensors_temperatures() may fail with IOError "no such file".

diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
@@ -1608,7 +1608,7 @@ def memory_full_info(
                 self,
                 _private_re=re.compile(br"Private.*:\s+(\d+)"),
                 _pss_re=re.compile(br"Pss.*:\s+(\d+)"),
-                _swap_re=re.compile(br"Swap.*:\s+(\d+)")):
+                _swap_re=re.compile(br"Swap:\s+(\d+)")):
             basic_mem = self.memory_info()
             # Note: using 3 regexes is faster than reading the file
             # line by line.