lvm2-commits August 2015

lvm2-commits@lists.fedorahosted.org

7 participants
580 discussions

master - dmstats: add 'interval' and 'interval_ns' report fields
by Bryn Reeves 14 Aug '15

14 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9b3dc725060a243b… Commit: 9b3dc725060a243b7b6d849de9bafbdf3e9f5140 Parent: 4534f0fbcf6b83d29baf4af78f9027ff76fe0a7a Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Aug 13 17:29:15 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Fri Aug 14 13:36:50 2015 +0100 dmstats: add 'interval' and 'interval_ns' report fields Add a pair of fields to expose the current per-interval duation estimate. The 'interval' field provides a real value in units of seconds and the 'interval_ns' field provides the same quantity expressed as a whole number of nanoseconds. --- man/dmstats.8.in | 14 ++++++++++++++ tools/dmsetup.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/man/dmstats.8.in b/man/dmstats.8.in index 3b9f032..f8d2949 100644 --- a/man/dmstats.8.in +++ b/man/dmstats.8.in @@ -501,6 +501,20 @@ The program ID value associated with this region. .br The auxiliary data value associated with this region. .br +.HP +.B interval_ns +.br +The estimated interval over which the current counter values have +accumulated. The vaulue is reported as an interger expressed in units +of nanoseconds. +.br +.HP +.B interval +.br +The estimated interval over which the current counter values have +accumulated. The value is reported as a real number in units of +seconds. +.br .SS Basic counters Basic counters provide access to the raw counter data from the kernel, allowing further processing to be carried out by another program. diff --git a/tools/dmsetup.c b/tools/dmsetup.c index c5be193..6e75e28 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -3376,6 +3376,39 @@ static int _dm_stats_aux_data_disp(struct dm_report *rh, return dm_report_field_string(rh, field, (const char * const*) &aux_data); } +static int _dm_stats_sample_interval_ns_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + /* FIXME: use internal interval estimate when supported by libdm */ + return dm_report_field_uint64(rh, field, &_last_interval); +} + +static int _dm_stats_sample_interval_disp(struct dm_report *rh, + struct dm_pool *mem __attribute__((unused)), + struct dm_report_field *field, const void *data, + void *private __attribute__((unused))) +{ + char buf[64]; + char *repstr; + double *sortval; + + if (!(sortval = dm_pool_alloc(mem, sizeof(*sortval)))) + return_0; + + *sortval = (double)_last_interval / (double) NSEC_PER_SEC; + + if (!dm_snprintf(buf, sizeof(buf), "%2.6f", *sortval)) + return_0; + + if (!(repstr = dm_pool_strdup(mem, buf))) + return_0; + + dm_report_field_set_value(field, repstr, sortval); + return 1; +} + static int _dm_stats_rrqm_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)), struct dm_report_field *field, const void *data, @@ -3917,6 +3950,8 @@ FIELD_F(STATS, SIZ, "ASize", 5, dm_stats_area_len, "area_len", "Area length.") FIELD_F(STATS, NUM, "#Areas", 6, dm_stats_area_count, "area_count", "Area count.") FIELD_F(STATS, STR, "ProgID", 6, dm_stats_program_id, "program_id", "Program ID.") FIELD_F(STATS, STR, "AuxDat", 6, dm_stats_aux_data, "aux_data", "Auxiliary data.") +FIELD_F(STATS, NUM, "IntervalNSec", 10, dm_stats_sample_interval_ns, "interval_ns", "Sampling interval in nanoseconds.") +FIELD_F(STATS, NUM, "Interval", 8, dm_stats_sample_interval, "interval", "Sampling interval.") /* Stats derived metrics */ FIELD_F(STATS, NUM, "RRqM/s", 8, dm_stats_rrqm, "rrqm", "Read requests merged per second.")

1 0

master - libdm: do not in include internal bits/time.h header
by Bryn Reeves 14 Aug '15

14 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4534f0fbcf6b83d2… Commit: 4534f0fbcf6b83d29baf4af78f9027ff76fe0a7a Parent: 6a93206882cb628a88dbd372d36dc8fc8cc5053a Author: Natanael Copa <ncopa(a)alpinelinux.org> AuthorDate: Fri Aug 14 11:32:36 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Fri Aug 14 11:33:12 2015 +0100 libdm: do not in include internal bits/time.h header Do not include bits/time.h as it is an internal libc header file. A comment at the top of the glibc specific bits/time.h says: "Never include this file directly; use <time.h> instead." This fixes the following build error with musl libc: libdm-timestamp.c:37:23: fatal error: bits/time.h: No such file or directory --- Compile tested with Alpine Linx (musl libc) and ubuntu 15.04 libdm/libdm-timestamp.c | 1 - 1 file changed, 1 deletion(-) --- libdm/libdm-timestamp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libdm/libdm-timestamp.c b/libdm/libdm-timestamp.c index 3e01442..9be93a4 100644 --- a/libdm/libdm-timestamp.c +++ b/libdm/libdm-timestamp.c @@ -34,7 +34,6 @@ #ifdef HAVE_REALTIME #include <time.h> -#include <bits/time.h> struct dm_timestamp { struct timespec t;

1 0

master - dmsetup: Fix dmsetup return code.
by Alasdair Kergon 14 Aug '15

14 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6a93206882cb628a… Commit: 6a93206882cb628a88dbd372d36dc8fc8cc5053a Parent: 043fb32c4b67d1456a77ab7caf0d077f419fae88 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Aug 14 00:09:40 2015 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Aug 14 00:09:40 2015 +0100 dmsetup: Fix dmsetup return code. --- tools/dmsetup.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index b3820fe..c5be193 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -5832,7 +5832,7 @@ static int _do_report_wait(void) int main(int argc, char **argv) { - int r = 1; + int ret = 1, r; const char *dev_dir; const struct command *cmd; const char *subcommand = NULL; @@ -5975,9 +5975,12 @@ doit: } if (!r) - break; + goto_out; } while (--_count); + /* Success */ + ret = 0; + out: if (_report) dm_report_free(_report); @@ -5990,5 +5993,5 @@ out: if (_initial_timestamp) dm_timestamp_destroy(_initial_timestamp); - return r; + return ret; }

1 0

master - dmsetup: Restructure arg handling.
by Alasdair Kergon 13 Aug '15

