X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fsnapshot.c;h=564651e09c50480c22f45952e02833627f11364e;hp=e1dea4986c37b25753d86686ee97bb01bd3c7603;hb=c7e35b037773dbbfe10178c946ba44feefb226e1;hpb=e0dcb8bf45305529716c39ac890187810d5bb2e5 diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c index e1dea4986..564651e09 100644 --- a/src/bin/lttng/commands/snapshot.c +++ b/src/bin/lttng/commands/snapshot.c @@ -26,6 +26,7 @@ #include #include +#include #include #include "../command.h" @@ -49,6 +50,7 @@ enum { OPT_HELP = 1, OPT_LIST_OPTIONS, OPT_MAX_SIZE, + OPT_LIST_COMMANDS, }; static struct poptOption snapshot_opts[] = { @@ -58,8 +60,9 @@ static struct poptOption snapshot_opts[] = { {"ctrl-url", 'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0}, {"data-url", 'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0}, {"name", 'n', POPT_ARG_STRING, &opt_output_name, 0, 0, 0}, - {"max-size", 'm', POPT_ARG_DOUBLE, 0, OPT_MAX_SIZE, 0, 0}, + {"max-size", 'm', POPT_ARG_STRING, 0, OPT_MAX_SIZE, 0, 0}, {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL}, + {"list-commands", 0, POPT_ARG_NONE, NULL, OPT_LIST_COMMANDS}, {0, 0, 0, 0, 0, 0, 0} }; @@ -76,7 +79,7 @@ static struct cmd_struct actions[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng snapshot ACTION\n"); + fprintf(ofp, "usage: lttng snapshot [OPTION] ACTION\n"); fprintf(ofp, "\n"); fprintf(ofp, "Actions:\n"); fprintf(ofp, " add-output [-m ] [-s ] [-n ] | -C -D \n"); @@ -100,7 +103,7 @@ static void usage(FILE *ofp) fprintf(ofp, " --list-options Simple listing of options\n"); fprintf(ofp, " -s, --session NAME Apply to session name\n"); fprintf(ofp, " -n, --name NAME Name of the output or snapshot\n"); - fprintf(ofp, " -m, --max-size SIZE Maximum bytes size of the snapshot\n"); + fprintf(ofp, " -m, --max-size SIZE Maximum bytes size of the snapshot {+k,+M,+G}\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"); @@ -192,10 +195,11 @@ static int list_output(void) MSG("Snapshot output list for session %s", current_session_name); while ((s_iter = lttng_snapshot_output_list_get_next(list)) != NULL) { - MSG("%s[%" PRIu32 "] %s: %s", indent4, + MSG("%s[%" PRIu32 "] %s: %s (max-size: %" PRId64 ")", indent4, lttng_snapshot_output_get_id(s_iter), lttng_snapshot_output_get_name(s_iter), - lttng_snapshot_output_get_ctrl_url(s_iter)); + lttng_snapshot_output_get_ctrl_url(s_iter), + lttng_snapshot_output_get_maxsize(s_iter)); output_seen = 1; } @@ -261,6 +265,8 @@ static int add_output(const char *url) { int ret; struct lttng_snapshot_output *output = NULL; + char name[NAME_MAX]; + const char *n_ptr; if (!url && (!opt_data_url || !opt_ctrl_url)) { ret = CMD_ERROR; @@ -279,11 +285,21 @@ static int add_output(const char *url) goto error; } + n_ptr = lttng_snapshot_output_get_name(output); + if (*n_ptr == '\0') { + int pret; + pret = snprintf(name, sizeof(name), DEFAULT_SNAPSHOT_NAME "-%" PRIu32, + lttng_snapshot_output_get_id(output)); + if (pret < 0) { + PERROR("snprintf add output name"); + } + n_ptr = name; + } + MSG("Snapshot output successfully added for session %s", current_session_name); MSG(" [%" PRIu32 "] %s: %s (max-size: %" PRId64 ")", - lttng_snapshot_output_get_id(output), - lttng_snapshot_output_get_name(output), + lttng_snapshot_output_get_id(output), n_ptr, lttng_snapshot_output_get_ctrl_url(output), lttng_snapshot_output_get_maxsize(output)); error: @@ -356,6 +372,11 @@ static int record(const char *url) ret = lttng_snapshot_record(current_session_name, output, 0); if (ret < 0) { + if (ret == -LTTNG_ERR_MAX_SIZE_INVALID) { + ERR("The minimum size of a snapshot is computed by multiplying " + "the total amount of streams with the largest subbuffer " + "in the session."); + } goto error; } @@ -431,6 +452,13 @@ int cmd_snapshot(int argc, const char **argv) pc = poptGetContext(NULL, argc, argv, snapshot_opts, 0); poptReadDefaultConfig(pc, 0); + /* TODO: mi support */ + if (lttng_opt_mi) { + ret = -LTTNG_ERR_MI_NOT_IMPLEMENTED; + ERR("mi option not supported"); + goto end; + } + while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: @@ -439,27 +467,20 @@ int cmd_snapshot(int argc, const char **argv) case OPT_LIST_OPTIONS: list_cmd_options(stdout, snapshot_opts); goto end; + case OPT_LIST_COMMANDS: + list_commands(actions, stdout); + goto end; case OPT_MAX_SIZE: { - long long int val; - char *endptr; + uint64_t val; const char *opt = poptGetOptArg(pc); - /* Documented by the man page of strtoll(3). */ - errno = 0; - val = strtoll(opt, &endptr, 10); - if ((errno == ERANGE && (val == LLONG_MAX || val == LONG_MIN)) - || (errno != 0 && val == 0)) { + if (utils_parse_size_suffix((char *) opt, &val) < 0) { ERR("Unable to handle max-size value %s", opt); ret = CMD_ERROR; goto end; } - if (endptr == opt) { - ERR("No digits were found in %s", opt); - ret = CMD_ERROR; - goto end; - } opt_max_size = val; break; @@ -484,10 +505,17 @@ int cmd_snapshot(int argc, const char **argv) ret = handle_command(poptGetArgs(pc)); if (ret < 0) { - if (ret == -LTTNG_ERR_EPERM) { + switch (-ret) { + case LTTNG_ERR_EPERM: ERR("The session needs to be set in no output mode (--no-output)"); + break; + case LTTNG_ERR_SNAPSHOT_NODATA: + WARN("%s", lttng_strerror(ret)); + break; + default: + ERR("%s", lttng_strerror(ret)); + break; } - ERR("%s", lttng_strerror(ret)); goto end; }