Skip to content

L
lxc
Commit d52f2fd3 by Serge Hallyn Committed by Stéphane Graber
Options

lxc_info: flush stdout before calling routines which may fork

Otherwise both resulting takss will print what they had flushed when they exit. This fixes https://bugs.launchpad.net/bugs/1389244Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Tested-by: 's avatarTycho Andersen <tycho.andersen@canonical.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 4086cea5
Showing with 10 additions and 0 deletions
src/lxc/lxc_info.c
...@@ -169,6 +169,7 @@ static void print_net_stats(struct lxc_container *c) ...@@ -169,6 +169,7 @@ static void print_net_stats(struct lxc_container *c)
if (!ifname) if (!ifname)
return; return;
printf("%-15s %s\n", "Link:", ifname); printf("%-15s %s\n", "Link:", ifname);
fflush(stdout);
/* XXX: tx and rx are reversed from the host vs container /* XXX: tx and rx are reversed from the host vs container
* perspective, print them from the container perspective * perspective, print them from the container perspective
...@@ -179,6 +180,7 @@ static void print_net_stats(struct lxc_container *c) ...@@ -179,6 +180,7 @@ static void print_net_stats(struct lxc_container *c)
str_chomp(buf); str_chomp(buf);
rx_bytes = str_size_humanize(buf, sizeof(buf)); rx_bytes = str_size_humanize(buf, sizeof(buf));
printf("%-15s %s\n", " TX bytes:", buf); printf("%-15s %s\n", " TX bytes:", buf);
fflush(stdout);
} }
snprintf(path, sizeof(path), "/sys/class/net/%s/statistics/tx_bytes", ifname); snprintf(path, sizeof(path), "/sys/class/net/%s/statistics/tx_bytes", ifname);
...@@ -187,11 +189,13 @@ static void print_net_stats(struct lxc_container *c) ...@@ -187,11 +189,13 @@ static void print_net_stats(struct lxc_container *c)
str_chomp(buf); str_chomp(buf);
tx_bytes = str_size_humanize(buf, sizeof(buf)); tx_bytes = str_size_humanize(buf, sizeof(buf));
printf("%-15s %s\n", " RX bytes:", buf); printf("%-15s %s\n", " RX bytes:", buf);
fflush(stdout);
} }
sprintf(buf, "%llu", rx_bytes + tx_bytes); sprintf(buf, "%llu", rx_bytes + tx_bytes);
str_size_humanize(buf, sizeof(buf)); str_size_humanize(buf, sizeof(buf));
printf("%-15s %s\n", " Total bytes:", buf); printf("%-15s %s\n", " Total bytes:", buf);
fflush(stdout);
free(ifname); free(ifname);
} }
} }
...@@ -210,6 +214,7 @@ static void print_stats(struct lxc_container *c) ...@@ -210,6 +214,7 @@ static void print_stats(struct lxc_container *c)
} else { } else {
printf("%-15s %s\n", "CPU use:", buf); printf("%-15s %s\n", "CPU use:", buf);
} }
fflush(stdout);
} }
ret = c->get_cgroup_item(c, "blkio.throttle.io_service_bytes", buf, sizeof(buf)); ret = c->get_cgroup_item(c, "blkio.throttle.io_service_bytes", buf, sizeof(buf));
...@@ -229,6 +234,7 @@ static void print_stats(struct lxc_container *c) ...@@ -229,6 +234,7 @@ static void print_stats(struct lxc_container *c)
str_size_humanize(buf, sizeof(buf)); str_size_humanize(buf, sizeof(buf));
printf("%-15s %s\n", "BlkIO use:", buf); printf("%-15s %s\n", "BlkIO use:", buf);
} }
fflush(stdout);
} }
static const struct { static const struct {
...@@ -246,6 +252,7 @@ static void print_stats(struct lxc_container *c) ...@@ -246,6 +252,7 @@ static void print_stats(struct lxc_container *c)
str_chomp(buf); str_chomp(buf);
str_size_humanize(buf, sizeof(buf)); str_size_humanize(buf, sizeof(buf));
printf("%-15s %s\n", lxstat[i].name, buf); printf("%-15s %s\n", lxstat[i].name, buf);
fflush(stdout);
} }
} }
} }
...@@ -260,6 +267,7 @@ static void print_info_msg_int(const char *key, int value) ...@@ -260,6 +267,7 @@ static void print_info_msg_int(const char *key, int value)
else else
printf("%-15s %d\n", key, value); printf("%-15s %d\n", key, value);
} }
fflush(stdout);
} }
static void print_info_msg_str(const char *key, const char *value) static void print_info_msg_str(const char *key, const char *value)
...@@ -272,6 +280,7 @@ static void print_info_msg_str(const char *key, const char *value) ...@@ -272,6 +280,7 @@ static void print_info_msg_str(const char *key, const char *value)
else else
printf("%-15s %s\n", key, value); printf("%-15s %s\n", key, value);
} }
fflush(stdout);
} }
static int print_info(const char *name, const char *lxcpath) static int print_info(const char *name, const char *lxcpath)
...@@ -359,6 +368,7 @@ static int print_info(const char *name, const char *lxcpath) ...@@ -359,6 +368,7 @@ static int print_info(const char *name, const char *lxcpath)
} else { } else {
fprintf(stderr, "%s invalid\n", key[i]); fprintf(stderr, "%s invalid\n", key[i]);
} }
fflush(stdout);
} }
lxc_container_put(c); lxc_container_put(c);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment