From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Fri, 11 Jul 2014 13:41:03 -0400 (EDT) Subject: [Cluster-devel] [gfs2-utils PATCH] fsck.gfs2: time each of the passes In-Reply-To: <53C00B2D.2070001@redhat.com> References: <1927182008.6308945.1405011181430.JavaMail.zimbra@redhat.com> <53C00B2D.2070001@redhat.com> Message-ID: <493564610.7001303.1405100463558.JavaMail.zimbra@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit ----- Original Message ----- (snip) > Use timersub() here perhaps? > > Otherwise looks good, > > Steve. Hi Steve, Thanks for the suggestion. How about this version? Bob Peterson Red Hat File Systems --- diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c index 81b7dd5..2c51e80 100644 --- a/gfs2/fsck/main.c +++ b/gfs2/fsck/main.c @@ -11,6 +11,7 @@ #include #include #include +#include #define _(String) gettext(String) #include @@ -247,11 +248,14 @@ static const struct fsck_pass passes[] = { static int fsck_pass(const struct fsck_pass *p, struct gfs2_sbd *sdp) { int ret; + long hh, mm, ss, ms; + struct timeval before, after, diff; if (fsck_abort) return FSCK_CANCELED; pass = p->name; log_notice( _("Starting %s\n"), p->name); + gettimeofday(&before, 0); ret = p->f(sdp); if (ret) exit(ret); @@ -260,7 +264,18 @@ static int fsck_pass(const struct fsck_pass *p, struct gfs2_sbd *sdp) log_notice( _("%s interrupted \n"), p->name); return FSCK_CANCELED; } - log_notice( _("%s complete \n"), p->name); + gettimeofday(&after, 0); + timersub(&after, &before, &diff); + hh = diff.tv_sec / 3600; + mm = (diff.tv_sec / 60) - (hh * 60); + ss = diff.tv_sec - (hh * 3600) - (mm * 60); + ms = diff.tv_usec / 1000; + log_notice( _("%s completed in "), p->name); + if (hh) + log_notice("%ldh", hh); + if (mm) + log_notice("%ldm", mm); + log_notice("%ld.%03lds \n", ss, ms); return 0; }