X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=e02b141420c075a1c0e687befade8192eb0d4721;hp=23a9696720ebddecd719557f7456b34d141507fd;hb=2c521c63a46d6c79a7819a822d109ccdd48b6064;hpb=a2d6893b27b845f9f545f1ef31f8835a80100e99 diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index 23a969672..e02b14142 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -17,6 +17,7 @@ #define _GNU_SOURCE #include +#include #include #include #include @@ -43,11 +44,13 @@ static char *opt_data_url; static int opt_no_consumer; static int opt_no_output; static int opt_snapshot; +static unsigned int opt_live_timer; static int opt_disable_consumer; enum { OPT_HELP = 1, OPT_LIST_OPTIONS, + OPT_LIVE_TIMER, }; static struct poptOption long_options[] = { @@ -62,6 +65,7 @@ static struct poptOption long_options[] = { {"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 +74,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 +95,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"); @@ -279,6 +291,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) { @@ -299,6 +317,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 +344,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 +379,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 +425,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); @@ -414,6 +465,7 @@ error: int cmd_create(int argc, const char **argv) { int opt, ret = CMD_SUCCESS; + char *opt_arg = NULL; static poptContext pc; pc = poptGetContext(NULL, argc, argv, long_options, 0); @@ -427,6 +479,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;