[Cluster-devel] cluster/gfs/gfs_fsck Makefile util.c
rpeterso at sourceware.org
rpeterso at sourceware.org
Fri Jan 19 19:03:47 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: rpeterso at sourceware.org 2007-01-19 19:03:46
Modified files:
gfs/gfs_fsck : Makefile util.c
Log message:
Resolves: bz 222871 gfs_fsck runs slower than previous versions
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6&r2=1.6.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/util.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.1&r2=1.7.2.2
--- cluster/gfs/gfs_fsck/Makefile 2006/08/11 15:18:10 1.6
+++ cluster/gfs/gfs_fsck/Makefile 2007/01/19 19:03:46 1.6.2.1
@@ -27,7 +27,7 @@
inode_hash.c bitmap.c lost_n_found.c inode.c link.c metawalk.c \
eattr.c
-CFLAGS+=-D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\" -Wall -g
+CFLAGS+=-D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\" -Wall -O2
all: ${TARGET}
--- cluster/gfs/gfs_fsck/util.c 2006/11/17 17:00:09 1.7.2.1
+++ cluster/gfs/gfs_fsck/util.c 2007/01/19 19:03:46 1.7.2.2
@@ -316,22 +316,31 @@
/* Put out a warm, fuzzy message every second so the user */
/* doesn't think we hung. (This may take a long time). */
+/* We only check whether to report every one percent because */
+/* checking every block kills performance. We only report */
+/* every second because we don't need 100 extra messages in */
+/* logs made from verbose mode. */
void warm_fuzzy_stuff(uint64_t block)
{
+ static uint64_t one_percent = 0;
static struct timeval tv;
static uint32_t seconds = 0;
- last_reported_block = block;
- gettimeofday(&tv, NULL);
- if (!seconds)
- seconds = tv.tv_sec;
- if (tv.tv_sec - seconds) {
- uint64_t percent;
-
- seconds = tv.tv_sec;
- if (last_fs_block) {
- percent = (block * 100) / last_fs_block;
- log_notice("\r%" PRIu64 " percent complete.\r", percent);
+ if (!one_percent)
+ one_percent = last_fs_block / 100;
+ if (block - last_reported_block >= one_percent) {
+ last_reported_block = block;
+ gettimeofday(&tv, NULL);
+ if (!seconds)
+ seconds = tv.tv_sec;
+ if (tv.tv_sec - seconds) {
+ static uint64_t percent;
+
+ seconds = tv.tv_sec;
+ if (last_fs_block) {
+ percent = (block * 100) / last_fs_block;
+ log_notice("\r%" PRIu64 " percent complete.\r", percent);
+ }
}
}
}
More information about the Cluster-devel
mailing list