X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_events.c;h=f9dc3396bf1377ae7caadd10bf780cb3e612a6fc;hp=4ddcf5431a374f8bc9dc0fbedaa70b28bb5d4532;hb=850767541647c102a299d7fbc39c97555ac70224;hpb=ca1c3607d2f5654163875cda874f43971df0f696 diff --git a/src/bin/lttng/commands/disable_events.c b/src/bin/lttng/commands/disable_events.c index 4ddcf5431..f9dc3396b 100644 --- a/src/bin/lttng/commands/disable_events.c +++ b/src/bin/lttng/commands/disable_events.c @@ -1,19 +1,18 @@ /* * Copyright (C) 2011 - David Goulet * - * 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; only version 2 - * of the License. + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 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 @@ -70,25 +69,31 @@ static struct poptOption long_options[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng disable-event NAME[,NAME2,...] [options]\n"); + fprintf(ofp, "usage: lttng disable-event NAME[,NAME2,...] (-k | -u) [OPTIONS]\n"); fprintf(ofp, "\n"); + fprintf(ofp, "Options:\n"); fprintf(ofp, " -h, --help Show this help\n"); fprintf(ofp, " --list-options Simple listing of options\n"); - fprintf(ofp, " -s, --session Apply on session name\n"); - fprintf(ofp, " -c, --channel Apply on this channel\n"); + fprintf(ofp, " -s, --session NAME Apply to session name\n"); + fprintf(ofp, " -c, --channel NAME Apply to this channel\n"); fprintf(ofp, " -a, --all-events Disable all tracepoints\n"); fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n"); -#if 0 - fprintf(ofp, " -u, --userspace [CMD] Apply for the user-space tracer\n"); - fprintf(ofp, " If no CMD, the domain used is UST global\n"); - fprintf(ofp, " or else the domain is UST EXEC_NAME\n"); - fprintf(ofp, " -p, --pid PID If -u, apply to specific PID (domain: UST PID)\n"); -#else - fprintf(ofp, " -u, --userspace Apply for the user-space tracer\n"); -#endif + fprintf(ofp, " -u, --userspace Apply to the user-space tracer\n"); fprintf(ofp, "\n"); } +static +const char *print_channel_name(const char *name) +{ + return name ? : DEFAULT_CHANNEL_NAME; +} + +static +const char *print_raw_channel_name(const char *name) +{ + return name ? : ""; +} + /* * disable_events * @@ -96,25 +101,11 @@ static void usage(FILE *ofp) */ static int disable_events(char *session_name) { - int err, ret = CMD_SUCCESS; + int ret = CMD_SUCCESS, warn = 0; 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; - } + memset(&dom, 0, sizeof(dom)); /* Create lttng domain */ if (opt_kernel) { @@ -127,6 +118,8 @@ static int disable_events(char *session_name) goto error; } + channel_name = opt_channel_name; + handle = lttng_create_handle(session_name, &dom); if (handle == NULL) { ret = -1; @@ -136,55 +129,47 @@ static int disable_events(char *session_name) if (opt_disable_all) { ret = lttng_disable_event(handle, NULL, channel_name); if (ret < 0) { + ERR("%s", lttng_strerror(ret)); goto error; } MSG("All %s events are disabled in channel %s", - opt_kernel ? "kernel" : "UST", channel_name); + opt_kernel ? "kernel" : "UST", + print_channel_name(channel_name)); goto end; } /* 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) { - 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), + ret == -LTTNG_ERR_NEED_CHANNEL_NAME + ? print_raw_channel_name(channel_name) + : print_channel_name(channel_name), + session_name); + warn = 1; } else { - MSG("%s event %s disabled in channel %s", + MSG("%s event %s disabled in channel %s for session %s", opt_kernel ? "kernel" : "UST", event_name, - channel_name); + print_channel_name(channel_name), + session_name); } /* Next event */ event_name = strtok(NULL, ","); } + ret = CMD_SUCCESS; + end: error: - if (opt_channel_name == NULL) { - free(channel_name); + if (warn) { + ret = CMD_WARNING; } lttng_destroy_handle(handle); @@ -244,6 +229,9 @@ int cmd_disable_events(int argc, const char **argv) ret = disable_events(session_name); end: + if (!opt_session_name && session_name) { + free(session_name); + } poptFreeContext(pc); return ret; }