Change lttng API to use a lttng_handle

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

diff --git a/lttng/commands/disable_channels.c b/lttng/commands/disable_channels.c
index ad2f0bf0829d26d7420b19f99bcc862c3ad895f9..9a816e3efb0bc652663492d224d038dc05dba253 100644 (file)
--- a/lttng/commands/disable_channels.c
+++ b/lttng/commands/disable_channels.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,12 +25,13 @@
 #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_channels;
 static char *opt_kernel;
+static char *opt_session_name;
 static int opt_pid_all;
 static int opt_userspace;
 static pid_t opt_pid;
@@ -40,9 +41,12 @@ 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},
+       {"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
        {"userspace",      'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
        {"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
@@ -58,6 +62,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "usage: lttng disable-channel 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, "  -k, --kernel          Apply for the kernel tracer\n");
        fprintf(ofp, "  -u, --userspace       Apply for the user-space tracer\n");
        fprintf(ofp, "      --all             If -u, apply on all traceable apps\n");
@@ -66,17 +71,21 @@ static void usage(FILE *ofp)
 }
 
 /*
- *  disable_channels
- *
- *  Disabling channel using the lttng API.
+ * Disabling channel using the lttng API.
  */
-static int disable_channels(void)
+static int disable_channels(char *session_name)
 {
        int ret = CMD_SUCCESS;
        char *channel_name;
+       struct lttng_domain dom;
 
-       if (set_session_name() < 0) {
-               ret = CMD_ERROR;
+       if (opt_kernel) {
+               dom.type = LTTNG_DOMAIN_KERNEL;
+       }
+
+       handle = lttng_create_handle(session_name, &dom);
+       if (handle == NULL) {
+               ret = -1;
                goto error;
        }
 
@@ -86,7 +95,7 @@ static int disable_channels(void)
                /* Kernel tracer action */
                if (opt_kernel) {
                        DBG("Disabling kernel channel %s", channel_name);
-                       ret = lttng_kernel_disable_channel(channel_name);
+                       ret = lttng_disable_channel(handle, channel_name);
                        if (ret < 0) {
                                goto error;
                        } else {
@@ -102,7 +111,7 @@ static int disable_channels(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;
                }
 
@@ -111,6 +120,8 @@ static int disable_channels(void)
        }
 
 error:
+       lttng_destroy_handle(handle);
+
        return ret;
 }
 
@@ -123,6 +134,7 @@ int cmd_disable_channels(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);
@@ -151,7 +163,17 @@ int cmd_disable_channels(int argc, const char **argv)
                goto end;
        }
 
-       ret = disable_channels();
+       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_channels(session_name);
 
 end:
        return ret;