X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=805cdb1d27157e73c674a93d6c13195b5d27fe36;hp=2c58075b4646cde144763ae30542608fa698eb4e;hb=9c6bda17fc9edd28c46e52fdf439d37da81e8d9a;hpb=61b35a5aa71d4c0715f390a32cb4e967e817c81f diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index 2c58075b4..805cdb1d2 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -52,9 +52,9 @@ static struct poptOption long_options[] = { {"help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL}, {"output", 'o', POPT_ARG_STRING, &opt_output_path, 0, NULL, NULL}, {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL}, - {"set-uri", 'U', POPT_ARG_STRING, &opt_url, 0, 0, 0}, - {"ctrl-uri", 'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0}, - {"data-uri", '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}, {"disable-consumer", 0, POPT_ARG_VAL, &opt_disable_consumer, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0} @@ -91,9 +91,6 @@ static void usage(FILE *ofp) 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, " --disable-consumer\n"); - fprintf(ofp, " Disable consumer for this session.\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 +109,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 +167,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 +178,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], *print_str_url = NULL; + char session_name_date[NAME_MAX + 17], *print_str_url = NULL; time_t rawtime; struct tm *timeinfo; @@ -271,16 +195,25 @@ 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, + if (strlen(opt_session_name) > NAME_MAX) { + ERR("Session name too long. Length must be lower or equal to %d", + NAME_MAX); + ret = LTTNG_ERR_SESSION_FAIL; + goto error; + } + /* + * 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, strlen(DEFAULT_SESSION_NAME)) == 0 && - strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME)) { + strlen(opt_session_name) == strlen(DEFAULT_SESSION_NAME))) { ERR("%s is a reserved keyword for default session(s)", DEFAULT_SESSION_NAME); ret = CMD_ERROR; @@ -295,10 +228,7 @@ static int create_session(void) } } - 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; @@ -318,7 +248,7 @@ static int create_session(void) } else if (opt_url) { /* Handling URL (-U opt) */ url = opt_url; print_str_url = url; - } else if (opt_ctrl_url == NULL && opt_data_url == NULL) { + } else { /* Auto output path */ alloc_path = config_get_default_path(); if (alloc_path == NULL) { @@ -339,7 +269,15 @@ static int create_session(void) } url = alloc_url; - print_str_url = alloc_url + strlen("file://"); + if (!opt_data_url && !opt_ctrl_url) { + print_str_url = alloc_url + strlen("file://"); + } + } + + 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; } ret = _lttng_create_session_ext(session_name, url, datetime); @@ -349,40 +287,25 @@ static int create_session(void) case LTTNG_ERR_EXIST_SESS: WARN("Session %s already exists", session_name); break; + default: + break; } goto error; } - if (opt_session_name == NULL) { - MSG("Session %s created.", session_name_date); - } else { - MSG("Session %s created.", session_name); - } - 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) { + /* Destroy created session because the URL are not valid. */ + lttng_destroy_session(session_name); 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; + MSG("Session %s created.", session_name); + if (print_str_url) { + MSG("Traces will be written in %s", print_str_url); } /* Init lttng session config */ @@ -392,21 +315,11 @@ static int create_session(void) goto error; } - 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) { @@ -443,6 +356,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();