13 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=043fb32c4b67d145… Commit: 043fb32c4b67d1456a77ab7caf0d077f419fae88 Parent: b3cd5d294503fcfa4b826456e17071a909d739e1 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Aug 13 22:30:39 2015 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Aug 13 22:30:39 2015 +0100 dmsetup: Restructure arg handling. Introduce enums and global variables to record cleanly which command we are processing and eliminate the historically inconsistent use of the shifted argv[0] and fix assorted bugs discovered along the way. Add dm_report_is_empty() to indicate there is no data awaiting output and use this to suppress dmsetup report headings when no data is output so we don't get a stray line saying 'Help' at the end of reporting help. Define a report type (as the interface requires) so -o all selects the right fields in splitname. (A fix for stats list will follow.) Exit immediately if no device is supplied to dmsetup wipe_table instead of hitting errors later and failing. Adjust the command name printed in usage/help output to match command invoked (most of the time). --- WHATS_NEW_DM | 6 + libdm/.exported_symbols.DM_1_02_105 | 1 + libdm/libdevmapper.h | 5 + libdm/libdm-report.c | 5 + tools/dmsetup.c | 400 +++++++++++++++++++++-------------- 5 files changed, 256 insertions(+), 161 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 45db0e4..f3b62b1 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,11 @@ Version 1.02.105 - =================================== + Exit immediately if no device is supplied to dmsetup wipe_table. + Suppress dmsetup report headings when no data is output. (1.02.104) + Adjust dmsetup usage/help output selection to match command invoked. + Fix dmsetup -o all to select correct fields in splitname report. + Restructure internal dmsetup argument handling across all commands. + Add dm_report_is_empty() to indicate there is no data awaiting output. Add more arg validation for dm_tree_node_add_cache_target(). Add --alldevices switch to replace use of --force for stats create / delete. diff --git a/libdm/.exported_symbols.DM_1_02_105 b/libdm/.exported_symbols.DM_1_02_105 new file mode 100644 index 0000000..9b701f1 --- /dev/null +++ b/libdm/.exported_symbols.DM_1_02_105 @@ -0,0 +1 @@ +dm_report_is_empty diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 192fd0f..303ed67 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -2396,6 +2396,11 @@ int dm_report_object_is_selected(struct dm_report *rh, void *object, int do_outp */ int dm_report_compact_fields(struct dm_report *rh); +/* + * Returns 1 if there is no data waiting to be output. + */ +int dm_report_is_empty(struct dm_report *rh); + int dm_report_output(struct dm_report *rh); /* diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c index 17a7e13..84b1294 100644 --- a/libdm/libdm-report.c +++ b/libdm/libdm-report.c @@ -4305,6 +4305,11 @@ static int _output_as_columns(struct dm_report *rh) return 0; } +int dm_report_is_empty(struct dm_report *rh) +{ + return dm_list_empty(&rh->rows) ? 1 : 0; +} + int dm_report_output(struct dm_report *rh) { if (dm_list_empty(&rh->rows)) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 1dcc7e3..b3820fe 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -108,10 +108,46 @@ extern char *optarg; /* program_id used for dmstats-managed statistics regions */ #define DM_STATS_PROGRAM_ID "dmstats" +/* + * Basic commands this code implments. + */ +typedef enum { + DMSETUP_CMD = 0, + LOSETUP_CMD = 1, + DMLOSETUP_CMD = 2, + DMSTATS_CMD = 3, + DMSETUP_STATS_CMD = 4, + DEVMAP_NAME_CMD = 5 +} cmd_name_t; + +typedef enum { + DMSETUP_TYPE = 0, + LOSETUP_TYPE = 1, + STATS_TYPE = 2, + DEVMAP_NAME_TYPE = 3 +} cmd_type_t; + #define DMSETUP_CMD_NAME "dmsetup" #define LOSETUP_CMD_NAME "losetup" #define DMLOSETUP_CMD_NAME "dmlosetup" #define DMSTATS_CMD_NAME "dmstats" +#define DMSETUP_STATS_CMD_NAME "dmsetup stats" +#define DEVMAP_NAME_CMD_NAME "devmap_name" + +static const struct { + cmd_name_t command; + const char name[14]; + cmd_type_t type; +} _base_commands[] = { + { DMSETUP_CMD, DMSETUP_CMD_NAME, DMSETUP_TYPE }, + { LOSETUP_CMD, LOSETUP_CMD_NAME, LOSETUP_TYPE }, + { DMLOSETUP_CMD, DMLOSETUP_CMD_NAME, LOSETUP_TYPE }, + { DMSTATS_CMD, DMSTATS_CMD_NAME, STATS_TYPE }, + { DMSETUP_STATS_CMD, DMSETUP_STATS_CMD_NAME, STATS_TYPE }, + { DEVMAP_NAME_CMD, DEVMAP_NAME_CMD_NAME, DEVMAP_NAME_TYPE }, +}; + +static const int _num_base_commands = DM_ARRAY_SIZE(_base_commands); /* * We have only very simple switches ATM. @@ -195,6 +231,8 @@ typedef enum { DN_MAP /* Map name (for dm devices only, equal to DN_BLK otherwise) */ } dev_name_t; +static cmd_name_t _base_command = DMSETUP_CMD; /* Default command is 'dmsetup' */ +static cmd_type_t _base_command_type = DMSETUP_TYPE; static int _switches[NUM_SWITCHES]; static int _int_args[NUM_SWITCHES]; static char *_string_args[NUM_SWITCHES]; @@ -202,7 +240,8 @@ static int _num_devices; static char *_uuid; static char *_table; static char *_target; -static char *_command; +static char *_command_to_exec; /* --exec <command> */ +static const char *_command; /* dmsetup <command> */ static uint32_t _read_ahead_flags; static uint32_t _udev_cookie; static int _udev_only; @@ -934,20 +973,20 @@ static int _load(CMD_ARGS) } if (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (argc == 1) { + if (!argc) { err("Please specify device.\n"); return 0; } - name = argv[1]; + name = argv[0]; argc--; argv++; - } else if (argc > 2) { + } else if (argc > 1) { err("Too many command line arguments.\n"); return 0; } - if (argc == 2) - file = argv[1]; + if (argc == 1) + file = argv[0]; if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) return 0; @@ -992,13 +1031,13 @@ static int _create(CMD_ARGS) uint32_t cookie = 0; uint16_t udev_flags = 0; - if (argc == 3) - file = argv[2]; + if (argc == 2) + file = argv[1]; if (!(dmt = dm_task_create(DM_DEVICE_CREATE))) return 0; - if (!dm_task_set_name(dmt, argv[1])) + if (!dm_task_set_name(dmt, argv[0])) goto out; if (_switches[UUID_ARG] && !dm_task_set_uuid(dmt, _uuid)) @@ -1128,7 +1167,7 @@ static int _do_rename(const char *name, const char *new_name, const char *new_uu static int _rename(CMD_ARGS) { - const char *name = (argc == 3) ? argv[1] : NULL; + const char *name = (argc == 2) ? argv[0] : NULL; return _switches[SETUUID_ARG] ? _do_rename(name, NULL, argv[argc - 1]) : _do_rename(name, argv[argc - 1], NULL); @@ -1152,22 +1191,22 @@ static int _message(CMD_ARGS) if (!_set_task_device(dmt, NULL, 0)) goto out; } else { - if (!_set_task_device(dmt, argv[1], 0)) + if (!_set_task_device(dmt, argv[0], 0)) goto out; argc--; argv++; } - sector = strtoull(argv[1], &endptr, 10); - if (*endptr || endptr == argv[1]) { + sector = strtoull(argv[0], &endptr, 10); + if (*endptr || endptr == argv[0]) { err("invalid sector"); goto out; } if (!dm_task_set_sector(dmt, sector)) goto out; - argc -= 2; - argv += 2; + argc--; + argv++; if (argc <= 0) err("No message supplied.\n"); @@ -1232,13 +1271,13 @@ static int _setgeometry(CMD_ARGS) if (!_set_task_device(dmt, NULL, 0)) goto out; } else { - if (!_set_task_device(dmt, argv[1], 0)) + if (!_set_task_device(dmt, argv[0], 0)) goto out; argc--; argv++; } - if (!dm_task_set_geometry(dmt, argv[1], argv[2], argv[3], argv[4])) + if (!dm_task_set_geometry(dmt, argv[0], argv[1], argv[2], argv[3])) goto out; if (_switches[NOOPENCOUNT_ARG] && !dm_task_no_open_count(dmt)) @@ -1267,8 +1306,8 @@ static int _splitname(CMD_ARGS) struct dmsetup_report_obj obj = { NULL }; int r; - if (!(obj.split_name = _get_split_name((argc == 3) ? argv[2] : "LVM", - argv[1], '\0'))) + if (!(obj.split_name = _get_split_name((argc == 2) ? argv[1] : "LVM", + argv[0], '\0'))) return_0; r = dm_report_object(_report, &obj); @@ -1308,7 +1347,7 @@ static int _udevflags(CMD_ARGS) "PRIMARY_SOURCE", 0}; - if (!(cookie = _get_cookie_value(argv[1]))) + if (!(cookie = _get_cookie_value(argv[0]))) return 0; flags = cookie >> DM_UDEV_FLAGS_SHIFT; @@ -1340,7 +1379,7 @@ static int _udevcomplete(CMD_ARGS) { uint32_t cookie; - if (!(cookie = _get_cookie_value(argv[1]))) + if (!(cookie = _get_cookie_value(argv[0]))) return 0; /* @@ -1465,7 +1504,7 @@ static int _udevcreatecookie(CMD_ARGS) static int _udevreleasecookie(CMD_ARGS) { - if (argv[1] && !(_udev_cookie = _get_cookie_value(argv[1]))) + if (argv[0] && !(_udev_cookie = _get_cookie_value(argv[0]))) return 0; if (!_udev_cookie) { @@ -1515,7 +1554,7 @@ static int _udevcomplete_all(CMD_ARGS) unsigned age = 0; time_t t; - if (argc == 2 && (sscanf(argv[1], "%u", &age) != 1)) { + if (argc == 1 && (sscanf(argv[0], "%u", &age) != 1)) { log_error("Failed to read age_in_minutes parameter."); return 0; } @@ -1713,17 +1752,17 @@ static int _simple(int task, const char *name, uint32_t event_nr, int display) static int _suspend(CMD_ARGS) { - return _simple(DM_DEVICE_SUSPEND, argc > 1 ? argv[1] : NULL, 0, 1); + return _simple(DM_DEVICE_SUSPEND, argc ? argv[0] : NULL, 0, 1); } static int _resume(CMD_ARGS) { - return _simple(DM_DEVICE_RESUME, argc > 1 ? argv[1] : NULL, 0, 1); + return _simple(DM_DEVICE_RESUME, argc ? argv[0] : NULL, 0, 1); } static int _clear(CMD_ARGS) { - return _simple(DM_DEVICE_CLEAR, argc > 1 ? argv[1] : NULL, 0, 1); + return _simple(DM_DEVICE_CLEAR, argc ? argv[0] : NULL, 0, 1); } static int _wait(CMD_ARGS) @@ -1731,16 +1770,16 @@ static int _wait(CMD_ARGS) const char *name = NULL; if (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (argc == 1) { + if (!argc) { err("No device specified."); return 0; } - name = argv[1]; + name = argv[0]; argc--, argv++; } return _simple(DM_DEVICE_WAITEVENT, name, - (argc > 1) ? (uint32_t) atoi(argv[argc - 1]) : 0, 1); + (argc) ? (uint32_t) atoi(argv[argc - 1]) : 0, 1); } static int _process_all(const struct command *cmd, const char *subcommand, int argc, char **argv, int silent, @@ -1833,7 +1872,7 @@ static int _error_device(CMD_ARGS) uint64_t size; int r = 0; - name = names ? names->name : argv[1]; + name = names ? names->name : argv[0]; size = _get_device_size(name); @@ -1875,7 +1914,7 @@ error: static int _remove(CMD_ARGS) { - if (_switches[FORCE_ARG] && argc > 1) { + if (_switches[FORCE_ARG] && argc) { /* * 'remove --force' option is doing 2 operations on the same device * this is not compatible with the use of --udevcookie/DM_UDEV_COOKIE. @@ -1886,7 +1925,7 @@ static int _remove(CMD_ARGS) (void) _error_device(cmd, NULL, argc, argv, NULL, 0); } - return _simple(DM_DEVICE_REMOVE, argc > 1 ? argv[1] : NULL, 0, 0); + return _simple(DM_DEVICE_REMOVE, argc ? argv[0] : NULL, 0, 0); } static int _count_devices(CMD_ARGS) @@ -1936,7 +1975,7 @@ static void _display_dev(struct dm_task *dmt, const char *name) static int _mknodes(CMD_ARGS) { - return dm_mknodes(argc > 1 ? argv[1] : NULL); + return dm_mknodes(argc ? argv[0] : NULL); } static int _exec_command(const char *name) @@ -1959,7 +1998,7 @@ static int _exec_command(const char *name) return 0; if (!argc) { - c = _command; + c = _command_to_exec; while (argc < ARGS_MAX) { while (*c && isspace(*c)) c++; @@ -2015,9 +2054,9 @@ static int _status(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) return _process_all(cmd, NULL, argc, argv, 0, _status); - name = argv[1]; + name = argv[0]; } if (!strcmp(cmd->name, "table")) @@ -2064,11 +2103,11 @@ static int _status(CMD_ARGS) (!target_type || strcmp(target_type, _target))) continue; if (ls_only) { - if (!_switches[EXEC_ARG] || !_command || + if (!_switches[EXEC_ARG] || !_command_to_exec || _switches[VERBOSE_ARG]) _display_dev(dmt, name); next = NULL; - } else if (!_switches[EXEC_ARG] || !_command || + } else if (!_switches[EXEC_ARG] || !_command_to_exec || _switches[VERBOSE_ARG]) { if (!matched && _switches[VERBOSE_ARG]) _display_info(dmt); @@ -2098,7 +2137,7 @@ static int _status(CMD_ARGS) if (multiple_devices && _switches[VERBOSE_ARG] && matched && !ls_only) printf("\n"); - if (matched && _switches[EXEC_ARG] && _command && !_exec_command(name)) + if (matched && _switches[EXEC_ARG] && _command_to_exec && !_exec_command(name)) goto out; r = 1; @@ -2154,9 +2193,9 @@ static int _info(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) return _process_all(cmd, NULL, argc, argv, 0, _info); - name = argv[1]; + name = argv[0]; } if (!(dmt = dm_task_create(DM_DEVICE_INFO))) @@ -2198,9 +2237,9 @@ static int _deps(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) return _process_all(cmd, NULL, argc, argv, 0, _deps); - name = argv[1]; + name = argv[0]; } if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) @@ -3930,14 +3969,20 @@ static int _report_init(const struct command *cmd) size_t len = 0; int r = 0; - if (cmd && !strcmp(cmd->name, "splitname")) + if (cmd && !strcmp(cmd->name, "splitname")) { options = (char *) splitname_report_options; + _report_type |= DR_NAME; + } - if (cmd && !strcmp(cmd->name, "stats")) + if (cmd && !strcmp(cmd->name, "stats")) { options = (char *) _stats_default_report_options; + _report_type |= DR_STATS; + } - if (cmd && !strcmp(cmd->name, "list")) + if (cmd && !strcmp(cmd->name, "list")) { options = (char *) _stats_list_options; + _report_type |= DR_STATS; + } /* emulate old dmsetup behaviour */ if (_switches[NOHEADINGS_ARG]) { @@ -3962,10 +4007,12 @@ static int _report_init(const struct command *cmd) if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) { /* Count & interval forbidden for help. */ + /* FIXME Detect "help" correctly and exit */ if (strstr(_string_args[OPTIONS_ARG], "help")) { _switches[COUNT_ARG] = 0; _count = 1; _switches[INTERVAL_ARG] = 0; + headings = 0; } if (*_string_args[OPTIONS_ARG] != '+') @@ -4055,7 +4102,7 @@ out: static int _ls(CMD_ARGS) { if ((_switches[TARGET_ARG] && _target) || - (_switches[EXEC_ARG] && _command)) + (_switches[EXEC_ARG] && _command_to_exec)) return _status(cmd, NULL, argc, argv, NULL, 0); else if ((_switches[TREE_ARG])) return _display_tree(cmd, NULL, 0, NULL, NULL, 0); @@ -4075,9 +4122,9 @@ static int _mangle(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) return _process_all(cmd, NULL, argc, argv, 0, _mangle); - name = argv[1]; + name = argv[0]; } if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) @@ -4223,9 +4270,9 @@ static int _stats_clear(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) return _process_all(cmd, subcommand, argc, argv, 0, _stats_clear); - name = argv[1]; + name = argv[0]; } region_id = (allregions) ? DM_STATS_REGIONS_ALL @@ -4418,7 +4465,7 @@ static int _stats_create(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { if (!_switches[ALL_DEVICES_ARG]) { log_error("Please specify device(s) or use " "--alldevices."); @@ -4426,7 +4473,7 @@ static int _stats_create(CMD_ARGS) } return _process_all(cmd, subcommand, argc, argv, 0, _stats_create); } - name = argv[1]; + name = argv[0]; } if (_switches[AREAS_ARG]) @@ -4506,7 +4553,7 @@ static int _stats_delete(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { if (!_switches[ALL_DEVICES_ARG]) { log_error("Please specify device(s) or use " "--alldevices."); @@ -4514,7 +4561,7 @@ static int _stats_delete(CMD_ARGS) } return _process_all(cmd, subcommand, argc, argv, 0, _stats_delete); } - name = argv[1]; + name = argv[0]; } if (_switches[ALL_PROGRAMS_ARG]) @@ -4565,9 +4612,9 @@ static int _stats_list(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) return _process_all(cmd, subcommand, argc, argv, 0, _stats_list); - name = argv[1]; + name = argv[0]; } if (_switches[PROGRAM_ID_ARG]) @@ -4661,9 +4708,9 @@ static int _stats_print(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) return _process_all(cmd, subcommand, argc, argv, 0, _stats_print); - name = argv[1]; + name = argv[0]; } region_id = (uint64_t) _int_args[REGION_ID_ARG]; @@ -4720,9 +4767,9 @@ static int _stats_report(CMD_ARGS) if (names) name = names->name; else { - if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) + if (!argc && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) return _process_all(cmd, subcommand, argc, argv, 0, _info); - name = argv[1]; + name = argv[0]; } if (!(dmt = dm_task_create(DM_DEVICE_INFO))) @@ -4811,7 +4858,7 @@ static struct command _dmsetup_commands[] = { {"load", "<device> [<table_file>]", 0, 2, 0, 0, _load}, {"clear", "<device>", 0, -1, 1, 0, _clear}, {"reload", "<device> [<table_file>]", 0, 2, 0, 0, _load}, - {"wipe_table", "<device>", 0, -1, 1, 0, _error_device}, + {"wipe_table", "<device>", 1, -1, 1, 0, _error_device}, {"rename", "<device> [--setuuid] <new_name_or_uuid>", 1, 2, 0, 0, _rename}, {"message", "<device> <sector> <message>", 2, -1, 0, 0, _message}, {"ls", "[--target <target_type>] [--exec <command>] [-o options] [--tree]", 0, 0, 0, 0, _ls}, @@ -4840,22 +4887,30 @@ static struct command _dmsetup_commands[] = { * Usage and help text. */ +static void _devmap_name_usage(FILE *out) +{ + fprintf(out, "Usage: " DEVMAP_NAME_CMD_NAME " <major> <minor>\n\n"); +} + static void _stats_usage(FILE *out) { int i; - fprintf(out, "Usage:\n"); - fprintf(out, "stats [-h|--help]\n"); + fprintf(out, "Usage:\n\n"); + fprintf(out, "%s\n", _base_commands[_base_command].name); + fprintf(out, " [-h|--help]\n"); fprintf(out, " [-v|--verbose [-v|--verbose ...]]\n"); fprintf(out, " [--areas <nr_areas>] [--areasize <size>]\n"); fprintf(out, " [--auxdata <data>] [--clear]\n"); fprintf(out, " [--count <count>] [--interval <seconds>]\n"); fprintf(out, " [-o <fields>] [-O|--sort <sort_fields>]\n"); - fprintf(out, " [--programid <id>]\n"); + fprintf(out, " [--programid <id>]\n"); fprintf(out, " [--start <start>] [--length <length>]\n"); fprintf(out, " [--segments] [--units <units>]\n\n"); + for (i = 0; _stats_subcommands[i].name; i++) fprintf(out, "\t%s %s\n", _stats_subcommands[i].name, _stats_subcommands[i].help); + fprintf(out, "<device> may be device name or -u <uuid> or " "-j <major> -m <minor>\n"); fprintf(out, "<fields> are comma-separated. Use 'help -c' for list.\n"); @@ -4867,7 +4922,8 @@ static void _dmsetup_usage(FILE *out) int i; fprintf(out, "Usage:\n\n"); - fprintf(out, DMSETUP_CMD_NAME " [--version] [-h|--help [-c|-C|--columns]]\n" + fprintf(out, "%s\n" + " [--version] [-h|--help [-c|-C|--columns]]\n" " [-v|--verbose [-v|--verbose ...]]\n" " [--checks] [--manglename <mangling_mode>]\n" " [-r|--readonly] [--noopencount] [--nolockfs] [--inactive]\n" @@ -4875,9 +4931,12 @@ static void _dmsetup_usage(FILE *out) " [-y|--yes] [--readahead [+]<sectors>|auto|none] [--retry]\n" " [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n" " [-S|--select <selection>] [--nameprefixes] [--noheadings]\n" - " [--separator <separator>]\n\n"); + " [--separator <separator>]\n\n", + _base_commands[_base_command].name); + for (i = 0; _dmsetup_commands[i].name; i++) fprintf(out, "\t%s %s\n", _dmsetup_commands[i].name, _dmsetup_commands[i].help); + fprintf(out, "\n<device> may be device name or -u <uuid> or " "-j <major> -m <minor>\n"); fprintf(out, "<mangling_mode> is one of 'none', 'auto' and 'hex'.\n"); @@ -4892,23 +4951,30 @@ static void _dmsetup_usage(FILE *out) static void _losetup_usage(FILE *out) { fprintf(out, "Usage:\n\n"); - fprintf(out, LOSETUP_CMD_NAME " [-d|-a] [-e encryption] " - "[-o offset] [-f|loop_device] [file]\n\n"); + fprintf(out, "%s [-d|-a] [-e encryption] " + "[-o offset] [-f|loop_device] [file]\n\n", + _base_commands[_base_command].name); } -static int _stats_help(CMD_ARGS) +static void _usage(FILE *out) { - _stats_usage(stderr); + switch (_base_commands[_base_command].type) { + case DMSETUP_TYPE: + return _dmsetup_usage(out); + case LOSETUP_TYPE: + return _losetup_usage(out); + case STATS_TYPE: + return _stats_usage(out); + case DEVMAP_NAME_TYPE: + return _devmap_name_usage(out); + } +} - /** - * main() increments this to ensure reports are set up for - * stats use so decrement that count here; if the counter is - * still non-zero then the user explicitly requested the - * columns help output. - */ - _switches[COLS_ARG]--; +static int _stats_help(CMD_ARGS) +{ + _usage(stderr); - if (_switches[COLS_ARG]) { + if (_switches[COLS_ARG] || (argc && !strcmp(argv[0], "report"))) { _switches[OPTIONS_ARG] = 1; _string_args[OPTIONS_ARG] = (char *) "help"; _switches[SORT_ARG] = 0; @@ -4917,19 +4983,20 @@ static int _stats_help(CMD_ARGS) dm_report_free(_report); _report = NULL; } + (void) _report_init(cmd); + if (_report) { + dm_report_free(_report); + _report = NULL; + } } - /* help text already output: don't repeat from main */ - dm_report_free(_report); - _report = NULL; - return 1; } static int _dmsetup_help(CMD_ARGS) { - _dmsetup_usage(stderr); + _usage(stderr); if (_switches[COLS_ARG]) { _switches[OPTIONS_ARG] = 1; @@ -4941,6 +5008,10 @@ static int _dmsetup_help(CMD_ARGS) _report = NULL; } (void) _report_init(cmd); + if (_report) { + dm_report_free(_report); + _report = NULL; + } } return 1; @@ -4972,11 +5043,6 @@ static int _stats(CMD_ARGS) { const struct command *stats_cmd; - if (_switches[HELP_ARG]) { - stats_cmd = _find_stats_subcommand("help"); - goto doit; - } - if (!(stats_cmd = _find_stats_subcommand(subcommand))) { log_error("Unknown stats command."); _stats_help(stats_cmd, NULL, argc, argv, NULL, multiple_devices); @@ -4993,7 +5059,6 @@ static int _stats(CMD_ARGS) return 0; } -doit: if (!stats_cmd->fn(stats_cmd, NULL, argc, argv, NULL, multiple_devices)) return 0; @@ -5249,29 +5314,29 @@ static int _process_losetup_switches(const char *base, int *argcp, char ***argvp if (!*argcp) { fprintf(stderr, "%s: Please specify loop_device.\n", base); - _losetup_usage(stderr); + _usage(stderr); return 0; } if (!(device_name = parse_loop_device_name((*argvp)[0], dev_dir))) { fprintf(stderr, "%s: Could not parse loop_device %s\n", base, (*argvp)[0]); - _losetup_usage(stderr); + _usage(stderr); return 0; } if (delete) { - *argcp = 2; + *argcp = 1; - (*argvp)[1] = device_name; - (*argvp)[0] = (char *) "remove"; + (*argvp)[0] = device_name; + _command = "remove"; return 1; } if (*argcp != 2) { fprintf(stderr, "%s: Too few arguments\n", base); - _losetup_usage(stderr); + _usage(stderr); dm_free(device_name); return 0; } @@ -5280,7 +5345,7 @@ static int _process_losetup_switches(const char *base, int *argcp, char ***argvp if (!(loop_file = _get_abspath((*argvp)[(find) ? 0 : 1]))) { fprintf(stderr, "%s: Could not parse loop file name %s\n", base, (*argvp)[1]); - _losetup_usage(stderr); + _usage(stderr); dm_free(device_name); return 0; } @@ -5294,8 +5359,9 @@ static int _process_losetup_switches(const char *base, int *argcp, char ***argvp } _switches[TABLE_ARG]++; - (*argvp)[0] = (char *) "create"; - (*argvp)[1] = device_name ; + _command = "create"; + (*argvp)[0] = device_name ; + *argcp = 1; return 1; } @@ -5349,9 +5415,7 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) const char *base; char *namebase, *s; static int ind; - int c, r; - /* "stats" command and sub-command when run as 'dmstats'. */ - char *stats_p = NULL, *stats_c = NULL; + int c, r, i; #ifdef HAVE_GETOPTLONG static struct option long_options[] = { @@ -5432,10 +5496,21 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) fprintf(stderr, "Failed to duplicate name.\n"); return 0; } + base = dm_basename(namebase); - if (!strcmp(base, "devmap_name")) { - free(namebase); + i = 0; + do { + if (!strcmp(base, _base_commands[i].name)) { + _base_command = _base_commands[i].command; + _base_command_type = _base_commands[i].type; + break; + } + } while (++i < _num_base_commands); + + free(namebase); + + if (_base_command_type == DEVMAP_NAME_TYPE) { _switches[COLS_ARG]++; _switches[NOHEADINGS_ARG]++; _switches[OPTIONS_ARG]++; @@ -5455,28 +5530,22 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) *argcp -= 1; *argvp += 1; } else { - fprintf(stderr, "Usage: devmap_name <major> <minor>\n"); + _usage(stderr); return 0; } - (*argvp)[0] = (char *) "info"; + _command = "info"; + (*argvp)++; + (*argcp)--; + return 1; } - if (!strcmp(base, LOSETUP_CMD_NAME) || !strcmp(base, DMLOSETUP_CMD_NAME)){ - r = _process_losetup_switches(base, argcp, argvp, dev_dir); - free(namebase); + if (_base_command_type == LOSETUP_TYPE) { + r = _process_losetup_switches(_base_commands[_base_command].name, argcp, argvp, dev_dir); return r; } - if (!strcmp(base, DMSTATS_CMD_NAME)) { - /* save the offset to the 'stats' in 'dmstats' */ - stats_p = (*argvp)[0] + strlen(namebase) - strlen(base) + 2; - stats_c = (*argvp)[1]; /* stats command */ - } - - free(namebase); - optarg = 0; optind = OPTIND_INIT; while ((ind = -1, c = GETOPTLONG_FN(*argcp, *argvp, "cCfG:hj:m:M:no:O:rS:u:U:vy", @@ -5608,7 +5677,7 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) _switches[DEFERRED_ARG]++; if (ind == EXEC_ARG) { _switches[EXEC_ARG]++; - _command = optarg; + _command_to_exec = optarg; } if (ind == TARGET_ARG) { _switches[TARGET_ARG]++; @@ -5725,12 +5794,20 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) *argvp += optind; *argcp -= optind; - /* preserve sub-command in argv[0] */ - if (stats_p) { - (*argvp)--; - (*argcp)++; - (*argvp)[0] = stats_p; - (*argvp)[1] = stats_c; + if (!*argcp) + _command = NULL; + else if (!strcmp((*argvp)[0], "stats")) { + _base_command = DMSETUP_STATS_CMD; + _base_command_type = STATS_TYPE; + _command = "stats"; + (*argvp)++; + (*argcp)--; + } else if (_base_command == DMSTATS_CMD) { + _command = "stats"; + } else if (*argcp) { + _command = (*argvp)[0]; + (*argvp)++; + (*argcp)--; } return 1; @@ -5738,15 +5815,14 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) static int _perform_command_for_all_repeatable_args(CMD_ARGS) { - /* FIXME Shift args to remove argv[0] that fn is not allowed to access? */ do { - if (!cmd->fn(cmd, subcommand, argc--, argv++, NULL, multiple_devices)) { + if (!cmd->fn(cmd, subcommand, argc, argv++, NULL, multiple_devices)) { fprintf(stderr, "Command failed\n"); - return 1; + return 0; } - } while (cmd->repeatable_cmd && argc > 1); + } while (cmd->repeatable_cmd && argc-- > 1); - return 0; + return 1; } static int _do_report_wait(void) @@ -5778,50 +5854,54 @@ int main(int argc, char **argv) goto out; } - /* let stats do its own --help handling. */ - if (_switches[HELP_ARG] && strcmp("stats", argv[0])) { - if ((cmd = _find_dmsetup_command("help"))) - goto doit; - goto unknown; + if (_switches[HELP_ARG]) { + switch (_base_command_type) { + case STATS_TYPE: + if ((cmd = _find_stats_subcommand("help"))) + goto doit; + goto unknown; + default: + if ((cmd = _find_dmsetup_command("help"))) + goto doit; + goto unknown; + } } if (_switches[VERSION_ARG]) { - if ((cmd = _find_dmsetup_command("version"))) - goto doit; - goto unknown; + switch (_base_command_type) { + case STATS_TYPE: + if ((cmd = _find_stats_subcommand("version"))) + goto doit; + goto unknown; + default: + if ((cmd = _find_dmsetup_command("version"))) + goto doit; + goto unknown; + } } - if (argc == 0) { - _dmsetup_usage(stderr); + if (!_command) { + _usage(stderr); goto out; } - if (!(cmd = _find_dmsetup_command(argv[0]))) { + if (!(cmd = _find_dmsetup_command(_command))) { unknown: fprintf(stderr, "Unknown command\n"); - _dmsetup_usage(stderr); + _usage(stderr); goto out; } - if (argc < cmd->min_args + 1 || - (cmd->max_args >= 0 && argc > cmd->max_args + 1)) { + if (argc < cmd->min_args || + (cmd->max_args >= 0 && argc > cmd->max_args)) { fprintf(stderr, "Incorrect number of arguments\n"); - if (!strcmp(cmd->name, "stats")) - _stats_usage(stderr); - else - _dmsetup_usage(stderr); + _usage(stderr); goto out; } if (!_switches[COLS_ARG] && !strcmp(cmd->name, "splitname")) _switches[COLS_ARG]++; - /** - * Unconditionally increment for "stats" commands; the only - * command to not require this is non-columns "stats help". - * In that case _stats_help will remove the extra count - * before displaying the help message. - */ if (!strcmp(cmd->name, "stats")) { _switches[COLS_ARG]++; if (!_switches[UNITS_ARG]) { @@ -5865,7 +5945,7 @@ unknown: * dmsetup <command> <subcommand> [args...] */ if (cmd->has_subcommands) { - subcommand = argv[1]; + subcommand = argv[0]; argc--, argv++; } @@ -5875,19 +5955,18 @@ unknown: goto_out; doit: - multiple_devices = (cmd->repeatable_cmd && argc != 2 && - (argc != 1 || (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]))); + multiple_devices = (cmd->repeatable_cmd && argc != 1 && + (argc || (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]))); do { r = _perform_command_for_all_repeatable_args(cmd, subcommand, argc, argv, NULL, multiple_devices); - if (_report) { /* only output headings for repeating reports */ - if (_int_args[COUNT_ARG] != 1) + if (_int_args[COUNT_ARG] != 1 && !dm_report_is_empty(_report)) dm_report_column_headings(_report); dm_report_output(_report); - if (_count > 1) { + if (_count > 1 && r) { printf("\n"); /* wait for --interval and update timestamps */ if (!_do_report_wait()) @@ -5895,12 +5974,11 @@ doit: } } - if (r) + if (!r) break; } while (--_count); out: - if (_report) dm_report_free(_report);

1 0

master - dmstats: do not use "region_id" in error messages
by Bryn Reeves 13 Aug '15

13 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b3cd5d294503fcfa… Commit: b3cd5d294503fcfa4b826456e17071a909d739e1 Parent: 6b81ac5807bdbfdd0063db4f53cc6d310c2fe4fc Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Aug 13 18:12:56 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Aug 13 19:05:48 2015 +0100 dmstats: do not use "region_id" in error messages Refer to either '--regionid' or '--allregions' when the user fails to specify either a single region ID or the --allregions switch. --- tools/dmsetup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 20ab3a0..1dcc7e3 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -4216,7 +4216,7 @@ static int _stats_clear(CMD_ARGS) } if (!_switches[REGION_ID_ARG] && !_switches[ALL_REGIONS_ARG]) { - err("Please specify a region_id."); + err("Please specify a --regionid or use --allregions."); return 0; } @@ -4499,7 +4499,7 @@ static int _stats_delete(CMD_ARGS) } if (!_switches[REGION_ID_ARG] && !allregions) { - err("Please specify a region_id."); + err("Please specify a --regionid or use --allregions."); return 0; } @@ -4654,7 +4654,7 @@ static int _stats_print(CMD_ARGS) } if (!_switches[REGION_ID_ARG] && !allregions) { - err("Please specify a region_id."); + err("Please specify a --regionid or use --allregions."); return 0; }

