lttng cli: Accept human readable sizes for --subbuf-size

[lttng-tools.git] / src / bin / lttng / commands / list.c

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 0554732c0ea60318d8b3811f21d45eb94b9bd92a..280f9ddf7368141b6fd3da8e735c082f9e4bf613 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -507,11 +507,15 @@ static void print_channel(struct lttng_channel *channel)
        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("%swrite mode: %s", indent6,
+                       channel->attr.overwrite == 0 ? "discard" : "overwrite");
+       MSG("%ssubbufers size: %" PRIu64 " bytes", 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("%sswitch timer interval: %u usec", indent6,
+                       channel->attr.switch_timer_interval);
+       MSG("%sread timer interval: %u usec", indent6,
+                       channel->attr.read_timer_interval);
        switch (channel->attr.output) {
                case LTTNG_EVENT_SPLICE:
                        MSG("%soutput: splice()", indent6);
@@ -815,6 +819,9 @@ int cmd_list(int argc, const char **argv)
                                        break;
                                case LTTNG_DOMAIN_UST:
                                        MSG("=== Domain: UST global ===\n");
+                                       MSG("Buffer type: %s\n",
+                                                       domains[i].buf_type ==
+                                                       LTTNG_BUFFER_PER_PID ? "per PID" : "per UID");
                                        break;
                                default:
                                        MSG("=== Domain: Unimplemented ===\n");