From c176c240cbd12eca5de45df0d13f4b139ae15c3d Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 26 Feb 2021 17:18:48 -0500 Subject: [PATCH] iscan: fix the test program iscan so it builds again The iscan program program isn't built by default, and was relying on e2fsck's util.c, so it had suffered bitrot as e2fsck/util.c had evolved. Fix it so that iscan builds correct. Signed-off-by: Theodore Ts'o --- e2fsck/Makefile.in | 10 ++-- e2fsck/iscan.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 139 insertions(+), 18 deletions(-) diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index a0867f8..71ac3cf 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -168,9 +168,13 @@ flushb: flushb.o $(E) " LD $@" $(Q) $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) -iscan: iscan.o util.o ehandler.o $(DEPLIBS) +iscan: iscan.o $(DEPLIBS) $(E) " LD $@" - $(Q) $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) + $(Q) $(LD) $(ALL_LDFLAGS) -o iscan iscan.o $(LIBS) + +iscan.static: iscan.o $(STATIC_DEPLIBS) + $(E) " LD $@" + $(Q) $(LD) $(LDFLAGS_STATIC) -o iscan.static iscan.o $(STATIC_LIBS) test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \ prof_err.o profile.h $(DEPSTATIC_LIBCOM_ERR) @@ -254,7 +258,7 @@ clean:: e2fsck.shared e2fsck.profiled flushb e2fsck.8 \ tst_problem tst_region tst_refcount tst_crc32 \ gen_crc32table e2fsck.conf.5 \ - prof_err.c prof_err.h test_profile + prof_err.c prof_err.h test_profile iscan iscan.static $(RM) -rf profiled mostlyclean: clean diff --git a/e2fsck/iscan.c b/e2fsck/iscan.c index 52cad11..607e475 100644 --- a/e2fsck/iscan.c +++ b/e2fsck/iscan.c @@ -20,11 +20,31 @@ #ifdef HAVE_MALLOC_H #include #endif +#include +#include + +#if EXT2_FLAT_INCLUDES +#include "ext2_fs.h" +#include "ext2fs.h" +#include "blkid.h" +#else +#include "ext2fs/ext2_fs.h" +#include "ext2fs/ext2fs.h" +#include "blkid/blkid.h" +#endif #include "et/com_err.h" -#include "e2fsck.h" #include "../version.h" +struct resource_track { + struct timeval time_start; + struct timeval user_start; + struct timeval system_start; + void *brk_start; + unsigned long long bytes_read; + unsigned long long bytes_written; +}; + extern int isatty(int); const char * program_name = "iscan"; @@ -38,10 +58,109 @@ int invalid_bitmaps = 0; struct resource_track global_rtrack; +void init_resource_track(struct resource_track *track, io_channel channel) +{ +#ifdef HAVE_GETRUSAGE + struct rusage r; +#endif + io_stats io_start = 0; + + track->brk_start = sbrk(0); + gettimeofday(&track->time_start, 0); +#ifdef HAVE_GETRUSAGE +#ifdef sun + memset(&r, 0, sizeof(struct rusage)); +#endif + getrusage(RUSAGE_SELF, &r); + track->user_start = r.ru_utime; + track->system_start = r.ru_stime; +#else + track->user_start.tv_sec = track->user_start.tv_usec = 0; + track->system_start.tv_sec = track->system_start.tv_usec = 0; +#endif + track->bytes_read = 0; + track->bytes_written = 0; + if (channel && channel->manager && channel->manager->get_stats) + channel->manager->get_stats(channel, &io_start); + if (io_start) { + track->bytes_read = io_start->bytes_read; + track->bytes_written = io_start->bytes_written; + } +} + +static float timeval_subtract(struct timeval *tv1, + struct timeval *tv2) +{ + return ((tv1->tv_sec - tv2->tv_sec) + + ((float) (tv1->tv_usec - tv2->tv_usec)) / 1000000); +} + +void print_resource_track(const char *desc, + struct resource_track *track, io_channel channel) +{ +#ifdef HAVE_GETRUSAGE + struct rusage r; +#endif + struct timeval time_end; + + gettimeofday(&time_end, 0); + + if (desc) + printf("%s: ", desc); + +#define kbytes(x) (((unsigned long long)(x) + 1023) / 1024) +#ifdef HAVE_MALLINFO + /* don't use mallinfo() if over 2GB used, since it returns "int" */ + if ((char *)sbrk(0) - (char *)track->brk_start < 2LL << 30) { + struct mallinfo malloc_info = mallinfo(); + + printf("Memory used: %lluk/%lluk (%lluk/%lluk), ", + kbytes(malloc_info.arena), kbytes(malloc_info.hblkhd), + kbytes(malloc_info.uordblks), + kbytes(malloc_info.fordblks)); + } else +#endif + printf("Memory used: %lluk, ", + kbytes(((char *)sbrk(0)) - ((char *)track->brk_start))); + +#ifdef HAVE_GETRUSAGE + getrusage(RUSAGE_SELF, &r); + + printf("time: %5.2f/%5.2f/%5.2f\n", + timeval_subtract(&time_end, &track->time_start), + timeval_subtract(&r.ru_utime, &track->user_start), + timeval_subtract(&r.ru_stime, &track->system_start)); +#else + printf("elapsed time: %6.3f\n", + timeval_subtract(&time_end, &track->time_start)); +#endif +#define mbytes(x) (((x) + 1048575) / 1048576) + if (channel && channel->manager && channel->manager->get_stats) { + io_stats delta = 0; + unsigned long long bytes_read = 0; + unsigned long long bytes_written = 0; + + if (desc) + printf("%s: ", desc); + + channel->manager->get_stats(channel, &delta); + if (delta) { + bytes_read = delta->bytes_read - track->bytes_read; + bytes_written = delta->bytes_written - + track->bytes_written; + } + printf("I/O read: %lluMB, write: %lluMB, " + "rate: %.2fMB/s\n", + mbytes(bytes_read), mbytes(bytes_written), + (double)mbytes(bytes_read + bytes_written) / + timeval_subtract(&time_end, &track->time_start)); + } +} + static void usage(void) { fprintf(stderr, - _("Usage: %s [-F] [-I inode_buffer_blocks] device\n"), + "Usage: %s [-F] [-I inode_buffer_blocks] device\n", program_name); exit(1); } @@ -78,13 +197,13 @@ static void PRS(int argc, char *argv[]) if (fd < 0) { com_err("open", errno, - _("while opening %s for flushing"), device_name); - exit(FSCK_ERROR); + "while opening %s for flushing", device_name); + exit(1); } if ((retval = ext2fs_sync_device(fd, 1))) { com_err("ext2fs_sync_device", retval, - _("while trying to flush %s"), device_name); - exit(FSCK_ERROR); + "while trying to flush %s", device_name); + exit(1); } close(fd); } @@ -93,30 +212,28 @@ static void PRS(int argc, char *argv[]) int main (int argc, char *argv[]) { errcode_t retval = 0; - int exit_value = FSCK_OK; + int exit_value = 0; ext2_filsys fs; ext2_ino_t ino; __u32 num_inodes = 0; struct ext2_inode inode; ext2_inode_scan scan; - init_resource_track(&global_rtrack); - PRS(argc, argv); retval = ext2fs_open(device_name, 0, 0, 0, unix_io_manager, &fs); if (retval) { - com_err(program_name, retval, _("while trying to open '%s'"), + com_err(program_name, retval, "while trying to open '%s'", device_name); exit(1); } - ehandler_init(fs->io); + init_resource_track(&global_rtrack, fs->io); retval = ext2fs_open_inode_scan(fs, inode_buffer_blocks, &scan); if (retval) { - com_err(program_name, retval, _("while opening inode scan")); + com_err(program_name, retval, "while opening inode scan"); exit(1); } @@ -124,7 +241,7 @@ int main (int argc, char *argv[]) retval = ext2fs_get_next_inode(scan, &ino, &inode); if (retval) { com_err(program_name, retval, - _("while getting next inode")); + "while getting next inode"); exit(1); } if (ino == 0) @@ -132,8 +249,8 @@ int main (int argc, char *argv[]) num_inodes++; } - print_resource_track(NULL, &global_rtrack); - printf(_("%u inodes scanned.\n"), num_inodes); + print_resource_track(NULL, &global_rtrack, fs->io); + printf("%u inodes scanned.\n", num_inodes); exit(0); } -- 1.8.3.1