/*
* 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
#include "../command.h"
+#include <src/common/sessiond-comm/sessiond-comm.h>
+
static char *opt_channels;
static int opt_kernel;
static char *opt_session_name;
OPT_SWITCH_TIMER,
OPT_READ_TIMER,
OPT_USERSPACE,
+ OPT_LIST_OPTIONS,
};
static struct lttng_handle *handle;
{"num-subbuf", 0, POPT_ARG_INT, 0, OPT_NUM_SUBBUF, 0, 0},
{"switch-timer", 0, POPT_ARG_INT, 0, OPT_SWITCH_TIMER, 0, 0},
{"read-timer", 0, POPT_ARG_INT, 0, OPT_READ_TIMER, 0, 0},
+ {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
{0, 0, 0, 0, 0, 0, 0}
};
*/
static void usage(FILE *ofp)
{
- fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] [options] [channel_options]\n");
+ fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] [-u|-k] [OPTIONS]\n");
fprintf(ofp, "\n");
+ fprintf(ofp, "Options:\n");
fprintf(ofp, " -h, --help Show this help\n");
- fprintf(ofp, " -s, --session Apply on session name\n");
- fprintf(ofp, " -k, --kernel Apply on 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, " --list-options Simple listing of options\n");
+ fprintf(ofp, " -s, --session NAME Apply to session name\n");
+ fprintf(ofp, " -k, --kernel Apply to the kernel tracer\n");
+ fprintf(ofp, " -u, --userspace Apply to the user-space tracer\n");
fprintf(ofp, "\n");
fprintf(ofp, "Channel options:\n");
fprintf(ofp, " --discard Discard event when buffers are full%s\n",
DEFAULT_CHANNEL_OVERWRITE ? "" : " (default)");
fprintf(ofp, " --overwrite Flight recorder mode%s\n",
DEFAULT_CHANNEL_OVERWRITE ? " (default)" : "");
- fprintf(ofp, " --subbuf-size Subbuffer size in bytes\n");
+ fprintf(ofp, " --subbuf-size SIZE Subbuffer size in bytes\n");
fprintf(ofp, " (default: %u, kernel default: %u)\n",
DEFAULT_CHANNEL_SUBBUF_SIZE,
DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE);
- fprintf(ofp, " --num-subbuf Number of subbufers\n");
- fprintf(ofp, " (default: %u, kernel default: %u)\n",
- DEFAULT_CHANNEL_SUBBUF_NUM,
- DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM);
- fprintf(ofp, " --switch-timer Switch timer interval in usec (default: %u)\n",
+ fprintf(ofp, " Needs to be a power of 2 for\n");
+ fprintf(ofp, " kernel and ust tracers\n");
+ fprintf(ofp, " --num-subbuf NUM Number of subbufers\n");
+ fprintf(ofp, " (default: %u)\n",
+ DEFAULT_CHANNEL_SUBBUF_NUM);
+ fprintf(ofp, " Needs to be a power of 2 for\n");
+ fprintf(ofp, " kernel and ust tracers\n");
+ fprintf(ofp, " --switch-timer USEC Switch timer interval in usec (default: %u)\n",
DEFAULT_CHANNEL_SWITCH_TIMER);
- fprintf(ofp, " --read-timer Read timer interval in usec (default: %u)\n",
+ fprintf(ofp, " --read-timer USEC Read timer interval in usec (default: %u)\n",
DEFAULT_CHANNEL_READ_TIMER);
fprintf(ofp, "\n");
}
*/
static int enable_channel(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;
dom.type = LTTNG_DOMAIN_UST;
} else {
ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
- ret = CMD_UNDEFINED;
+ ret = CMD_ERROR;
goto error;
}
ret = lttng_enable_channel(handle, &chan);
if (ret < 0) {
- goto error;
+ switch (-ret) {
+ case LTTNG_ERR_KERN_CHAN_EXIST:
+ case LTTNG_ERR_UST_CHAN_EXIST:
+ WARN("Channel %s: %s (session %s", channel_name,
+ lttng_strerror(ret), session_name);
+ goto error;
+ default:
+ ERR("Channel %s: %s (session %s)", channel_name,
+ lttng_strerror(ret), session_name);
+ break;
+ }
+ warn = 1;
} else {
MSG("%s channel %s enabled for session %s",
opt_kernel ? "Kernel" : "UST", channel_name,
channel_name = strtok(NULL, ",");
}
+ ret = CMD_SUCCESS;
+
error:
+ if (warn) {
+ ret = CMD_WARNING;
+ }
+
lttng_destroy_handle(handle);
return ret;
*/
int cmd_enable_channels(int argc, const char **argv)
{
- int opt, ret;
+ int opt, ret = CMD_SUCCESS;
static poptContext pc;
char *session_name = NULL;
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case OPT_HELP:
- usage(stderr);
- ret = CMD_SUCCESS;
+ usage(stdout);
goto end;
case OPT_DISCARD:
chan.attr.overwrite = 0;
DBG("Channel set to overwrite");
break;
case OPT_SUBBUF_SIZE:
+ /* TODO Replace atol with strtol and check for errors */
chan.attr.subbuf_size = atol(poptGetOptArg(pc));
DBG("Channel subbuf size set to %" PRIu64, chan.attr.subbuf_size);
break;
case OPT_NUM_SUBBUF:
+ /* TODO Replace atoi with strtol and check for errors */
chan.attr.num_subbuf = atoi(poptGetOptArg(pc));
DBG("Channel subbuf num set to %" PRIu64, chan.attr.num_subbuf);
break;
case OPT_SWITCH_TIMER:
+ /* TODO Replace atoi with strtol and check for errors */
chan.attr.switch_timer_interval = atoi(poptGetOptArg(pc));
DBG("Channel switch timer interval set to %d", chan.attr.switch_timer_interval);
break;
case OPT_READ_TIMER:
+ /* TODO Replace atoi with strtol and check for errors */
chan.attr.read_timer_interval = atoi(poptGetOptArg(pc));
DBG("Channel read timer interval set to %d", chan.attr.read_timer_interval);
break;
case OPT_USERSPACE:
opt_userspace = 1;
break;
+ case OPT_LIST_OPTIONS:
+ list_cmd_options(stdout, long_options);
+ goto end;
default:
usage(stderr);
ret = CMD_UNDEFINED;
if (opt_channels == NULL) {
ERR("Missing channel name.\n");
usage(stderr);
- ret = CMD_SUCCESS;
+ ret = CMD_ERROR;
goto end;
}
if (!opt_session_name) {
session_name = get_session_name();
if (session_name == NULL) {
- ret = -1;
+ ret = CMD_ERROR;
goto end;
}
} else {
ret = enable_channel(session_name);
end:
+ if (!opt_session_name && session_name) {
+ free(session_name);
+ }
+ poptFreeContext(pc);
return ret;
}
projects / lttng-tools.git / blobdiff