From patchwork Sun May 1 15:47:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Mills X-Patchwork-Id: 746072 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p41FlSq1017444 for ; Sun, 1 May 2011 15:47:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760585Ab1EAPr0 (ORCPT ); Sun, 1 May 2011 11:47:26 -0400 Received: from frost.carfax.org.uk ([212.13.194.111]:2760 "EHLO frost.carfax.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758070Ab1EAPrV (ORCPT ); Sun, 1 May 2011 11:47:21 -0400 Received: from ruthven.carfax.org.uk ([10.0.0.10]) by frost.carfax.org.uk with esmtp (Exim 4.69) (envelope-from ) id 1QGYrd-0004Zc-6d; Sun, 01 May 2011 15:47:17 +0000 Received: from [10.0.0.10] (helo=ruthven.carfax.org.uk) by ruthven.carfax.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1QGYrc-0004hn-V6; Sun, 01 May 2011 16:47:17 +0100 From: Hugo Mills To: Btrfs mailing list , Chris Mason Subject: [PATCH v6 2/8] Add --monitor option to btrfs balance progress. Date: Sun, 1 May 2011 16:47:10 +0100 Message-Id: X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: To: linux-btrfs@vger.kernel.org X-frost.carfax.org.uk-Spam-Score: -0.0 (/) X-frost.carfax.org.uk-Spam-Report: Spam detection software, running on the system "spamd3.lon.bitfolk.com", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: For the impatient, this patch introduces the pot-watching --monitor option, which checks the balance progress at regular intervals, and updates a single status line with the current progress and an estimated completion time. [...] Content analysis details: (-0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 01 May 2011 15:47:29 +0000 (UTC) For the impatient, this patch introduces the pot-watching --monitor option, which checks the balance progress at regular intervals, and updates a single status line with the current progress and an estimated completion time. Signed-off-by: Hugo Mills --- btrfs.c | 4 +- btrfs_cmds.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----- ioctl.h | 2 +- man/btrfs.8.in | 7 ++-- 4 files changed, 106 insertions(+), 16 deletions(-) diff --git a/btrfs.c b/btrfs.c index 3a24019..0b6186c 100644 --- a/btrfs.c +++ b/btrfs.c @@ -99,8 +99,8 @@ static struct Command commands[] = { "balance start", "\n" "Synonym for \"btrfs filesystem balance\"." }, - { do_balance_progress, 1, - "balance progress", "\n" + { do_balance_progress, -1, + "balance progress", "[-m|--monitor] \n" "Show progress of the balance operation running on ." }, { do_scan, diff --git a/btrfs_cmds.c b/btrfs_cmds.c index 00dda0a..ad2300d 100644 --- a/btrfs_cmds.c +++ b/btrfs_cmds.c @@ -797,22 +797,108 @@ int get_balance_progress(char *path, struct btrfs_ioctl_balance_progress *bal) return err; } +const struct option progress_options[] = { + { "monitor", 0, NULL, 'm' }, + { NULL, 0, NULL, 0 } +}; + int do_balance_progress(int argc, char **argv) { char *path; int ret = 0; int err = 0; struct btrfs_ioctl_balance_progress bal; + __u64 last_completed = -1; + __u64 initial_completed = -1; + struct timeval now; + struct timeval started; + int monitor = 0; + + optind = 1; + while(1) { + int c = getopt_long(argc, argv, "m", progress_options, NULL); + if (c < 0) + break; + switch(c) { + case 'm': + monitor = 1; + break; + default: + fprintf(stderr, "Invalid arguments for balance progress\n"); + free(argv); + return 1; + } + } + + if(optind >= argc) { + fprintf(stderr, "No filesystem path given for progress\n"); + return 1; + } + + path = argv[optind]; + do { + int prs = 0; - path = argv[1]; + ret = get_balance_progress(path, &bal); + if (ret) + break; - ret = get_balance_progress(path, &bal); - if (!ret) - printf("\r%u/%u block groups moved, " - "%0.2f%% complete.\n", - bal.completed, - bal.expected, - (float)bal.completed/bal.expected*100.0); + if (last_completed != bal.completed) { + printf("\r%u/%u block groups moved, " + "%0.2f%% complete.", + bal.completed, + bal.expected, + (float)bal.completed/bal.expected*100.0); + } + + if (initial_completed != -1 + && initial_completed != bal.completed) { + ret = gettimeofday(&now, NULL); + if (ret) { + fprintf(stderr, "Can't read current time\n"); + return 22; + } + /* Seconds per block */ + float rate = (float)(now.tv_sec - started.tv_sec) + / (bal.completed - initial_completed); + int secs_remaining = rate + * (bal.expected - bal.completed); + printf(" Time remaining"); + if (secs_remaining >= 60*60*24) { + printf(" %dd", secs_remaining / (60*60*24)); + secs_remaining %= 60*60*24; + prs = 1; + } + if (prs || secs_remaining >= 60*60) { + printf(" %dh", secs_remaining / (60*60)); + secs_remaining %= 60*60; + prs = 1; + } + if (prs || secs_remaining > 60) { + printf(" %dm", secs_remaining / 60); + secs_remaining %= 60; + } + printf(" %ds\x1b[K", secs_remaining); + } + + if (last_completed != -1 && last_completed != bal.completed) { + initial_completed = bal.completed; + ret = gettimeofday(&started, NULL); + if (ret) { + fprintf(stderr, "Can't read current time\n"); + return 22; + } + } + + last_completed = bal.completed; + + if (monitor) { + fflush(stdout); + sleep(1); + } else { + printf("\n"); + } + } while(monitor); switch(ret) { case 0: @@ -821,10 +907,13 @@ int do_balance_progress(int argc, char **argv) fprintf(stderr, "ERROR: can't access '%s'\n", path); return 13; case EINVAL: - fprintf(stderr, + if (!monitor) { + fprintf(stderr, "No balance operation running on '%s'.\n", path); - return 20; + return 20; + } + break; default: fprintf(stderr, "ERROR: ioctl returned error %d.", err); return 21; diff --git a/ioctl.h b/ioctl.h index f07d3a2..3eeaa33 100644 --- a/ioctl.h +++ b/ioctl.h @@ -174,6 +174,6 @@ struct btrfs_ioctl_balance_progress { #define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, u64) #define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, \ struct btrfs_ioctl_space_args) -#define BTRFS_IOC_BALANCE_PROGRESS _IOR(BTRFS_IOCTL_MAGIC, 25, \ +#define BTRFS_IOC_BALANCE_PROGRESS _IOR(BTRFS_IOCTL_MAGIC, 27, \ struct btrfs_ioctl_balance_progress) #endif diff --git a/man/btrfs.8.in b/man/btrfs.8.in index 7b66fb7..5fcad89 100644 --- a/man/btrfs.8.in +++ b/man/btrfs.8.in @@ -27,7 +27,7 @@ btrfs \- control a btrfs filesystem .PP \fBbtrfs\fP \fBbalance start\fP\fI \fP .PP -\fBbtrfs\fP \fBbalance progress\fP\fI \fP +\fBbtrfs\fP \fBbalance progress\fP [\fB-m\fP|\fB--monitor\fP] \fI\fP .PP \fBbtrfs\fP \fBdevice show\fP\fI |