Improve error handling of lttng cli

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

diff --git a/src/bin/lttng/commands/disable_events.c b/src/bin/lttng/commands/disable_events.c
index 4ddcf5431a374f8bc9dc0fbedaa70b28bb5d4532..1e5c40a5ff98807a47f330b5a48331ac920703a1 100644 (file)
--- a/src/bin/lttng/commands/disable_events.c
+++ b/src/bin/lttng/commands/disable_events.c
@@ -96,26 +96,10 @@ static void usage(FILE *ofp)
  */
 static int disable_events(char *session_name)
 {
  */
 static int disable_events(char *session_name)
 {

-       int err, ret = CMD_SUCCESS;
+       int err, ret = CMD_SUCCESS, warn = 0;

        char *event_name, *channel_name = NULL;
        struct lttng_domain dom;
 
        char *event_name, *channel_name = NULL;
        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;
        /* Create lttng domain */
        if (opt_kernel) {
                dom.type = LTTNG_DOMAIN_KERNEL;


@@ -127,6 +111,17 @@ static int disable_events(char *session_name)
                goto error;
        }
 
                goto error;
        }
 

+       /* Get channel name */
+       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;
        handle = lttng_create_handle(session_name, &dom);
        if (handle == NULL) {
                ret = -1;


@@ -136,6 +131,7 @@ static int disable_events(char *session_name)
        if (opt_disable_all) {
                ret = lttng_disable_event(handle, NULL, channel_name);
                if (ret < 0) {
        if (opt_disable_all) {
                ret = lttng_disable_event(handle, NULL, channel_name);
                if (ret < 0) {

+                       /* Don't set ret so lttng can interpret the sessiond error. */

                        goto error;
                }
 
                        goto error;
                }
 


@@ -147,42 +143,30 @@ static int disable_events(char *session_name)
        /* Strip event list */
        event_name = strtok(opt_event_list, ",");
        while (event_name != NULL) {
        /* Strip event list */
        event_name = strtok(opt_event_list, ",");
        while (event_name != NULL) {

-               /* Kernel tracer action */
-               if (opt_kernel) {
-                       DBG("Disabling kernel event %s in channel %s",
-                                       event_name, channel_name);
-               } else if (opt_userspace) {             /* User-space tracer action */
-#if 0
-                       if (opt_cmd_name != NULL || opt_pid) {
-                               MSG("Only supporting tracing all UST processes (-u) for now.");
-                               ret = CMD_UNDEFINED;
-                               goto error;
-                       }
-#endif
-                       DBG("Disabling UST event %s in channel %s",
-                                       event_name, channel_name);
-               } else {
-                       ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
-                       goto error;
-               }
+               DBG("Disabling event %s", event_name);

 
                ret = lttng_disable_event(handle, event_name, channel_name);
                if (ret < 0) {
 
                ret = lttng_disable_event(handle, event_name, channel_name);
                if (ret < 0) {

-                       MSG("Unable to disable %s event %s in channel %s",
-                                       opt_kernel ? "kernel" : "UST", event_name,
-                                       channel_name);
+                       ERR("Event %s: %s (channel %s, session %s)", event_name,
+                                       lttng_strerror(ret), channel_name, session_name);
+                       warn = 1;

                } else {
                } else {

-                       MSG("%s event %s disabled in channel %s",
-                                       opt_kernel ? "kernel" : "UST", event_name,
-                                       channel_name);
+                       MSG("%s event %s disabled in channel %s for session %s",
+                                       opt_kernel ? "kernel" : "UST", event_name, channel_name,
+                                       session_name);

                }
 
                /* Next event */
                event_name = strtok(NULL, ",");
        }
 
                }
 
                /* Next event */
                event_name = strtok(NULL, ",");
        }
 

+       ret = CMD_SUCCESS;
+

 end:
 error:
 end:
 error:

+       if (warn) {
+               ret = CMD_WARNING;
+       }

        if (opt_channel_name == NULL) {
                free(channel_name);
        }
        if (opt_channel_name == NULL) {
                free(channel_name);
        }