Rename filter string to filter expression in liblttng-ctl

[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 bcada31cd38625b47322d665c9ebbf7ff27a2b8f..1cce29b71d9d0919c7dd9b0342c65f0622f9a528 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -211,7 +211,6 @@ static char *get_exclusion_names_msg(struct lttng_event *event)
        int exclusion_count;
        char *exclusion_msg = NULL;
        char *at;
-       int count;
        size_t i;
        const char * const exclusion_fmt = " [exclusions: ";
        const size_t exclusion_fmt_len = strlen(exclusion_fmt);
@@ -259,8 +258,7 @@ static char *get_exclusion_names_msg(struct lttng_event *event)
                }
 
                /* Append exclusion name */
-               count = sprintf(at, "%s", name);
-               at += count;
+               at += sprintf(at, "%s", name);
        }
 
        /* This also puts a final '\0' at the end of exclusion_msg */
@@ -280,7 +278,7 @@ static void print_events(struct lttng_event *event)
        char *filter_msg = NULL;
        char *exclusion_msg = NULL;
 
-       ret = lttng_event_get_filter_string(event, &filter_str);
+       ret = lttng_event_get_filter_expression(event, &filter_str);
 
        if (ret) {
                filter_msg = strdup(" [failed to retrieve filter]");
@@ -1074,7 +1072,8 @@ static int list_session_agent_events(void)
                        char *filter_msg = NULL;
                        struct lttng_event *event = &events[i];
 
-                       ret = lttng_event_get_filter_string(event, &filter_str);
+                       ret = lttng_event_get_filter_expression(event,
+                                       &filter_str);
                        if (ret) {
                                filter_msg = strdup(" [failed to retrieve filter]");
                        } else if (filter_str) {
@@ -1084,8 +1083,8 @@ static int list_session_agent_events(void)
                                filter_msg = malloc(strlen(filter_str) +
                                                strlen(filter_fmt) + 1);
                                if (filter_msg) {
-                                       sprintf(filter_msg, " [filter: '%s']",
-                                               filter_str);
+                                       sprintf(filter_msg, filter_fmt,
+                                                       filter_str);
                                }
                        }
 
@@ -1192,6 +1191,23 @@ error:
  */
 static void print_channel(struct lttng_channel *channel)
 {
+       int ret;
+       uint64_t discarded_events, lost_packets;
+
+       ret = lttng_channel_get_discarded_event_count(channel,
+                       &discarded_events);
+       if (ret) {
+               ERR("Failed to retrieve discarded event count of channel");
+               return;
+       }
+
+       ret = lttng_channel_get_lost_packet_count(channel,
+                       &lost_packets);
+       if (ret) {
+               ERR("Failed to retrieve lost packet count of channel");
+               return;
+       }
+
        MSG("- %s:%s\n", channel->name, enabled_string(channel->enabled));
 
        MSG("%sAttributes:", indent4);
@@ -1202,6 +1218,8 @@ static void print_channel(struct lttng_channel *channel)
        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);
+       MSG("%sdiscarded events: %" PRIu64, indent6, discarded_events);
+       MSG("%slost packets: %" PRIu64, indent6, lost_packets);
        switch (channel->attr.output) {
                case LTTNG_EVENT_SPLICE:
                        MSG("%soutput: splice()", indent6);