From: Goffredo Baroncelli <kreijack@libero.it>
To: linux-btrfs@vger.kernel.org
Cc: Hugo Mills <hugo@carfax.org.uk>
Subject: Re: [patch v2 3/4] Add an option to show ISO, binary or raw bytes counts using show.
Date: Fri, 22 Oct 2010 09:57:17 +0200 [thread overview]
Message-ID: <201010220957.17210.kreijack@libero.it> (raw)
In-Reply-To: <20101021190203.205680210@carfax.org.uk>
On Thursday, 21 October, 2010, Hugo Mills wrote:
> Change btrfs filesystem show to allow the user to control the scales
> used for sizes in the output.
>
> Signed-off-by: Hugo Mills <hugo@carfax.org.uk>
> ---
> btrfs.c | 2 +-
> btrfs_cmds.c | 45 ++++++++++++++++++++++++++++++++++++++-------
> man/btrfs.8.in | 10 ++++++++++
> 3 files changed, 49 insertions(+), 8 deletions(-)
>
> Index: btrfs-progs-unstable/btrfs.c
> ===================================================================
> --- btrfs-progs-unstable.orig/btrfs.c 2010-10-20 20:03:37.000000000 +0100
> +++ btrfs-progs-unstable/btrfs.c 2010-10-20 20:11:03.000000000 +0100
> @@ -83,7 +83,7 @@
> "will occupe all available space on the device."
> },
> { do_show_filesystem, 999,
> - "filesystem show", "[<uuid>|<label>]\n"
> + "filesystem show", "[options] [<uuid>|<label>]\n"
Please put explicitly the option like my other comments
> "Show the info of a btrfs filesystem. If no <uuid> or
<label>\n"
> "is passed, info of all the btrfs filesystem are shown."
> },
> Index: btrfs-progs-unstable/btrfs_cmds.c
> ===================================================================
> --- btrfs-progs-unstable.orig/btrfs_cmds.c 2010-10-20 20:03:37.000000000
+0100
> +++ btrfs-progs-unstable/btrfs_cmds.c 2010-10-20 20:08:00.000000000 +0100
> @@ -617,7 +617,7 @@
> return 0;
> }
>
> -static void print_one_uuid(struct btrfs_fs_devices *fs_devices)
> +static void print_one_uuid(struct btrfs_fs_devices *fs_devices, int format)
> {
> char uuidbuf[37];
> struct list_head *cur;
> @@ -634,8 +634,7 @@
> else
> printf("Label: none ");
>
> - super_bytes_used = pretty_sizes(device->super_bytes_used,
> -
PRETTY_SIZE_RAW);
> + super_bytes_used = pretty_sizes(device->super_bytes_used, format);
>
> total = device->total_devs;
> printf(" uuid: %s\n\tTotal devices %llu FS bytes used %s\n", uuidbuf,
> @@ -647,8 +646,8 @@
> char *total_bytes;
> char *bytes_used;
> device = list_entry(cur, struct btrfs_device, dev_list);
> - total_bytes = pretty_sizes(device->total_bytes,
PRETTY_SIZE_RAW);
> - bytes_used = pretty_sizes(device->bytes_used,
PRETTY_SIZE_RAW);
> + total_bytes = pretty_sizes(device->total_bytes, format);
> + bytes_used = pretty_sizes(device->bytes_used, format);
> printf("\tdevid %4llu size %s used %s path %s\n",
> (unsigned long long)device->devid,
> total_bytes, bytes_used, device->name);
> @@ -662,13 +661,45 @@
> printf("\n");
> }
>
> +const struct option show_options[] = {
> + { "human-readable", 0, NULL, 'h' },
> + { "si", 0, NULL, 'H' },
> + { NULL, 0, NULL, 0 }
> +};
> +
> int do_show_filesystem(int argc, char **argv)
> {
> struct list_head *all_uuids;
> struct btrfs_fs_devices *fs_devices;
> struct list_head *cur_uuid;
> - char *search = argv[1];
> + char *search;
> int ret;
> + int format = PRETTY_SIZE_RAW;
> +
> + optind = 1;
> + while(1) {
> + int c = getopt_long(argc, argv, "hH", show_options, NULL);
> + if (c < 0)
> + break;
> + switch(c) {
> + case 'h':
> + format = PRETTY_SIZE_BINARY;
> + break;
> + case 'H':
> + format = PRETTY_SIZE_ISO;
> + break;
> + default:
> + fprintf(stderr, "Invalid arguments for show\n");
> + free(argv);
> + return 1;
> + }
> + }
> + if (argc - optind > 1) {
> + fprintf(stderr, "Too many arguments for show\n");
> + free(argv);
> + return 1;
> + }
> + search = argv[optind];
>
> ret = btrfs_scan_one_dir("/dev", 0);
> if (ret){
> @@ -682,7 +713,7 @@
> list);
> if (search && uuid_search(fs_devices, search) == 0)
> continue;
> - print_one_uuid(fs_devices);
> + print_one_uuid(fs_devices, format);
> }
> printf("%s\n", BTRFS_BUILD_VERSION);
> return 0;
> Index: btrfs-progs-unstable/man/btrfs.8.in
> ===================================================================
> --- btrfs-progs-unstable.orig/man/btrfs.8.in 2010-10-20 20:03:53.000000000
+0100
> +++ btrfs-progs-unstable/man/btrfs.8.in 2010-10-20 20:08:15.000000000
+0100
> @@ -23,6 +23,8 @@
> .PP
> \fBbtrfs\fP \fBfilesystem df\fP\fI [options] <path>\fP
> .PP
> +\fBbtrfs\fP \fBfilesystem show\fP\fI [options] [<uuid>|<label>]\fP
> +.PP
Same here
> > \fBbtrfs\fP \fBdevice scan\fP\fI [<device> [<device>..]]\fP
> .PP
> \fBbtrfs\fP \fBdevice show\fP\fI <dev>|<label> [<dev>|<label>...]\fP
> @@ -151,6 +153,14 @@
> -H, --si Use powers of 10^3 (1000) to report sizes, in SI multiples.
> .TP
>
> +\fBfilesystem show\fR [options] [<uuid>|<label>]\fR
Same here
> +Show the usage of each device in the btrfs filesystem with the given
> +uuid or label, or all filesystems if no uuid or label is provided.
> +Options:
> +-h, --human-readable Use powers of 2^10 (1024) to report sizes.
> +-H, --si Use powers of 10^3 (1000) to report sizes, in SI multiples.
> +.TP
> +
> \fBdevice balance\fR \fI<path>\fR
> Balance the chunks of the filesystem identified by \fI<path>\fR
> across the devices.
>
> --
> === Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk ===
> PGP key: 515C238D from wwwkeys.eu.pgp.net or http://www.carfax.org.uk
> --- I spent most of my money on drink, women and fast cars. The ---
> rest I wasted. -- James Hunt
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
gpg key@ keyserver.linux.it: Goffredo Baroncelli (ghigo) <kreijack@inwind.it>
Key fingerprint = 4769 7E51 5293 D36C 814E C054 BF04 F161 3DC5 0512
next prev parent reply other threads:[~2010-10-22 7:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-21 19:01 [patch v2 0/4] Size reporting in userspace tools Hugo Mills
2010-10-21 19:01 ` [patch v2 1/4] Update pretty-printer for different systems of counting multiples Hugo Mills
2010-10-21 19:01 ` [patch v2 2/4] Add an option to show ISO, binary or raw bytes counts using df Hugo Mills
2010-10-22 7:55 ` Goffredo Baroncelli
2010-10-21 19:01 ` [patch v2 3/4] Add an option to show ISO, binary or raw bytes counts using show Hugo Mills
2010-10-22 7:57 ` Goffredo Baroncelli [this message]
2010-10-21 19:01 ` [patch v2 4/4] Add an option to show ISO, binary or raw bytes counts using btrfs-show Hugo Mills
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201010220957.17210.kreijack@libero.it \
--to=kreijack@libero.it \
--cc=hugo@carfax.org.uk \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).