From: Eva Charlotte Mayer <eva-charlotte.mayer@posteo.de>
Date: Wed, 23 Dec 2015 12:15:26 +0000 (+0100)
Subject: Fix swap calculation
X-Git-Tag: lxc-2.0.0.beta2~93^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F738%2Fhead;p=thirdparty%2Flxc.git

Fix swap calculation

Signed-off-by: Eva Charlotte Mayer <eva-charlotte.mayer@posteo.de>
---

diff --git a/src/lxc/lxc-ls.in b/src/lxc/lxc-ls.in
index 25a3926cc..dc2b2ba8d 100755
--- a/src/lxc/lxc-ls.in
+++ b/src/lxc/lxc-ls.in
@@ -311,8 +311,10 @@ def get_containers(fd=None, base="/", root=False):
                         memory_ram = 0
 
                     try:
-                        memory_swap = int(container.get_cgroup_item(
-                            "memory.memsw.usage_in_bytes")) - memory_ram
+                        memory_stat = container.get_cgroup_item("memory.stat")
+                        beg = memory_stat.find("\nswap ") + 6
+                        end = memory_stat[beg:].find("\n") + len(memory_stat[:beg])
+                        memory_swap = int(memory_stat[beg:end])
                     except:
                         memory_swap = 0
                 else: