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, " TCP for both control (PORT1) and data port (PORT2).\n");
fprintf(ofp, " The default ports are respectively 5342 and 5343.\n");
fprintf(ofp, "\n");
- fprintf(ofp, " > tcp[4|6]://...\n");
+ fprintf(ofp, " > tcp[6]://...\n");
fprintf(ofp, " Can only be used with -C and -D together\n");
fprintf(ofp, "\n");
fprintf(ofp, "NOTE: IPv6 address MUST be enclosed in brackets '[]' (rfc2732)\n");
return ret;
}
-/*
- * For a session name, enable the consumer.
- */
-static int enable_consumer(const char *session_name)
-{
- int ret;
- struct lttng_handle *handle;
- struct lttng_domain dom;
-
- assert(session_name);
-
- /*
- * Set handle with the session name and the domain set to 0. This means to
- * the session daemon that the next action applies on the tracing session
- * rather then the domain specific session.
- *
- * XXX: This '0' value should be a domain enum value.
- */
- memset(&dom, 0, sizeof(dom));
-
- handle = lttng_create_handle(session_name, 0);
- if (handle == NULL) {
- ret = CMD_FATAL;
- goto error;
- }
-
- ret = lttng_enable_consumer(handle);
- if (ret < 0) {
- goto error;
- }
-
- MSG("Consumer enabled for session %s", session_name);
-
-error:
- lttng_destroy_handle(handle);
- return ret;
-}
-
-/*
- * For a session name, disable the consumer.
- */
-static int disable_consumer(const char *session_name)
-{
- int ret;
- struct lttng_handle *handle;
-
- assert(session_name);
-
- /*
- * Set handle with the session name and the domain set to 0. This means to
- * the session daemon that the next action applies on the tracing session
- * rather then the domain specific session.
- *
- * XXX: This '0' value should be a domain enum value.
- */
- handle = lttng_create_handle(session_name, 0);
- if (handle == NULL) {
- ret = CMD_FATAL;
- goto error;
- }
-
- ret = lttng_disable_consumer(handle);
- if (ret < 0) {
- goto error;
- }
- free(handle);
-
- MSG("Consumer disabled for session %s", session_name);
-
-error:
- return ret;
-}
-
/*
* Create a tracing session.
* If no name is specified, a default name is generated.
PERROR("snprintf session name");
goto error;
}
- session_name = strdup(DEFAULT_SESSION_NAME);
- if (session_name == NULL) {
- PERROR("strdup session name");
- goto error;
- }
+ session_name = session_name_date;
DBG("Auto session name set to %s", session_name_date);
} else {
+ if (strncmp(opt_session_name, DEFAULT_SESSION_NAME,
+ strlen(DEFAULT_SESSION_NAME)) == 0 &&
+ strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME)) {
+ ERR("%s is a reserved keyword for default session(s)",
+ DEFAULT_SESSION_NAME);
+ ret = CMD_ERROR;
+ goto error;
+ }
session_name = opt_session_name;
ret = snprintf(session_name_date, sizeof(session_name_date),
"%s-%s", session_name, datetime);
}
}
- if (opt_no_consumer) {
- url = NULL;
- print_str_url = "";
- } else if (opt_output_path != NULL) {
+ if (opt_output_path != NULL) {
traces_path = utils_expand_path(opt_output_path);
if (traces_path == NULL) {
ret = CMD_ERROR;
print_str_url = alloc_url + strlen("file://");
}
+ assert(url);
+
ret = _lttng_create_session_ext(session_name, url, datetime);
if (ret < 0) {
/* Don't set ret so lttng can interpret the sessiond error. */
goto error;
}
- if (opt_session_name == NULL) {
- MSG("Session %s created.", session_name_date);
- } else {
- MSG("Session %s created.", session_name);
+ MSG("Session %s created.", session_name);
+ if (print_str_url) {
+ MSG("Traces will be written in %s", print_str_url);
}
- MSG("Traces will be written in %s", print_str_url);
- if (opt_ctrl_url || opt_data_url) {
+ 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) {
goto error;
}
-
- ret = enable_consumer(session_name);
- if (ret < 0) {
- goto error;
- }
- }
-
- if (opt_disable_consumer && !opt_no_consumer) {
- ret = disable_consumer(session_name);
- if (ret < 0) {
- goto error;
- }
- }
-
- if (opt_session_name == NULL) {
- free(session_name);
- session_name = session_name_date;
+ } 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;
}
/* Init lttng session config */
ret = CMD_SUCCESS;
error:
- if (opt_session_name == NULL && session_name != session_name_date) {
- free(session_name);
- }
-
- if (alloc_url) {
- free(alloc_url);
- }
-
- if (traces_path) {
- free(traces_path);
- }
+ free(alloc_url);
+ free(traces_path);
+ free(alloc_path);
if (ret < 0) {
ERR("%s", lttng_strerror(ret));
}
}
+ if (opt_no_consumer) {
+ MSG("The option --no-consumer is obsolete.");
+ ret = CMD_WARNING;
+ goto end;
+ }
+
+ if (opt_disable_consumer) {
+ MSG("The option --disable-consumer is obsolete.");
+ ret = CMD_WARNING;
+ goto end;
+ }
+
opt_session_name = (char*) poptGetArg(pc);
ret = create_session();