static char *opt_ctrl_url;
static char *opt_data_url;
static int opt_no_consumer;
static char *opt_ctrl_url;
static char *opt_data_url;
static int opt_no_consumer;
{"set-url", 'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
{"ctrl-url", 'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
{"data-url", 'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
{"set-url", 'U', POPT_ARG_STRING, &opt_url, 0, 0, 0},
{"ctrl-url", 'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
{"data-url", 'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
- {"no-consumer", 0, POPT_ARG_VAL, &opt_no_consumer, 1, 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},
{0, 0, 0, 0, 0, 0, 0}
};
{"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0},
{0, 0, 0, 0, 0, 0, 0}
};
fprintf(ofp, " -h, --help Show this help\n");
fprintf(ofp, " --list-options Simple listing of options\n");
fprintf(ofp, " -o, --output PATH Specify output path for traces\n");
fprintf(ofp, " -h, --help Show this help\n");
fprintf(ofp, " --list-options Simple listing of options\n");
fprintf(ofp, " -o, --output PATH Specify output path for traces\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, " 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, " --no-consumer Don't activate a consumer for this session.\n");
- fprintf(ofp, " OBSELETE\n");
- fprintf(ofp, " --disable-consumer\n");
- fprintf(ofp, " Disable consumer for this session.\n");
- fprintf(ofp, " OBSELETE\n");
fprintf(ofp, "\n");
fprintf(ofp, "Please refer to the man page (lttng(1)) for more information on network\n");
fprintf(ofp, "streaming mechanisms and explanation of the control and data port\n");
fprintf(ofp, "\n");
fprintf(ofp, "Please refer to the man page (lttng(1)) for more information on network\n");
fprintf(ofp, "streaming mechanisms and explanation of the control and data port\n");
- if (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+ /*
+ * Check if the session name begins with "auto-" or is exactly "auto".
+ * Both are reserved for the default session name. See bug #449 to
+ * understand why we need to check both here.
+ */
+ if ((strncmp(opt_session_name, DEFAULT_SESSION_NAME "-",
+ strlen(DEFAULT_SESSION_NAME) + 1) == 0) ||
+ (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
if (alloc_path == NULL) {
ERR("HOME path not found.\n \
Please specify an output path using -o, --output PATH");
if (alloc_path == NULL) {
ERR("HOME path not found.\n \
Please specify an output path using -o, --output PATH");
case LTTNG_ERR_EXIST_SESS:
WARN("Session %s already exists", session_name);
break;
case LTTNG_ERR_EXIST_SESS:
WARN("Session %s already exists", session_name);
break;
if (opt_ctrl_url && opt_data_url) {
/* Setting up control URI (-C or/and -D opt) */
ret = set_consumer_url(session_name, opt_ctrl_url, opt_data_url);
if (ret < 0) {
if (opt_ctrl_url && opt_data_url) {
/* Setting up control URI (-C or/and -D opt) */
ret = set_consumer_url(session_name, opt_ctrl_url, opt_data_url);
if (ret < 0) {
- } else if ((!opt_ctrl_url && opt_data_url) ||
- (opt_ctrl_url && !opt_data_url)) {
- ERR("You need both control and data URL.");
- ret = CMD_ERROR;
- goto error;
+ }
+
+ MSG("Session %s created.", session_name);
+ if (print_str_url) {
+ MSG("Traces will be written in %s", print_str_url);