X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fsnapshot.c;h=dd1137baa157c0c051256f4a71934a1de1ba3301;hp=cc0dd9629d4d37902a7f6603313b89671ea9584a;hb=a8f307d87d2d308671df9fed0855f4344c60d335;hpb=6dc3064a30b0cc7cfa9fdd22da1963525dfb7388 diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c index cc0dd9629..dd1137baa 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" @@ -58,7 +59,7 @@ 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}, {0, 0, 0, 0, 0, 0, 0} }; @@ -76,13 +77,13 @@ 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"); fprintf(ofp, " Setup and add an snapshot output for a session.\n"); fprintf(ofp, "\n"); - fprintf(ofp, " del-output ID [-s ]\n"); + fprintf(ofp, " del-output ID | NAME [-s ]\n"); fprintf(ofp, " Delete an output for a session using the ID.\n"); fprintf(ofp, "\n"); fprintf(ofp, " list-output [-s ]\n"); @@ -91,15 +92,16 @@ static void usage(FILE *ofp) fprintf(ofp, " record [-m ] [-s ] [-n ] [ | -C -D ]\n"); fprintf(ofp, " Snapshot a session's buffer(s) for all domains. If an URL is\n"); fprintf(ofp, " specified, it is used instead of a previously added output.\n"); - fprintf(ofp, " The snapshot is saved in the session directory in snapshot/ with\n"); - fprintf(ofp, " the top directory being NAME or the default: snapshot-ID/\n"); + fprintf(ofp, " Specifying only a name or/a size will override the current output value.\n"); + fprintf(ofp, " For instance, you can record a snapshot with a custom maximum size\n"); + fprintf(ofp, " or with a different name.\n"); fprintf(ofp, "\n"); fprintf(ofp, "Options:\n"); fprintf(ofp, " -h, --help Show this help\n"); 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"); @@ -211,7 +213,7 @@ error: /* * Delete output by ID. */ -static int del_output(uint32_t id) +static int del_output(uint32_t id, const char *name) { int ret; struct lttng_snapshot_output *output = NULL; @@ -222,7 +224,14 @@ static int del_output(uint32_t id) goto error; } - ret = lttng_snapshot_output_set_id(id, output); + if (name) { + ret = lttng_snapshot_output_set_name(name, output); + } else if (id != UINT32_MAX) { + ret = lttng_snapshot_output_set_id(id, output); + } else { + ret = CMD_ERROR; + goto error; + } if (ret < 0) { ret = CMD_FATAL; goto error; @@ -233,8 +242,13 @@ static int del_output(uint32_t id) goto error; } - MSG("Snapshot output id %" PRIu32 " successfully deleted for session %s", - id, current_session_name); + if (id != UINT32_MAX) { + MSG("Snapshot output id %" PRIu32 " successfully deleted for session %s", + id, current_session_name); + } else { + MSG("Snapshot output %s successfully deleted for session %s", + name, current_session_name); + } error: lttng_snapshot_output_destroy(output); @@ -297,6 +311,8 @@ end: static int cmd_del_output(int argc, const char **argv) { int ret = CMD_SUCCESS; + char *name; + long id; if (argc < 2) { usage(stderr); @@ -304,7 +320,17 @@ static int cmd_del_output(int argc, const char **argv) goto end; } - ret = del_output(atoi(argv[1])); + errno = 0; + id = strtol(argv[1], &name, 10); + if (id == 0 && errno == 0) { + ret = del_output(UINT32_MAX, name); + } else if (errno == 0 && *name == '\0') { + ret = del_output(id, NULL); + } else { + ERR("Argument %s not recognized", argv[1]); + ret = -1; + goto end; + } end: return ret; @@ -323,12 +349,10 @@ static int record(const char *url) int ret; struct lttng_snapshot_output *output = NULL; - if (url || (opt_ctrl_url && opt_data_url)) { - output = create_output_from_args(url); - if (!output) { - ret = CMD_FATAL; - goto error; - } + output = create_output_from_args(url); + if (!output) { + ret = CMD_FATAL; + goto error; } ret = lttng_snapshot_record(current_session_name, output, 0); @@ -343,11 +367,10 @@ static int record(const char *url) } else if (opt_ctrl_url) { MSG("Snapshot written to ctrl: %s, data: %s", opt_ctrl_url, opt_data_url); - } else { - MSG("Snapshot written in session directory."); } error: + lttng_snapshot_output_destroy(output); return ret; } @@ -419,23 +442,15 @@ int cmd_snapshot(int argc, const char **argv) goto end; case OPT_MAX_SIZE: { - long long int val; - char *endptr; + uint64_t val; const char *opt = poptGetOptArg(pc); - 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;