From 62e55253348f999a97d323a3b1503478c4f3ff51 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 11 Sep 2014 14:26:10 -0400 Subject: [PATCH] Remove enable/disable consumer obsolete command They've been obsolete for quite some time now so just remove any reference and file to get rid of it. Signed-off-by: David Goulet --- src/bin/lttng/Makefile.am | 1 - src/bin/lttng/commands/create.c | 10 ------ src/bin/lttng/commands/disable_consumer.c | 44 ----------------------- src/bin/lttng/commands/enable_consumer.c | 44 ----------------------- src/bin/lttng/lttng.c | 2 -- 5 files changed, 101 deletions(-) delete mode 100644 src/bin/lttng/commands/disable_consumer.c delete mode 100644 src/bin/lttng/commands/enable_consumer.c diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am index 5a1eb6aed..ec04e4d7b 100644 --- a/src/bin/lttng/Makefile.am +++ b/src/bin/lttng/Makefile.am @@ -12,7 +12,6 @@ lttng_SOURCES = command.h conf.c conf.h commands/start.c \ commands/disable_channels.c commands/add_context.c \ commands/set_session.c commands/version.c \ commands/calibrate.c commands/view.c \ - commands/enable_consumer.c commands/disable_consumer.c \ commands/snapshot.c \ commands/save.c \ commands/load.c \ diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index acc705b81..4f97c8648 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -47,7 +47,6 @@ static int opt_no_consumer; static int opt_no_output; static int opt_snapshot; static unsigned int opt_live_timer; -static int opt_disable_consumer; enum { OPT_HELP = 1, @@ -67,7 +66,6 @@ static struct poptOption long_options[] = { {"data-url", 'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0}, {"no-output", 0, POPT_ARG_VAL, &opt_no_output, 1, 0, 0}, {"no-consumer", 0, POPT_ARG_VAL, &opt_no_consumer, 1, 0, 0}, - {"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0}, {"snapshot", 0, POPT_ARG_VAL, &opt_snapshot, 1, 0, 0}, {"live", 0, POPT_ARG_INT | POPT_ARGFLAG_OPTIONAL, 0, OPT_LIVE_TIMER, 0, 0}, {0, 0, 0, 0, 0, 0, 0} @@ -115,7 +113,6 @@ static void usage(FILE *ofp) fprintf(ofp, " -U, --set-url=URL Set URL destination of the trace data.\n"); fprintf(ofp, " It is persistent for the session lifetime.\n"); fprintf(ofp, " This will set both data and control URL.\n"); - fprintf(ofp, " You can change it with the enable-consumer cmd\n"); fprintf(ofp, " -C, --ctrl-url=URL Set control path URL. (Must use -D also)\n"); fprintf(ofp, " -D, --data-url=URL Set data path URL. (Must use -C also)\n"); fprintf(ofp, "\n"); @@ -585,13 +582,6 @@ int cmd_create(int argc, const char **argv) goto end; } - if (opt_disable_consumer) { - MSG("The option --disable-consumer is obsolete."); - ret = CMD_WARNING; - goto end; - } - - /* MI initialization */ if (lttng_opt_mi) { writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi); diff --git a/src/bin/lttng/commands/disable_consumer.c b/src/bin/lttng/commands/disable_consumer.c deleted file mode 100644 index 4ecf3db1e..000000000 --- a/src/bin/lttng/commands/disable_consumer.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2012 - David Goulet - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../command.h" -#include "../utils.h" - -/* - * The 'disable-consumer ' first level command - * - * Returns one of the CMD_* result constants. - */ -int cmd_disable_consumer(int argc, const char **argv) -{ - int ret; - - MSG("The disable-consumer command is now obsolete."); - ret = CMD_WARNING; - - return ret; -} diff --git a/src/bin/lttng/commands/enable_consumer.c b/src/bin/lttng/commands/enable_consumer.c deleted file mode 100644 index 8524c8b40..000000000 --- a/src/bin/lttng/commands/enable_consumer.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2012 - David Goulet - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../command.h" -#include "../utils.h" - -/* - * The 'enable-consumer ' first level command - * - * Returns one of the CMD_* result constants. - */ -int cmd_enable_consumer(int argc, const char **argv) -{ - int ret; - - MSG("The enable-consumer command is now obsolete."); - ret = CMD_WARNING; - - return ret; -} diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c index a676be825..e4a8fd23c 100644 --- a/src/bin/lttng/lttng.c +++ b/src/bin/lttng/lttng.c @@ -83,8 +83,6 @@ static struct cmd_struct commands[] = { { "snapshot", cmd_snapshot}, { "save", cmd_save}, { "load", cmd_load}, - { "enable-consumer", cmd_enable_consumer}, /* OBSOLETE */ - { "disable-consumer", cmd_disable_consumer}, /* OBSOLETE */ { NULL, NULL} /* Array closure */ }; -- 2.34.1