proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-07 16:59:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #738 from ec-m/ec-m_lxc-ls

Browse Source 
Fix swap calculation (#737)
This commit is contained in:
Serge Hallyn 2015-12-23 14:36:23 -08:00
commit 364d54c9f0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/lxc-ls.in
View File

@ -311,8 +311,10 @@ def get_containers(fd=None, base="/", root=False):
memory_ram = 0 memory_ram = 0
try: try:
memory_swap = int(container.get_cgroup_item( memory_stat = container.get_cgroup_item("memory.stat")
"memory.memsw.usage_in_bytes")) - memory_ram beg = memory_stat.find("\nswap ") + 6
end = memory_stat[beg:].find("\n") + len(memory_stat[:beg])
memory_swap = int(memory_stat[beg:end])
except: except:
memory_swap = 0 memory_swap = 0
else: else: