From: Nevenchanniy Aleksandr <anevenchannyy@gmail.com>
Date: Wed, 17 May 2017 14:50:03 +0000 (+0300)
Subject: [lxc-top] Fix memory+swap output in batch mode
X-Git-Tag: lxc-2.1.0~123^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1569%2Fhead;p=thirdparty%2Flxc.git

[lxc-top] Fix memory+swap output in batch mode

This is patch fix output of memory+swap in batch mode, that
was forgotten in 6b6e702ac83a2bc92959c0dcae5149762826ef30

Signed-off-by: Alexandr Nevenchanniy <a.nevenchannyy@gmail.com
---

diff --git a/src/lxc/tools/lxc_top.c b/src/lxc/tools/lxc_top.c
index 0a8ec36e6..a9e69d887 100644
--- a/src/lxc/tools/lxc_top.c
+++ b/src/lxc/tools/lxc_top.c
@@ -429,12 +429,12 @@ static void stats_print(const char *name, const struct stats *stats,
 		gettimeofday(&time_val, NULL);
 		time_ms = (unsigned long long) (time_val.tv_sec) * 1000 + (unsigned long long) (time_val.tv_usec) / 1000;
 		printf("%" PRIu64 ",%s,%" PRIu64 ",%" PRIu64 ",%" PRIu64
-		       ",%" PRIu64 ",%" PRIu64 ",%" PRIu64 ",%" PRIu64,
+		       ",%" PRIu64 ",%" PRIu64 ",%" PRIu64 ",%" PRIu64 ",%" PRIu64,
 		       (uint64_t)time_ms, name, (uint64_t)stats->cpu_use_nanos,
 		       (uint64_t)stats->cpu_use_sys,
 		       (uint64_t)stats->cpu_use_user, (uint64_t)stats->io_service_bytes.total,
 		       (uint64_t)stats->io_serviced.total, (uint64_t)stats->mem_used,
-		       (uint64_t)stats->kmem_used);
+		       (uint64_t)stats->memsw_used, (uint64_t)stats->kmem_used);
 	}
 
 }