fprintf(ofp, "\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, " -k, --kernel Apply for the kernel tracer\n");
+ fprintf(ofp, " -s, --session Apply to session name\n");
+ fprintf(ofp, " -k, --kernel Apply to the kernel tracer\n");
#if 0
- fprintf(ofp, " -u, --userspace [CMD] Apply for the user-space tracer\n");
+ fprintf(ofp, " -u, --userspace [CMD] Apply to 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");
+ fprintf(ofp, " -u, --userspace Apply to the user-space tracer\n");
#endif
fprintf(ofp, "\n");
}
*/
static int disable_channels(char *session_name)
{
- int ret = CMD_SUCCESS;
+ int ret = CMD_SUCCESS, warn = 0;
char *channel_name;
struct lttng_domain dom;
+ memset(&dom, 0, sizeof(dom));
+
/* Create lttng domain */
if (opt_kernel) {
dom.type = LTTNG_DOMAIN_KERNEL;
ret = lttng_disable_channel(handle, channel_name);
if (ret < 0) {
- goto error;
+ ERR("Channel %s: %s (session %s)", channel_name,
+ lttng_strerror(ret), session_name);
+ warn = 1;
} else {
MSG("%s channel %s disabled for session %s",
- opt_kernel ? "Kernel" : "UST", channel_name,
- session_name);
+ opt_kernel ? "Kernel" : "UST", channel_name, session_name);
}
/* Next channel */
channel_name = strtok(NULL, ",");
}
+ ret = CMD_SUCCESS;
+
error:
+ if (warn) {
+ ret = CMD_WARNING;
+ }
+
lttng_destroy_handle(handle);
return ret;
ret = disable_channels(session_name);
end:
+ if (!opt_session_name && session_name) {
+ free(session_name);
+ }
poptFreeContext(pc);
return ret;
}