Fix: initialize the cur_event variable before using it

[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..418fccf7c9102387b0c7ede6a74c36ed6d569634 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -67,34 +67,6 @@ static struct poptOption long_options[] = {
        {0, 0, 0, 0, 0, 0, 0}
 };
 
-/*
- * usage
- */
-static void usage(FILE *ofp)
-{
-       fprintf(ofp, "usage: lttng list [OPTIONS] [SESSION [SESSION OPTIONS]]\n");
-       fprintf(ofp, "\n");
-       fprintf(ofp, "With no arguments, list available tracing session(s)\n");
-       fprintf(ofp, "\n");
-       fprintf(ofp, "Without a session, -k lists available kernel events\n");
-       fprintf(ofp, "Without a session, -u lists available userspace events\n");
-       fprintf(ofp, "\n");
-       fprintf(ofp, "  -h, --help              Show this help\n");
-       fprintf(ofp, "      --list-options      Simple listing of options\n");
-       fprintf(ofp, "  -k, --kernel            Select kernel domain\n");
-       fprintf(ofp, "  -u, --userspace         Select user-space domain.\n");
-       fprintf(ofp, "  -j, --jul               Apply for Java application using JUL\n");
-       fprintf(ofp, "  -l, --log4j             Apply for Java application using LOG4J\n");
-       fprintf(ofp, "  -p, --python            Apply for Python application using logging\n");
-       fprintf(ofp, "  -f, --fields            List event fields.\n");
-       fprintf(ofp, "      --syscall           List available system calls.\n");
-       fprintf(ofp, "\n");
-       fprintf(ofp, "Session Options:\n");
-       fprintf(ofp, "  -c, --channel NAME      List details of a channel\n");
-       fprintf(ofp, "  -d, --domain            List available domain(s)\n");
-       fprintf(ofp, "\n");
-}
-
 /*
  * Get command line from /proc for a specific pid.
  *
@@ -211,7 +183,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 +230,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 +250,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]");
@@ -352,10 +322,11 @@ static void print_events(struct lttng_event *event)
                MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
                break;
        case LTTNG_EVENT_SYSCALL:
-               MSG("%s%s%s%s%s", indent6, event->name,
+               MSG("%s%s%s%s%s%s", indent6, event->name,
                                (opt_syscall ? "" : " (type:syscall)"),
                                enabled_string(event->enabled),
-                               bitness_event(event->flags));
+                               bitness_event(event->flags),
+                               safe_string(filter_msg));
                break;
        case LTTNG_EVENT_NOOP:
                MSG("%s (type: noop)%s%s", indent6,
@@ -650,6 +621,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
        int event_element_open = 0;
        struct lttng_event cur_event;
 
+       memset(&cur_event, 0, sizeof(cur_event));
+
        /* Open domains element */
        ret = mi_lttng_domains_open(writer);
        if (ret) {
@@ -1074,7 +1047,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 +1058,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 +1166,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 +1193,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);
@@ -1707,7 +1700,6 @@ int cmd_list(int argc, const char **argv)
        memset(&domain, 0, sizeof(domain));
 
        if (argc < 1) {
-               usage(stderr);
                ret = CMD_ERROR;
                goto end;
        }
@@ -1718,7 +1710,7 @@ int cmd_list(int argc, const char **argv)
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
-                       usage(stdout);
+                       SHOW_HELP();
                        goto end;
                case OPT_USERSPACE:
                        opt_userspace = 1;
@@ -1727,7 +1719,6 @@ int cmd_list(int argc, const char **argv)
                        list_cmd_options(stdout, long_options);
                        goto end;
                default:
-                       usage(stderr);
                        ret = CMD_UNDEFINED;
                        goto end;
                }