From 290ce5d504dc441daf7ca31a805f720f05b04dba Mon Sep 17 00:00:00 2001 From: Eva Charlotte Mayer Date: Wed, 23 Dec 2015 13:15:26 +0100 Subject: [PATCH] Fix swap calculation Signed-off-by: Eva Charlotte Mayer --- src/lxc/lxc-ls.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc-ls.in b/src/lxc/lxc-ls.in index 0bab8dcaa..ac762caae 100755 --- a/src/lxc/lxc-ls.in +++ b/src/lxc/lxc-ls.in @@ -284,8 +284,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: -- 2.47.2