Fix swap calculation

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

Fix swap calculation
290ce5d5 · Eva Charlotte Mayer · Stéphane Graber · 37bb2dd9 · 290ce5d5
Commit 290ce5d5 authored Dec 23, 2015 by Eva Charlotte Mayer Committed by Stéphane Graber Nov 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lxc-ls.in src/lxc/lxc-ls.in +4 -2

No files found.
--- 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: