lttng UI: read opt_cmd_name opt arg for each command

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

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index 04a8c0a62f97ad1afaa7ad0e263eac8916586b94..09b61cbe25da6f55bb4bed2751bc9befec57bad3 100644 (file)
--- a/lttng/commands/disable_events.c
+++ b/lttng/commands/disable_events.c
@@ -3,8 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,17 +25,17 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "cmd.h"
-#include "conf.h"
-#include "utils.h"
+#include "../cmd.h"
+#include "../conf.h"
+#include "../utils.h"
 
 static char *opt_event_list;
 static char *opt_kernel;
-static char *opt_cmd_name;
 static char *opt_channel_name;
 static char *opt_session_name;
 static int opt_pid_all;
 static int opt_userspace;
+static char *opt_cmd_name;
 static int opt_disable_all;
 static pid_t opt_pid;
 
@@ -44,6 +44,8 @@ enum {
        OPT_USERSPACE,
 };
 
+static struct lttng_handle *handle;
+
 static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
        {"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
@@ -80,16 +82,11 @@ static void usage(FILE *ofp)
  *
  *  Disabling event using the lttng API.
  */
-static int disable_events(void)
+static int disable_events(char *session_name)
 {
        int err, ret = CMD_SUCCESS;
-       char *event_name, *channel_name;
-       struct lttng_event ev;
-
-       if (set_session_name(opt_session_name) < 0) {
-               ret = CMD_ERROR;
-               goto error;
-       }
+       char *event_name, *channel_name = NULL;
+       struct lttng_domain dom;
 
        if (opt_channel_name == NULL) {
                err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
@@ -101,9 +98,19 @@ static int disable_events(void)
                channel_name = opt_channel_name;
        }
 
+       if (opt_kernel) {
+               dom.type = LTTNG_DOMAIN_KERNEL;
+       }
+
+       handle = lttng_create_handle(session_name, &dom);
+       if (handle == NULL) {
+               ret = -1;
+               goto error;
+       }
+
        if (opt_disable_all) {
                if (opt_kernel) {
-                       ret = lttng_kernel_disable_event(NULL, channel_name);
+                       ret = lttng_disable_event(handle, NULL, channel_name);
                        goto error;
                }
 
@@ -118,9 +125,7 @@ static int disable_events(void)
                        DBG("Disabling kernel event %s for channel %s",
                                        event_name, channel_name);
 
-                       /* Copy name and type of the event */
-                       strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
-                       ret = lttng_kernel_disable_event(event_name, channel_name);
+                       ret = lttng_disable_event(handle, event_name, channel_name);
                        if (ret < 0) {
                                MSG("Unable to disable event %s for channel %s",
                                                event_name, channel_name);
@@ -138,7 +143,7 @@ static int disable_events(void)
                        ret = CMD_NOT_IMPLEMENTED;
                        goto error;
                } else {
-                       ERR("Please specify a tracer (kernel or user-space)");
+                       ERR("Please specify a tracer (--kernel or --userspace)");
                        goto error;
                }
 
@@ -147,6 +152,11 @@ static int disable_events(void)
        }
 
 error:
+       if (opt_channel_name == NULL) {
+               free(channel_name);
+       }
+       lttng_destroy_handle(handle);
+
        return ret;
 }
 
@@ -159,6 +169,7 @@ int cmd_disable_events(int argc, const char **argv)
 {
        int opt, ret;
        static poptContext pc;
+       char *session_name = NULL;
 
        pc = poptGetContext(NULL, argc, argv, long_options, 0);
        poptReadDefaultConfig(pc, 0);
@@ -188,7 +199,17 @@ int cmd_disable_events(int argc, const char **argv)
                goto end;
        }
 
-       ret = disable_events();
+       if (!opt_session_name) {
+               session_name = get_session_name();
+               if (session_name == NULL) {
+                       ret = -1;
+                       goto end;
+               }
+       } else {
+               session_name = opt_session_name;
+       }
+
+       ret = disable_events(session_name);
 
 end:
        return ret;