From a5bbe8f63443e9e2224ee77f531dbf9dbac074b9 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 4 Jun 2013 10:36:57 -0400 Subject: [PATCH] Revert "Improve channel listing output format" This changed the text output *after* rc1. We'll keep this in the back burner for 2.3. This reverts commit e78de861055e6288d11348866681d1373ed81aec. --- src/bin/lttng/commands/list.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c index 280f9ddf7..db993df75 100644 --- a/src/bin/lttng/commands/list.c +++ b/src/bin/lttng/commands/list.c @@ -507,15 +507,11 @@ static void print_channel(struct lttng_channel *channel) MSG("- %s:%s\n", channel->name, enabled_string(channel->enabled)); MSG("%sAttributes:", indent4); - MSG("%swrite mode: %s", indent6, - channel->attr.overwrite == 0 ? "discard" : "overwrite"); - MSG("%ssubbufers size: %" PRIu64 " bytes", indent6, - channel->attr.subbuf_size); + MSG("%soverwrite mode: %d", indent6, channel->attr.overwrite); + MSG("%ssubbufers size: %" PRIu64, indent6, channel->attr.subbuf_size); MSG("%snumber of subbufers: %" PRIu64, indent6, channel->attr.num_subbuf); - MSG("%sswitch timer interval: %u usec", indent6, - channel->attr.switch_timer_interval); - MSG("%sread timer interval: %u usec", indent6, - channel->attr.read_timer_interval); + MSG("%sswitch timer interval: %u", indent6, channel->attr.switch_timer_interval); + MSG("%sread timer interval: %u", indent6, channel->attr.read_timer_interval); switch (channel->attr.output) { case LTTNG_EVENT_SPLICE: MSG("%soutput: splice()", indent6); -- 2.34.1