Fix wording in lttng cli usage

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

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 0fa3e916c835b48e2d9228ac8c86ee1e0e4a5dcf..449f20f47f8616ecc468d3332f0de3e9e2a3f396 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -102,17 +102,17 @@ static void usage(FILE *ofp)
        fprintf(ofp, "\n");
        fprintf(ofp, "  -h, --help               Show this help\n");
        fprintf(ofp, "      --list-options       Simple listing of options\n");
-       fprintf(ofp, "  -s, --session            Apply on session name\n");
-       fprintf(ofp, "  -c, --channel            Apply on this channel\n");
+       fprintf(ofp, "  -s, --session            Apply to session name\n");
+       fprintf(ofp, "  -c, --channel            Apply to this channel\n");
        fprintf(ofp, "  -a, --all                Enable all tracepoints\n");
        fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
 #if 0
-       fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
+       fprintf(ofp, "  -u, --userspace [CMD]    Apply to the user-space tracer\n");
        fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
        fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
        fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
 #else
-       fprintf(ofp, "  -u, --userspace          Apply for the user-space tracer\n");
+       fprintf(ofp, "  -u, --userspace          Apply to the user-space tracer\n");
 #endif
        fprintf(ofp, "\n");
        fprintf(ofp, "Event options:\n");
@@ -214,27 +214,11 @@ end:
  */
 static int enable_events(char *session_name)
 {
-       int err, ret = CMD_SUCCESS;
+       int err, ret = CMD_SUCCESS, warn = 0;
        char *event_name, *channel_name = NULL;
        struct lttng_event ev;
        struct lttng_domain dom;
 
-       if (opt_channel_name == NULL) {
-               err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
-               if (err < 0) {
-                       ret = CMD_FATAL;
-                       goto error;
-               }
-       } else {
-               channel_name = opt_channel_name;
-       }
-
-       if (opt_kernel && opt_userspace) {
-               ERR("Can't use -k/--kernel and -u/--userspace together");
-               ret = CMD_FATAL;
-               goto error;
-       }
-
        /* Create lttng domain */
        if (opt_kernel) {
                dom.type = LTTNG_DOMAIN_KERNEL;
@@ -246,6 +230,16 @@ static int enable_events(char *session_name)
                goto error;
        }
 
+       if (opt_channel_name == NULL) {
+               err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
+               if (err < 0) {
+                       ret = CMD_FATAL;
+                       goto error;
+               }
+       } else {
+               channel_name = opt_channel_name;
+       }
+
        handle = lttng_create_handle(session_name, &dom);
        if (handle == NULL) {
                ret = -1;
@@ -254,7 +248,6 @@ static int enable_events(char *session_name)
 
        if (opt_enable_all) {
                /* Default setup for enable all */
-
                if (opt_kernel) {
                        ev.type = opt_event_type;
                        ev.name[0] = '\0';
@@ -341,7 +334,7 @@ static int enable_events(char *session_name)
                                goto error;
                        }
 
-                       if (opt_loglevel[0] != '\0') {
+                       if (opt_loglevel) {
                                MSG("Kernel loglevels are not supported.");
                                ret = CMD_UNDEFINED;
                                goto error;
@@ -376,20 +369,29 @@ static int enable_events(char *session_name)
                        case LTTNG_EVENT_FUNCTION_ENTRY:
                        case LTTNG_EVENT_SYSCALL:
                        default:
+                               ERR("Event type not available for user-space tracing");
                                ret = CMD_UNDEFINED;
                                goto error;
                        }
 
                        ev.loglevel_type = opt_loglevel_type;
-                       strncpy(ev.loglevel, opt_loglevel, LTTNG_SYMBOL_NAME_LEN);
-                       ev.loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+                       if (opt_loglevel) {
+                               strncpy(ev.loglevel, opt_loglevel, LTTNG_SYMBOL_NAME_LEN);
+                               ev.loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+                       } else {
+                               ev.loglevel[0] = '\0';
+                       }
                } else {
                        ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                        goto error;
                }
 
                ret = lttng_enable_event(handle, &ev, channel_name);
-               if (ret == 0) {
+               if (ret < 0) {
+                       ERR("Event %s: %s (channel %s, session %s)", event_name,
+                                       lttng_strerror(ret), channel_name, session_name);
+                       warn = 1;
+               } else {
                        MSG("%s event %s created in channel %s",
                                        opt_kernel ? "kernel": "UST", event_name, channel_name);
                }
@@ -400,6 +402,9 @@ static int enable_events(char *session_name)
 
 end:
 error:
+       if (warn) {
+               ret = CMD_WARNING;
+       }
        if (opt_channel_name == NULL) {
                free(channel_name);
        }
@@ -413,7 +418,7 @@ error:
  */
 int cmd_enable_events(int argc, const char **argv)
 {
-       int opt, ret;
+       int opt, ret = CMD_SUCCESS;
        static poptContext pc;
        char *session_name = NULL;
 
@@ -426,8 +431,7 @@ int cmd_enable_events(int argc, const char **argv)
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
-                       usage(stderr);
-                       ret = CMD_SUCCESS;
+                       usage(stdout);
                        goto end;
                case OPT_TRACEPOINT:
                        opt_event_type = LTTNG_EVENT_TRACEPOINT;
@@ -457,7 +461,6 @@ int cmd_enable_events(int argc, const char **argv)
                        break;
                case OPT_LIST_OPTIONS:
                        list_cmd_options(stdout, long_options);
-                       ret = CMD_SUCCESS;
                        goto end;
                default:
                        usage(stderr);
@@ -470,14 +473,14 @@ int cmd_enable_events(int argc, const char **argv)
        if (opt_event_list == NULL && opt_enable_all == 0) {
                ERR("Missing event name(s).\n");
                usage(stderr);
-               ret = CMD_SUCCESS;
+               ret = CMD_ERROR;
                goto end;
        }
 
        if (!opt_session_name) {
                session_name = get_session_name();
                if (session_name == NULL) {
-                       ret = -1;
+                       ret = CMD_ERROR;
                        goto end;
                }
        } else {
@@ -491,5 +494,6 @@ end:
                free(session_name);
        }
 
+       poptFreeContext(pc);
        return ret;
 }