X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=1fa6d418b4ff439c297e08d00bd40f9fff0a1f62;hp=23a9696720ebddecd719557f7456b34d141507fd;hb=6c1c0768320135c6936c371b09731851b508c023;hpb=a2d6893b27b845f9f545f1ef31f8835a80100e99 diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index 23a969672..1fa6d418b 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -16,7 +16,9 @@ */ #define _GNU_SOURCE +#define _LGPL_SOURCE #include +#include #include #include #include @@ -26,6 +28,8 @@ #include #include +#include + #include "../command.h" #include "../utils.h" @@ -43,13 +47,16 @@ static char *opt_data_url; static int opt_no_consumer; static int opt_no_output; static int opt_snapshot; -static int opt_disable_consumer; +static unsigned int opt_live_timer; enum { OPT_HELP = 1, OPT_LIST_OPTIONS, + OPT_LIVE_TIMER, }; +static struct mi_writer *writer; + static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ {"help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL}, @@ -60,8 +67,8 @@ static struct poptOption long_options[] = { {"data-url", 'D', POPT_ARG_STRING, &opt_data_url, 0, 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}, {"snapshot", 0, POPT_ARG_VAL, &opt_snapshot, 1, 0, 0}, + {"live", 0, POPT_ARG_INT | POPT_ARGFLAG_OPTIONAL, 0, OPT_LIVE_TIMER, 0, 0}, {0, 0, 0, 0, 0, 0, 0} }; @@ -70,7 +77,7 @@ static struct poptOption long_options[] = { * why this declaration exists and used ONLY in for this command. */ extern int _lttng_create_session_ext(const char *name, const char *url, - const char *datetime); + const char *datetime, int live_timer); /* * usage @@ -91,6 +98,14 @@ static void usage(FILE *ofp) fprintf(ofp, " if one, as the default snapshot output.\n"); fprintf(ofp, " Every channel will be set in overwrite mode\n"); fprintf(ofp, " and with mmap output (splice not supported).\n"); + fprintf(ofp, " --live [USEC] Set the session in live-reading mode.\n"); + fprintf(ofp, " The delay parameter in micro-seconds is the\n"); + fprintf(ofp, " maximum time the user can wait for the data\n"); + fprintf(ofp, " to be flushed. Can be set with a network\n"); + fprintf(ofp, " URL (-U or -C/-D) and must have a relayd listening.\n"); + fprintf(ofp, " By default, %u is used for the timer and the\n", + DEFAULT_LTTNG_LIVE_TIMER); + fprintf(ofp, " network URL is set to net://127.0.0.1.\n"); fprintf(ofp, "\n"); fprintf(ofp, "Extended Options:\n"); fprintf(ofp, "\n"); @@ -99,7 +114,6 @@ static void usage(FILE *ofp) fprintf(ofp, " -U, --set-url=URL Set URL destination of the trace data.\n"); fprintf(ofp, " It is persistent for the session lifetime.\n"); fprintf(ofp, " This will set both data and control URL.\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, "\n"); @@ -135,6 +149,57 @@ static void usage(FILE *ofp) fprintf(ofp, "\n"); } +/* + * Retrieve the created session and mi output it based on provided argument + * This is currently a summary of what was pretty printed and is subject to + * enhancements. + */ +static int mi_created_session(const char *session_name) +{ + int ret, i, count, found; + struct lttng_session *sessions; + + /* session_name should not be null */ + assert(session_name); + assert(writer); + + count = lttng_list_sessions(&sessions); + if (count < 0) { + ret = count; + ERR("%s", lttng_strerror(ret)); + goto error; + } + + if (count == 0) { + ERR("Error session creation failed: session %s not found", session_name); + ret = -LTTNG_ERR_SESS_NOT_FOUND; + goto end; + } + + found = 0; + for (i = 0; i < count; i++) { + if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) { + found = 1; + ret = mi_lttng_session(writer, &sessions[i], 0); + if (ret) { + goto error; + } + break; + } + } + + if (!found) { + ret = -LTTNG_ERR_SESS_NOT_FOUND; + } else { + ret = CMD_SUCCESS; + } + +error: + free(sessions); +end: + return ret; +} + /* * For a session name, set the consumer URLs. */ @@ -279,6 +344,12 @@ static int create_session(void) } } + 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; + } + if (opt_output_path != NULL) { traces_path = utils_expand_path(opt_output_path); if (traces_path == NULL) { @@ -286,7 +357,7 @@ static int create_session(void) goto error; } - /* Create URL string from the local filesytem path */ + /* Create URL string from the local file system path */ ret = asprintf(&alloc_url, "file://%s", traces_path); if (ret < 0) { PERROR("asprintf url path"); @@ -299,6 +370,12 @@ static int create_session(void) } else if (opt_url) { /* Handling URL (-U opt) */ url = opt_url; print_str_url = url; + } else if (opt_data_url && opt_ctrl_url) { + /* + * With both control and data, we'll be setting the consumer URL after + * session creation thus use no URL. + */ + url = NULL; } else if (!opt_no_output) { /* Auto output path */ alloc_path = utils_get_home_dir(); @@ -320,16 +397,26 @@ static int create_session(void) } url = alloc_url; - if (!opt_data_url && !opt_ctrl_url) { - print_str_url = alloc_url + strlen("file://"); - } + print_str_url = alloc_url + strlen("file://"); } else { /* No output means --no-output or --snapshot mode. */ url = NULL; } - if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) { - ERR("You need both control and data URL."); + /* Use default live URL if NO url is/are found. */ + if ((opt_live_timer && !opt_url) && (opt_live_timer && !opt_data_url)) { + ret = asprintf(&alloc_url, "net://127.0.0.1"); + if (ret < 0) { + PERROR("asprintf default live URL"); + ret = CMD_FATAL; + goto error; + } + url = alloc_url; + print_str_url = url; + } + + if (opt_snapshot && opt_live_timer) { + ERR("Snapshot and live modes are mutually exclusive."); ret = CMD_ERROR; goto error; } @@ -345,8 +432,21 @@ static int create_session(void) snapshot_url = url; } ret = lttng_create_session_snapshot(session_name, snapshot_url); + } else if (opt_live_timer) { + const char *pathname; + + if (opt_relayd_path) { + pathname = opt_relayd_path; + } else { + pathname = INSTALL_BIN_PATH "/lttng-relayd"; + } + if (!opt_url && !opt_data_url && !check_relayd() && + spawn_relayd(pathname, 0) < 0) { + goto error; + } + ret = lttng_create_session_live(session_name, url, opt_live_timer); } else { - ret = _lttng_create_session_ext(session_name, url, datetime); + ret = _lttng_create_session_ext(session_name, url, datetime, -1); } if (ret < 0) { /* Don't set ret so lttng can interpret the sessiond error. */ @@ -378,6 +478,10 @@ static int create_session(void) MSG("Session %s created.", session_name); if (print_str_url && !opt_snapshot) { MSG("Traces will be written in %s", print_str_url); + + if (opt_live_timer) { + MSG("Live timer set to %u usec", opt_live_timer); + } } else if (opt_snapshot) { if (print_str_url) { MSG("Default snapshot output set to: %s", print_str_url); @@ -386,6 +490,15 @@ static int create_session(void) "be set in overwrite mode and mmap output."); } + /* Mi output */ + if (lttng_opt_mi) { + ret = mi_created_session(session_name); + if (ret) { + ret = CMD_ERROR; + goto error; + } + } + /* Init lttng session config */ ret = config_init(session_name); if (ret < 0) { @@ -413,7 +526,8 @@ error: */ int cmd_create(int argc, const char **argv) { - int opt, ret = CMD_SUCCESS; + int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; + char *opt_arg = NULL; static poptContext pc; pc = poptGetContext(NULL, argc, argv, long_options, 0); @@ -427,6 +541,35 @@ int cmd_create(int argc, const char **argv) case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); goto end; + case OPT_LIVE_TIMER: + { + unsigned long v; + + errno = 0; + opt_arg = poptGetOptArg(pc); + if (!opt_arg) { + /* Set up default values. */ + opt_live_timer = (uint32_t) DEFAULT_LTTNG_LIVE_TIMER; + DBG("Session live timer interval set to default value %d", + opt_live_timer); + break; + } + + v = strtoul(opt_arg, NULL, 0); + if (errno != 0 || !isdigit(opt_arg[0])) { + ERR("Wrong value in --live parameter: %s", opt_arg); + ret = CMD_ERROR; + goto end; + } + if (v != (uint32_t) v) { + ERR("32-bit overflow in --live parameter: %s", opt_arg); + ret = CMD_ERROR; + goto end; + } + opt_live_timer = (uint32_t) v; + DBG("Session live timer interval set to %d", opt_live_timer); + break; + } default: usage(stderr); ret = CMD_UNDEFINED; @@ -440,17 +583,71 @@ int cmd_create(int argc, const char **argv) goto end; } - if (opt_disable_consumer) { - MSG("The option --disable-consumer is obsolete."); - ret = CMD_WARNING; - goto end; - } + /* MI initialization */ + if (lttng_opt_mi) { + writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi); + if (!writer) { + ret = -LTTNG_ERR_NOMEM; + goto end; + } + /* Open command element */ + ret = mi_lttng_writer_command_open(writer, + mi_lttng_element_command_create); + if (ret) { + ret = CMD_ERROR; + goto end; + } + + /* Open output element */ + ret = mi_lttng_writer_open_element(writer, + mi_lttng_element_command_output); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } opt_session_name = (char*) poptGetArg(pc); - ret = create_session(); + command_ret = create_session(); + if (command_ret) { + success = 0; + } + + if (lttng_opt_mi) { + /* Close output element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + ret = CMD_ERROR; + goto end; + } + + /* Success ? */ + ret = mi_lttng_writer_write_element_bool(writer, + mi_lttng_element_command_success, success); + if (ret) { + ret = CMD_ERROR; + goto end; + } + + /* Command element close */ + ret = mi_lttng_writer_command_close(writer); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } end: + /* Mi clean-up */ + if (writer && mi_lttng_writer_destroy(writer)) { + /* Preserve original error code */ + ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL; + } + + /* Overwrite ret if an error occurred in create_session() */ + ret = command_ret ? command_ret : ret; + poptFreeContext(pc); return ret; }