Add live timer and tracefile count/size to list

[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 66a322a06adb650b2a593c9147a7d9ed556bf8ba..08518dc0ca26ba0436a970c58ac38ce39b768341 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -217,6 +217,20 @@ static const char *loglevel_string(int value)
        }
 }
 
+static const char *logleveltype_string(enum lttng_loglevel_type value)
+{
+       switch (value) {
+       case LTTNG_EVENT_LOGLEVEL_ALL:
+               return ":";
+       case LTTNG_EVENT_LOGLEVEL_RANGE:
+               return " <=";
+       case LTTNG_EVENT_LOGLEVEL_SINGLE:
+               return " ==";
+       default:
+               return " <<TYPE UNKN>>";
+       }
+}
+
 /*
  * Pretty print single event.
  */
@@ -226,9 +240,10 @@ static void print_events(struct lttng_event *event)
        case LTTNG_EVENT_TRACEPOINT:
        {
                if (event->loglevel != -1) {
-                       MSG("%s%s (loglevel: %s (%d)) (type: tracepoint)%s%s%s",
+                       MSG("%s%s (loglevel%s %s (%d)) (type: tracepoint)%s%s%s",
                                indent6,
                                event->name,
+                               logleveltype_string(event->loglevel_type),
                                loglevel_string(event->loglevel),
                                event->loglevel,
                                enabled_string(event->enabled),
@@ -630,6 +645,8 @@ static void print_channel(struct lttng_channel *channel)
        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("%strace file count: %" PRIu64, indent6, channel->attr.tracefile_count);
+       MSG("%strace file size (bytes): %" PRIu64, indent6, channel->attr.tracefile_size);
        switch (channel->attr.output) {
                case LTTNG_EVENT_SPLICE:
                        MSG("%soutput: splice()", indent6);
@@ -741,7 +758,9 @@ static int list_sessions(const char *session_name)
                                MSG("Tracing session %s: [%s%s]", session_name,
                                                active_string(sessions[i].enabled),
                                                snapshot_string(sessions[i].snapshot_mode));
-                               MSG("%sTrace path: %s\n", indent4, sessions[i].path);
+                               MSG("%sTrace path: %s", indent4, sessions[i].path);
+                               MSG("%sLive timer interval (usec): %u\n", indent4,
+                                               sessions[i].live_timer_interval);
                                break;
                        }
                } else {