1 0

master - dmstats: replace --force with new stats-specific --alldevices
by Bryn Reeves 13 Aug '15

13 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6b81ac5807bdbfdd… Commit: 6b81ac5807bdbfdd0063db4f53cc6d310c2fe4fc Parent: 988ca743519839b283ebdbaaf06243cb0541b935 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Aug 13 14:42:55 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Aug 13 19:05:46 2015 +0100 dmstats: replace --force with new stats-specific --alldevices The '--force' switch is only used by dmstats to allow either creation or deletion of one or more regions on all devices. These operations do not carry any risk: just a possible mess of region IDs to be cleaned up. Remove the use of '--force' for stats commands and change current uses to a new '--alldevices' switch. --- WHATS_NEW_DM | 1 + man/dmstats.8.in | 16 +++++++++++----- tools/dmsetup.c | 16 ++++++++++------ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index a72d3e0..45db0e4 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,6 +1,7 @@ Version 1.02.105 - =================================== Add more arg validation for dm_tree_node_add_cache_target(). + Add --alldevices switch to replace use of --force for stats create / delete. Version 1.02.104 - 10th August 2015 =================================== diff --git a/man/dmstats.8.in b/man/dmstats.8.in index c5ef47f..3b9f032 100644 --- a/man/dmstats.8.in +++ b/man/dmstats.8.in @@ -27,6 +27,7 @@ dmstats \(em device-mapper statistics management .br .B dmstats create .I device_name +.RB [ \-\-alldevices ] .RB [[ \-\-areas .IR nr_areas ] .RB |[ \-\-areasize @@ -43,7 +44,7 @@ dmstats \(em device-mapper statistics management .br .B dmstats delete .I device_name -.RB [ \-\-force ] +.RB [ \-\-alldevices ] .RB [ \-\-allregions .RB | \-\-regionid .IR id ] @@ -115,10 +116,14 @@ when run as 'dmsetup stats'. When no device argument is given dmstats will by default operate on all device-mapper devices present. The \fBcreate\fP and \fBdelete\fP -commands require the use of \fB--force\fP when used in this way. +commands require the use of \fB--alldevices\fP when used in this way. .SH OPTIONS .TP +.B \-\-alldevices +If no device arguments are given allow operation on all devices when +creating or deleting regions. +.TP .B \-\-allprograms Include regions from all program IDs for list and report operations. .TP @@ -267,7 +272,7 @@ stdout. .TP .B delete .I [ device_name ] -.RB [ \-\-force ] +.RB [ \-\-alldevices ] .RB [ \-\-allregions .RB | \-\-regionid .IR id ] @@ -282,7 +287,8 @@ of subsequent list, print, or report operations. All regions registered on a device may be removed using \fB\-\-allregions\fP. -To remove all regions on all devices \fB\-\-force\fP must be used. +To remove all regions on all devices both \fB--allregions\fP and +\fB\-\-alldevices\fP must be used. .br .TP .B help @@ -601,7 +607,7 @@ Created region: 0 Delete all regions on all devices .br .br -# dmstats delete --allregions --force +# dmstats delete --alldevices --allregions .br .br diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 420e263..20ab3a0 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -120,6 +120,7 @@ enum { READ_ONLY = 0, ADD_NODE_ON_CREATE_ARG, ADD_NODE_ON_RESUME_ARG, + ALL_DEVICES_ARG, ALL_PROGRAMS_ARG, ALL_REGIONS_ARG, AREAS_ARG, @@ -4418,9 +4419,9 @@ static int _stats_create(CMD_ARGS) name = names->name; else { if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (!_switches[FORCE_ARG]) { - log_error("Creating regions on all devices " - "requires --force."); + if (!_switches[ALL_DEVICES_ARG]) { + log_error("Please specify device(s) or use " + "--alldevices."); return 0; } return _process_all(cmd, subcommand, argc, argv, 0, _stats_create); @@ -4506,9 +4507,9 @@ static int _stats_delete(CMD_ARGS) name = names->name; else { if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG]) { - if (!_switches[FORCE_ARG]) { - log_error("Deleting regions from all devices " - "requires --force."); + if (!_switches[ALL_DEVICES_ARG]) { + log_error("Please specify device(s) or use " + "--alldevices."); return 0; } return _process_all(cmd, subcommand, argc, argv, 0, _stats_delete); @@ -5355,6 +5356,7 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) #ifdef HAVE_GETOPTLONG static struct option long_options[] = { {"readonly", 0, &ind, READ_ONLY}, + {"alldevices", 0, &ind, ALL_DEVICES_ARG}, {"allprograms", 0, &ind, ALL_PROGRAMS_ARG}, {"allregions", 0, &ind, ALL_REGIONS_ARG}, {"areas", 1, &ind, AREAS_ARG}, @@ -5479,6 +5481,8 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) optind = OPTIND_INIT; while ((ind = -1, c = GETOPTLONG_FN(*argcp, *argvp, "cCfG:hj:m:M:no:O:rS:u:U:vy", long_options, NULL)) != -1) { + if (ind == ALL_DEVICES_ARG) + _switches[ALL_DEVICES_ARG]++; if (ind == ALL_PROGRAMS_ARG) _switches[ALL_PROGRAMS_ARG]++; if (ind == ALL_REGIONS_ARG)

1 0

master - dmstats: improve region creation messages
by Bryn Reeves 13 Aug '15

13 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=988ca743519839b2… Commit: 988ca743519839b283ebdbaaf06243cb0541b935 Parent: 86adb6ca63358ca09d3a886915f30fcec997787f Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Aug 13 12:42:35 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Aug 13 19:05:45 2015 +0100 dmstats: improve region creation messages The region creation message just outputs the new region_id, e.g.: Created region: 0 This is fine when the device is unambigous (as above) but produces unhelpful output when creating multiple regions, or regions on multiple devices: Created region: 0 Created region: 0 Created region: 1 Created region: 2 Created region: 0 To address this refactor _stats_create_segments() (previously only used when creating one-region-per-target for --segments) into a more general _do_stats_create_regions() that can create regions for each segment, or a single region spanning either the entire device or a specied start/len range. This allows us to output all region creation messages from a single point where both the device name and all information needed to derive the number of areas is available. This allows us to log all these facts in the resulting messages: vg_hex-lv_home: Created new region with 13 area(s) as region ID 0 vg_hex-lv_home: Created new region with 4 area(s) as region ID 1 vg_hex-lv_home: Created new region with 1 area(s) as region ID 2 vg_hex-lv_swap: Created new region with 1 area(s) as region ID 0 vg_hex-lv_root: Created new region with 10 area(s) as region ID 0 luks-79733921-3f68-4c92-9eb7-d0aca4c6ba3e: Created new region with 17 area(s) as region ID 0 vg_hex-lv_images: Created new region with 20 area(s) as region ID 0 vg_hex-lv_images: Created new region with 4 area(s) as region ID 1 --- tools/dmsetup.c | 97 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 65 insertions(+), 32 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 3473244..420e263 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -4282,19 +4282,43 @@ static int _size_from_string(char *argptr, uint64_t *size, const char *name) return 1; } -static int _stats_create_segments(struct dm_stats *dms, - const char *name, int64_t step, - const char *program_id, const char *aux_data) +/* + * FIXME: expose this from libdm-stats + */ +static uint64_t _nr_areas_from_step(uint64_t len, int64_t step) { - uint64_t start, length, region_id = UINT64_C(0); + /* --areas */ + if (step < 0) + return (uint64_t)(-step); + + /* --areasize - cast step to unsigned as it cannot be -ve here. */ + return (len / (step ? : len)) + !!(len % (uint64_t) step); +} + +/* + * Create a single region starting at start and spanning len sectors, + * or, if the segments argument is no-zero create one region for each + * segment present in the mapped device. + */ +static int _do_stats_create_regions(struct dm_stats *dms, + const char *name, uint64_t start, + uint64_t len, int64_t step, + int segments, + const char *program_id, + const char *aux_data) +{ + uint64_t this_start = start, this_len = len, region_id = UINT64_C(0); char *target_type, *params; /* unused */ struct dm_task *dmt; struct dm_info info; void *next = NULL; const char *devname = NULL; + int r = 0; - if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) + if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) { + dm_stats_destroy(dms); return 0; + } if (!_set_task_device(dmt, name, 0)) goto out; @@ -4315,30 +4339,50 @@ static int _stats_create_segments(struct dm_stats *dms, goto out; do { - next = dm_get_next_target(dmt, next, &start, &length, + uint64_t segment_start, segment_len; + next = dm_get_next_target(dmt, next, &segment_start, &segment_len, &target_type, &params); - if (!dm_stats_create_region(dms, &region_id, start, length, - step, program_id, aux_data)) { - log_error("Could not create statistics region."); + + /* Accumulate whole-device size for nr_areas calculation. */ + if (!segments && !len) + this_len += segment_len; + + /* Segments or whole-device. */ + if (segments || !next) { + /* + * this_start and this_len hold the start and length in + * sectors of the to-be-created region: this is either the + * segment start/len (for --segments), the value of the + * --start/--length arguments, or 0/0 for a default + * whole-device region). + */ + this_start = (segments) ? segment_start : this_start; + this_len = (segments) ? segment_len : this_len; + if (!dm_stats_create_region(dms, &region_id, + this_start, this_len, step, + program_id, aux_data)) { + log_error("%s: Could not create statistics region.", + devname); + goto out; + } + + printf("%s: Created new region with "FMTu64" area(s) as " + "region ID "FMTu64"\n", devname, + _nr_areas_from_step(this_len, step), region_id); } - printf("Created region %"PRIu64" on %s\n", - region_id, devname); } while (next); - - dm_stats_destroy(dms); - dm_task_destroy(dmt); - return 1; + r = 1; out: dm_task_destroy(dmt); - return 0; + dm_stats_destroy(dms); + return r; } static int _stats_create(CMD_ARGS) { struct dm_stats *dms; const char *name, *aux_data = "", *program_id = DM_STATS_PROGRAM_ID; - uint64_t region_id; uint64_t start = 0, len = 0, areas = 0, area_size = 0; int64_t step = 0; @@ -4393,7 +4437,7 @@ static int _stats_create(CMD_ARGS) return 0; areas = (areas) ? areas : 1; - /* bytes to sectors or area count - promote to int before conversion */ + /* bytes to sectors or -(areas): promote to signed before conversion */ step = (area_size) ? ((int64_t) area_size / 512) : -((int64_t) areas); if (_switches[START_ARG]) { @@ -4430,20 +4474,9 @@ static int _stats_create(CMD_ARGS) /* force creation of a region with no id */ dm_stats_set_program_id(dms, 1, NULL); - if (_switches[SEGMENTS_ARG]) - return _stats_create_segments(dms, name, step, - program_id, aux_data); - - if (!dm_stats_create_region(dms, &region_id, start, len, - step, program_id, aux_data)) { - log_error("Could not create statistics region."); - goto out; - } - - /* FIXME: support --quiet and --export output modes */ - printf("Created region: %"PRIu64"\n", region_id); - dm_stats_destroy(dms); - return 1; + return _do_stats_create_regions(dms, name, start, len, step, + _switches[SEGMENTS_ARG], + program_id, aux_data); out: dm_stats_destroy(dms);

1 0

master - dmsetup: make timekeeping debug messages more readable
by Bryn Reeves 13 Aug '15

13 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=86adb6ca63358ca0… Commit: 86adb6ca63358ca09d3a886915f30fcec997787f Parent: b22b7d7ba9208c5ead5ea6d7353cd903ebb3c075 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Wed Aug 12 19:46:11 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Aug 13 19:05:45 2015 +0100 dmsetup: make timekeeping debug messages more readable Don't use cryptic abbreviations and make sure that all values can be understood by someone not familiar with the clock internals. Include the current interval number (inverse of the _count) in all interval update messages and attempt to align interval timestamp logs for interval counts < 99,999. --- tools/dmsetup.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 4a1a396..3473244 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -482,6 +482,14 @@ static void _destroy_split_name(struct dm_split_name *split_name) * _update_interval_times() - Update timestamps and interval estimate. */ +/* + * Return the current interval number counting upwards from one. + */ +static uint64_t _interval_num(void) +{ + return 1 + (uint64_t) _int_args[COUNT_ARG] - _count; +} + #if HAVE_SYS_TIMERFD_H static int _start_timerfd_timer(void) { @@ -639,7 +647,7 @@ static int _do_timer_wait(void) static int _update_interval_times(void) { static struct dm_timestamp *this_timestamp = NULL; - uint64_t delta_t; + uint64_t delta_t, interval_num = _interval_num(); int r = 0; /* @@ -697,7 +705,9 @@ static int _update_interval_times(void) _new_interval = 1; } - log_debug("Checking for interval end, dt="FMTu64, delta_t); + log_debug("Interval #%-4"PRIu64" time delta: %12" + PRIu64"ns", interval_num, delta_t); + if (_new_interval) { /* Update timestamp and interval and clear _new_interval */ dm_timestamp_copy(_cycle_timestamp, this_timestamp); @@ -708,14 +718,14 @@ static int _update_interval_times(void) _mean_interval = ((double) delta_t + _mean_interval) / 2.0; /* - * Log interval duration, mean interval, the last interval - * error and the difference between the mean and configured - * intervals. + * Log interval duration, mean duration and interval error. */ - log_debug("Ending interval, I="FMTu64" Imean=%f, Ierr="FMTi64 - ", Emean=%.2f", _last_interval, _mean_interval, - ((int64_t)_last_interval - (int64_t)_interval), - _mean_interval - (double) _interval); + log_debug("Interval #%-5"PRIu64" mean duration: %12.0fns, " + "current err: "FMTi64"ns", interval_num, + _mean_interval, ((int64_t)_last_interval + - (int64_t)_interval)); + log_debug("End interval #%-9"PRIu64" duration: %12"PRIu64"ns", + interval_num, _last_interval); } r = 1; @@ -785,7 +795,7 @@ static int _display_info_cols(struct dm_task *dmt, struct dm_info *info) /* Update timestamps and handle end-of-interval accounting. */ _update_interval_times(); - log_debug("Setting interval, I="FMTu64, _last_interval); + log_debug("Adjusted sample interval duration: %12"PRIu64"ns", _last_interval); /* use measured approximation for calculations */ dm_stats_set_sampling_interval_ns(obj.stats, _last_interval); }

1 0

master - dmsetup: Use #define for command names.
by Alasdair Kergon 13 Aug '15

13 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b22b7d7ba9208c5e… Commit: b22b7d7ba9208c5ead5ea6d7353cd903ebb3c075 Parent: 7995eedd3581407b030b0864202068b51dd1ef45 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Aug 13 13:10:23 2015 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Aug 13 13:10:23 2015 +0100 dmsetup: Use #define for command names. --- tools/dmsetup.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index dd2f153..4a1a396 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -108,6 +108,11 @@ extern char *optarg; /* program_id used for dmstats-managed statistics regions */ #define DM_STATS_PROGRAM_ID "dmstats" +#define DMSETUP_CMD_NAME "dmsetup" +#define LOSETUP_CMD_NAME "losetup" +#define DMLOSETUP_CMD_NAME "dmlosetup" +#define DMSTATS_CMD_NAME "dmstats" + /* * We have only very simple switches ATM. */ @@ -4818,7 +4823,7 @@ static void _dmsetup_usage(FILE *out) int i; fprintf(out, "Usage:\n\n"); - fprintf(out, "dmsetup [--version] [-h|--help [-c|-C|--columns]]\n" + fprintf(out, DMSETUP_CMD_NAME " [--version] [-h|--help [-c|-C|--columns]]\n" " [-v|--verbose [-v|--verbose ...]]\n" " [--checks] [--manglename <mangling_mode>]\n" " [-r|--readonly] [--noopencount] [--nolockfs] [--inactive]\n" @@ -4843,7 +4848,7 @@ static void _dmsetup_usage(FILE *out) static void _losetup_usage(FILE *out) { fprintf(out, "Usage:\n\n"); - fprintf(out, "losetup [-d|-a] [-e encryption] " + fprintf(out, LOSETUP_CMD_NAME " [-d|-a] [-e encryption] " "[-o offset] [-f|loop_device] [file]\n\n"); } @@ -5110,7 +5115,7 @@ static int _loop_table(char *table, size_t tlen, char *file, sectors = size >> SECTOR_SHIFT; if (_switches[VERBOSE_ARG]) - fprintf(stderr, "losetup: set loop size to %llukB " + fprintf(stderr, LOSETUP_CMD_NAME ": set loop size to %llukB " "(%llu sectors)\n", (long long unsigned) sectors >> 1, (long long unsigned) sectors); @@ -5413,13 +5418,13 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) return 1; } - if (!strcmp(base, "losetup") || !strcmp(base, "dmlosetup")){ + if (!strcmp(base, LOSETUP_CMD_NAME) || !strcmp(base, DMLOSETUP_CMD_NAME)){ r = _process_losetup_switches(base, argcp, argvp, dev_dir); free(namebase); return r; } - if (!strcmp(base, "dmstats")) { + if (!strcmp(base, DMSTATS_CMD_NAME)) { /* save the offset to the 'stats' in 'dmstats' */ stats_p = (*argvp)[0] + strlen(namebase) - strlen(base) + 2; stats_c = (*argvp)[1]; /* stats command */

1 0

master - dmstats: don't output column headings if report fails
by Bryn Reeves 12 Aug '15

12 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7995eedd3581407b… Commit: 7995eedd3581407b030b0864202068b51dd1ef45 Parent: 098528513f8c00d12f4ca5b5e87e4a932a6ef4f6 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Wed Aug 12 22:02:23 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Wed Aug 12 22:02:23 2015 +0100 dmstats: don't output column headings if report fails If _stats_report fails (e.g. due to an invalid device on the command line) destroy the _report to prevent stats columns headings from being displayed. This also requires a change in main to test the return from _perform_command_for_all_repeatable_args inside the interval loop and exit immediately in case of error. --- tools/dmsetup.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index e913a7e..dd2f153 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -4692,6 +4692,10 @@ static int _stats_report(CMD_ARGS) out: dm_task_destroy(dmt); + if (!r && _report) { + dm_report_free(_report); + _report = NULL; + } return r; } @@ -5838,6 +5842,9 @@ doit: goto_out; } } + + if (r) + break; } while (--_count); out:

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits August 2015