Fix: add missing error output

[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 0467cc6ba32d6afc828bcaeec34e31c0b58ed416..e0ea6748f82a626e212f6decda5b3c0a5fcc776d 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -220,6 +220,17 @@ static void print_events(struct lttng_event *event)
                }
                break;
        }
+       case LTTNG_EVENT_FUNCTION:
+               MSG("%s%s (type: function)%s%s", indent6,
+                               event->name, enabled_string(event->enabled),
+                               filter_string(event->filter));
+               if (event->attr.probe.addr != 0) {
+                       MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
+               } else {
+                       MSG("%soffset: 0x%" PRIx64, indent8, event->attr.probe.offset);
+                       MSG("%ssymbol: %s", indent8, event->attr.probe.symbol_name);
+               }
+               break;
        case LTTNG_EVENT_PROBE:
                MSG("%s%s (type: probe)%s%s", indent6,
                                event->name, enabled_string(event->enabled),
@@ -231,7 +242,6 @@ static void print_events(struct lttng_event *event)
                        MSG("%ssymbol: %s", indent8, event->attr.probe.symbol_name);
                }
                break;
-       case LTTNG_EVENT_FUNCTION:
        case LTTNG_EVENT_FUNCTION_ENTRY:
                MSG("%s%s (type: function)%s%s", indent6,
                                event->name, enabled_string(event->enabled),
@@ -281,7 +291,7 @@ static void print_event_field(struct lttng_event_field *field)
                return;
        }
        MSG("%sfield: %s (%s)%s", indent8, field->field_name,
-               field_type(field), field->nowrite ? "" : " [no write]");
+               field_type(field), field->nowrite ? " [no write]" : "");
 }
 
 /*
@@ -308,7 +318,7 @@ static int list_ust_events(void)
 
        size = lttng_list_tracepoints(handle, &event_list);
        if (size < 0) {
-               ERR("Unable to list UST events");
+               ERR("Unable to list UST events: %s", lttng_strerror(size));
                lttng_destroy_handle(handle);
                return size;
        }
@@ -365,7 +375,7 @@ static int list_ust_event_fields(void)
 
        size = lttng_list_tracepoint_fields(handle, &event_field_list);
        if (size < 0) {
-               ERR("Unable to list UST event fields");
+               ERR("Unable to list UST event fields: %s", lttng_strerror(size));
                lttng_destroy_handle(handle);
                return size;
        }
@@ -424,7 +434,7 @@ static int list_kernel_events(void)
 
        size = lttng_list_tracepoints(handle, &event_list);
        if (size < 0) {
-               ERR("Unable to list kernel events");
+               ERR("Unable to list kernel events: %s", lttng_strerror(size));
                lttng_destroy_handle(handle);
                return size;
        }
@@ -458,6 +468,7 @@ static int list_events(const char *channel_name)
        count = lttng_list_events(handle, channel_name, &events);
        if (count < 0) {
                ret = count;
+               ERR("%s", lttng_strerror(ret));
                goto error;
        }
 
@@ -521,11 +532,18 @@ static int list_channels(const char *channel_name)
 
        count = lttng_list_channels(handle, &channels);
        if (count < 0) {
-               ret = count;
+               switch (-count) {
+               case LTTNG_ERR_KERN_CHAN_NOT_FOUND:
+                       ret = CMD_SUCCESS;
+                       WARN("No kernel channel");
+                       break;
+               default:
+                       /* We had a real error */
+                       ret = count;
+                       ERR("%s", lttng_strerror(ret));
+                       break;
+               }
                goto error_channels;
-       } else if (count == 0) {
-               ERR("Channel %s not found", channel_name);
-               goto error;
        }
 
        if (channel_name == NULL) {
@@ -545,7 +563,7 @@ static int list_channels(const char *channel_name)
                /* Listing events per channel */
                ret = list_events(channels[i].name);
                if (ret < 0) {
-                       MSG("%s", lttng_strerror(ret));
+                       ERR("%s", lttng_strerror(ret));
                }
 
                if (chan_found) {
@@ -582,6 +600,7 @@ static int list_sessions(const char *session_name)
        DBG("Session count %d", count);
        if (count < 0) {
                ret = count;
+               ERR("%s", lttng_strerror(ret));
                goto error;
        } else if (count == 0) {
                MSG("Currently no available tracing session");
@@ -643,6 +662,7 @@ static int list_domains(const char *session_name)
        count = lttng_list_domains(session_name, &domains);
        if (count < 0) {
                ret = count;
+               ERR("%s", lttng_strerror(ret));
                goto error;
        } else if (count == 0) {
                MSG("  None");
@@ -674,8 +694,7 @@ error:
  */
 int cmd_list(int argc, const char **argv)
 {
-       int opt, i, ret = CMD_SUCCESS;
-       int nb_domain;
+       int opt, ret = CMD_SUCCESS;
        const char *session_name;
        static poptContext pc;
        struct lttng_domain domain;
@@ -739,6 +758,7 @@ int cmd_list(int argc, const char **argv)
                if (opt_kernel) {
                        ret = list_kernel_events();
                        if (ret < 0) {
+                               ret = CMD_ERROR;
                                goto end;
                        }
                }
@@ -749,6 +769,7 @@ int cmd_list(int argc, const char **argv)
                                ret = list_ust_events();
                        }
                        if (ret < 0) {
+                               ret = CMD_ERROR;
                                goto end;
                        }
                }
@@ -772,10 +793,13 @@ int cmd_list(int argc, const char **argv)
                                goto end;
                        }
                } else {
+                       int i, nb_domain;
+
                        /* We want all domain(s) */
                        nb_domain = lttng_list_domains(session_name, &domains);
                        if (nb_domain < 0) {
                                ret = nb_domain;
+                               ERR("%s", lttng_strerror(ret));
                                goto end;
                        }