X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=8705a4446ae7c446959e3dbc107245601d5c9e94;hb=c37a070063a35aab7f7441865decbee90921bf07;hp=418fccf7c9102387b0c7ede6a74c36ed6d569634;hpb=d113fbc8270a4c2089c6e1aa1f5f5c5bb3f4c9dd;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 418fccf7c..8705a4446 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -42,6 +42,12 @@ const char *indent4 = "    ";
 const char *indent6 = "      ";
 const char *indent8 = "        ";
 
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-list.1.h>
+;
+#endif
+
 enum {
 	OPT_HELP = 1,
 	OPT_USERSPACE,
@@ -645,7 +651,6 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 		if (cur_pid != fields[i].event.pid) {
 			if (pid_element_open) {
 				if (event_element_open) {
-
 					/* Close the previous field element and event. */
 					ret = mi_lttng_close_multi_element(writer, 2);
 					if (ret) {
@@ -1167,7 +1172,8 @@ error:
 static void print_channel(struct lttng_channel *channel)
 {
 	int ret;
-	uint64_t discarded_events, lost_packets;
+	uint64_t discarded_events, lost_packets, monitor_timer_interval;
+	int64_t blocking_timeout;
 
 	ret = lttng_channel_get_discarded_event_count(channel,
 			&discarded_events);
@@ -1183,16 +1189,32 @@ static void print_channel(struct lttng_channel *channel)
 		return;
 	}
 
+	ret = lttng_channel_get_monitor_timer_interval(channel,
+			&monitor_timer_interval);
+	if (ret) {
+		ERR("Failed to retrieve monitor interval of channel");
+		return;
+	}
+
+	ret = lttng_channel_get_blocking_timeout(channel,
+			&blocking_timeout);
+	if (ret) {
+		ERR("Failed to retrieve blocking timeout of channel");
+		return;
+	}
+
 	MSG("- %s:%s\n", channel->name, enabled_string(channel->enabled));
 
 	MSG("%sAttributes:", indent4);
 	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", indent6, channel->attr.switch_timer_interval);
-	MSG("%sread timer interval: %u", indent6, channel->attr.read_timer_interval);
+	MSG("%ssubbuffers size: %" PRIu64 " bytes", indent6, channel->attr.subbuf_size);
+	MSG("%snumber of subbuffers: %" PRIu64, indent6, channel->attr.num_subbuf);
+	MSG("%sswitch timer interval: %u µs", indent6, channel->attr.switch_timer_interval);
+	MSG("%sread timer interval: %u µs", indent6, channel->attr.read_timer_interval);
+	MSG("%smonitor timer interval: %" PRIu64 " µs", indent6, monitor_timer_interval);
+	MSG("%sblocking timeout: %" PRId64 " µs", indent6, blocking_timeout);
 	MSG("%strace file count: %" PRIu64, indent6, channel->attr.tracefile_count);
-	MSG("%strace file size (bytes): %" PRIu64, indent6, channel->attr.tracefile_size);
+	MSG("%strace file size: %" PRIu64 " bytes", indent6, channel->attr.tracefile_size);
 	MSG("%sdiscarded events: %" PRIu64, indent6, discarded_events);
 	MSG("%slost packets: %" PRIu64, indent6, lost_packets);
 	switch (channel->attr.output) {