X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=5588d4267bae2d304facb6ea73866f175f46e2e8;hp=f9c7f86873aaac2d9c7f4c249b4f4a738fd2ec0d;hb=785d2d0dc3aec3a4e44fcf677155dd07e8e4cc1f;hpb=16de1a24449a4ea2ea57f8183abb4dd34255ac66 diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index f9c7f8687..5588d4267 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -92,8 +92,10 @@ static void usage(FILE *ofp) 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"); @@ -112,7 +114,7 @@ static void usage(FILE *ofp) 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"); @@ -170,79 +172,6 @@ error: 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. @@ -254,7 +183,7 @@ static int create_session(void) int ret; char *session_name = NULL, *traces_path = NULL, *alloc_path = NULL; char *alloc_url = NULL, *url = NULL, datetime[16]; - char session_name_date[NAME_MAX]; + char session_name_date[NAME_MAX], *print_str_url = NULL; time_t rawtime; struct tm *timeinfo; @@ -271,13 +200,17 @@ static int create_session(void) 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); @@ -287,9 +220,7 @@ static int create_session(void) } } - if (opt_no_consumer) { - url = NULL; - } 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; @@ -305,10 +236,10 @@ static int create_session(void) } /* URL to use in the lttng_create_session() call */ url = alloc_url; - MSG("Trace(s) output set to %s", traces_path); + print_str_url = traces_path; } else if (opt_url) { /* Handling URL (-U opt) */ url = opt_url; - MSG("Trace(s) output set to %s", url); + print_str_url = url; } else if (opt_ctrl_url == NULL && opt_data_url == NULL) { /* Auto output path */ alloc_path = config_get_default_path(); @@ -330,49 +261,38 @@ static int create_session(void) } url = alloc_url; - MSG("Trace(s) output set to %s", alloc_url + strlen("file://")); + 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. */ switch (-ret) { - case LTTCOMM_EXIST_SESS: + case LTTNG_ERR_EXIST_SESS: WARN("Session %s already exists", session_name); break; } goto error; } - if (opt_session_name == NULL) { - MSG("Session created with default name %s", 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); } - 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 */ @@ -386,17 +306,9 @@ static int create_session(void) 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)); @@ -432,6 +344,18 @@ int cmd_create(int argc, const char **argv) } } + 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();