Improve add-context command

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

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index 5bfe5d55bed891dd143280bb3d64a69374da3065..952b2b65c7a9ae82b57c2ca9e1b695abec7d4e5e 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,14 +25,15 @@
 #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 int opt_disable_all;
@@ -46,6 +47,7 @@ enum {
 static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
        {"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+       {"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
        {"all-events",     'a', POPT_ARG_VAL, &opt_disable_all, 1, 0, 0},
        {"channel",        'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
@@ -63,6 +65,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "usage: lttng disable-event NAME[,NAME2,...] [options]\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "  -h, --help               Show this help\n");
+       fprintf(ofp, "  -s, --session            Apply on session name\n");
        fprintf(ofp, "  -c, --channel            Apply on this channel\n");
        fprintf(ofp, "  -a, --all-events         Enable all tracepoints\n");
        fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
@@ -80,10 +83,11 @@ static void usage(FILE *ofp)
 static int disable_events(void)
 {
        int err, ret = CMD_SUCCESS;
-       char *event_name, *channel_name;
+       char *event_name, *channel_name = NULL;
        struct lttng_event ev;
+       struct lttng_domain dom;
 
-       if (set_session_name() < 0) {
+       if (set_session_name(opt_session_name) < 0) {
                ret = CMD_ERROR;
                goto error;
        }
@@ -98,9 +102,13 @@ static int disable_events(void)
                channel_name = opt_channel_name;
        }
 
+       if (opt_kernel) {
+               dom.type = LTTNG_DOMAIN_KERNEL;
+       }
+
        if (opt_disable_all) {
                if (opt_kernel) {
-                       ret = lttng_kernel_disable_event(NULL, channel_name);
+                       ret = lttng_disable_event(&dom, NULL, channel_name);
                        goto error;
                }
 
@@ -117,7 +125,7 @@ static int disable_events(void)
 
                        /* 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(&dom, event_name, channel_name);
                        if (ret < 0) {
                                MSG("Unable to disable event %s for channel %s",
                                                event_name, channel_name);
@@ -144,6 +152,9 @@ static int disable_events(void)
        }
 
 error:
+       if (opt_channel_name == NULL) {
+               free(channel_name);
+       }
        return ret;
 }