X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=1d02a1f0a86021d50c3ad53e5581181b96bc3563;hp=2e03373266c2ca9c3d10f469bfb5da9ef3a5dfb6;hb=37d03ff782ab6774cb972549854ebc3f95e7d677;hpb=d73c58020df7ccd20d1edd250b0f00f0d7d25b5b diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index 2e0337326..1d02a1f0a 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -27,6 +27,8 @@ #include #include +#include + #include "../command.h" #include "../utils.h" @@ -53,6 +55,8 @@ enum { 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}, @@ -147,6 +151,59 @@ static void usage(FILE *ofp) fprintf(ofp, "\n"); } +/* + * Retrieve the created session and + * mi output it of the created session based on provided argument + * This is currently a summary of what was pretty printed and is subject to + * enhancements. + * str_url is a placement string for output url (snapshot or regular trace) + */ +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. */ @@ -291,6 +348,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) { @@ -298,7 +361,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"); @@ -311,6 +374,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(); @@ -332,22 +401,14 @@ 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."); - ret = CMD_ERROR; - goto error; - } - + /* Use default live URL if NO url is/are found. */ if ((opt_live_timer && !opt_url) && (opt_live_timer && !opt_data_url)) { - /* Use default live URL if none is found. */ ret = asprintf(&alloc_url, "net://127.0.0.1"); if (ret < 0) { PERROR("asprintf default live URL"); @@ -376,6 +437,17 @@ static int create_session(void) } 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, -1); @@ -422,6 +494,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) { @@ -449,7 +530,7 @@ 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; @@ -512,11 +593,72 @@ int cmd_create(int argc, const char **argv) goto end; } + + /* MI initilisation */ + 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 occured in create_session() */ + ret = command_ret ? command_ret : ret; + poptFreeContext(pc); return ret; }