X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=d234c06a4f3f12afd891fce9e6e67b579d9e2483;hp=ddd2983e238208a0888a90638c539bda692111cf;hb=ecc48a904cc7c419fd1400afaa9ccb93be490cdd;hpb=feb0f3e5900ff58202ea0c3f227de3c1b8291952 diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index ddd2983e2..d234c06a4 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 @@ -33,6 +34,7 @@ #include #include #include +#include static char *opt_output_path; static char *opt_session_name; @@ -40,11 +42,15 @@ static char *opt_url; static char *opt_ctrl_url; 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[] = { @@ -55,8 +61,11 @@ static struct poptOption long_options[] = { {"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}, + {"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, 0, OPT_LIVE_TIMER, 0, 0}, {0, 0, 0, 0, 0, 0, 0} }; @@ -65,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 @@ -80,6 +89,17 @@ static void usage(FILE *ofp) fprintf(ofp, " -h, --help Show this help\n"); fprintf(ofp, " --list-options Simple listing of options\n"); fprintf(ofp, " -o, --output PATH Specify output path for traces\n"); + fprintf(ofp, " --no-output Traces will not be outputted\n"); + fprintf(ofp, " --snapshot Set the session in snapshot mode.\n"); + fprintf(ofp, " Created in no-output mode and uses the URL,\n"); + 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. Requires a network URL (-U or -C/-D)\n"); + fprintf(ofp, " and a lttng-relayd listening.\n"); fprintf(ofp, "\n"); fprintf(ofp, "Extended Options:\n"); fprintf(ofp, "\n"); @@ -167,6 +187,46 @@ error: return ret; } +static int add_snapshot_output(const char *session_name, const char *ctrl_url, + const char *data_url) +{ + int ret; + struct lttng_snapshot_output *output = NULL; + + assert(session_name); + + output = lttng_snapshot_output_create(); + if (!output) { + ret = CMD_FATAL; + goto error_create; + } + + if (ctrl_url) { + ret = lttng_snapshot_output_set_ctrl_url(ctrl_url, output); + if (ret < 0) { + goto error; + } + } + + if (data_url) { + ret = lttng_snapshot_output_set_data_url(data_url, output); + if (ret < 0) { + goto error; + } + } + + /* This call, if successful, populates the id of the output object. */ + ret = lttng_snapshot_add_output(session_name, output); + if (ret < 0) { + goto error; + } + +error: + lttng_snapshot_output_destroy(output); +error_create: + return ret; +} + /* * Create a tracing session. * If no name is specified, a default name is generated. @@ -248,7 +308,7 @@ static int create_session(void) } else if (opt_url) { /* Handling URL (-U opt) */ url = opt_url; print_str_url = url; - } else { + } else if (!opt_no_output) { /* Auto output path */ alloc_path = utils_get_home_dir(); if (alloc_path == NULL) { @@ -272,6 +332,9 @@ static int create_session(void) if (!opt_data_url && !opt_ctrl_url) { 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)) { @@ -280,7 +343,34 @@ static int create_session(void) goto error; } - ret = _lttng_create_session_ext(session_name, url, datetime); + if ((opt_live_timer && !opt_url) && (opt_live_timer && !opt_data_url)) { + ERR("You need a network URL (-U or -C/-D) to use live tracing."); + ret = CMD_ERROR; + goto error; + } + + if (opt_snapshot && opt_live_timer) { + ERR("Snapshot and live modes are mutually exclusive."); + ret = CMD_ERROR; + goto error; + } + + if (opt_snapshot) { + /* No output by default. */ + const char *snapshot_url = NULL; + + if (opt_url) { + snapshot_url = url; + } else if (!opt_data_url && !opt_ctrl_url) { + /* This is the session path that we need to use as output. */ + snapshot_url = url; + } + ret = lttng_create_session_snapshot(session_name, snapshot_url); + } else if (opt_live_timer) { + ret = lttng_create_session_live(session_name, url, opt_live_timer); + } else { + ret = _lttng_create_session_ext(session_name, url, datetime, -1); + } if (ret < 0) { /* Don't set ret so lttng can interpret the sessiond error. */ switch (-ret) { @@ -294,8 +384,13 @@ static int create_session(void) } 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 (opt_snapshot) { + ret = add_snapshot_output(session_name, opt_ctrl_url, + opt_data_url); + } else { + /* Setting up control URI (-C or/and -D opt) */ + ret = set_consumer_url(session_name, opt_ctrl_url, opt_data_url); + } if (ret < 0) { /* Destroy created session because the URL are not valid. */ lttng_destroy_session(session_name); @@ -304,8 +399,14 @@ static int create_session(void) } MSG("Session %s created.", session_name); - if (print_str_url) { + if (print_str_url && !opt_snapshot) { MSG("Traces will be written in %s", print_str_url); + } else if (opt_snapshot) { + if (print_str_url) { + MSG("Default snapshot output set to: %s", print_str_url); + } + MSG("Snapshot mode set. Every channel enabled for that session will " + "be set in overwrite mode and mmap output."); } /* Init lttng session config */ @@ -336,6 +437,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); @@ -349,6 +451,27 @@ 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); + 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; @@ -357,7 +480,7 @@ int cmd_create(int argc, const char **argv) } if (opt_no_consumer) { - MSG("The option --no-consumer is obsolete."); + MSG("The option --no-consumer is obsolete. Use --no-output now."); ret = CMD_WARNING; goto end; }