/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * 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
*/
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 int disable_events(char *session_name)
{
- int err, ret = CMD_SUCCESS;
+ int err, 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) {
goto error;
}
+ /* Get channel name */
+ 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;
+ }
+
handle = lttng_create_handle(session_name, &dom);
if (handle == NULL) {
ret = -1;
if (opt_disable_all) {
ret = lttng_disable_event(handle, NULL, channel_name);
if (ret < 0) {
+ /* Don't set ret so lttng can interpret the sessiond error. */
goto error;
}
/* 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), channel_name, session_name);
+ warn = 1;
} else {
- MSG("%s event %s disabled in channel %s",
- opt_kernel ? "kernel" : "UST", event_name,
- channel_name);
+ MSG("%s event %s disabled in channel %s for session %s",
+ opt_kernel ? "kernel" : "UST", event_name, channel_name,
+ session_name);
}
/* Next event */
event_name = strtok(NULL, ",");
}
+ ret = CMD_SUCCESS;
+
end:
error:
+ if (warn) {
+ ret = CMD_WARNING;
+ }
if (opt_channel_name == NULL) {
free(channel_name);
}
ret = disable_events(session_name);
end:
+ if (!opt_session_name && session_name) {
+ free(session_name);
+ }
poptFreeContext(pc);
return ret;
}
projects / lttng-tools.git / blobdiff