korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-28 12:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add empty function for init_resource_track() and print_resource_track()

Browse Source 
in the case of ! defined RESOURCE_TRACK, so that we can clean up #ifdef
throughout e2fsck source.

Signed-off-by: Ken Chen <kenchen@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Ken Chen 2009-05-28 09:55:10 -04:00 committed by Theodore Ts'o
parent fea390e253
commit 9facd076ae
10 changed files with 24 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2fsck/e2fsck.h
View File

@ -488,11 +488,15 @@ extern errcode_t e2fsck_zero_blocks(ext2_filsys fs, blk_t blk, int num,
extern int fs_proc_check(const char *fs_name);
extern int check_for_modules(const char *fs_name);
#ifdef RESOURCE_TRACK
extern void print_resource_track(const char *desc,
extern void print_resource_track(e2fsck_t ctx,
const char *desc,
struct resource_track *track,
io_channel channel);
extern void init_resource_track(struct resource_track *track,
io_channel channel);
#else
#define print_resource_track(ctx, desc, track, channel) do { } while (0)
#define init_resource_track(track, channel) do { } while (0)
#endif
extern int inode_has_valid_blocks(struct ext2_inode *inode);
extern void e2fsck_read_inode(e2fsck_t ctx, unsigned long ino,

9
e2fsck/pass1.c
View File

@ -514,9 +514,7 @@ void e2fsck_pass1(e2fsck_t ctx)
int busted_fs_time = 0;
int inode_size;
#ifdef RESOURCE_TRACK
init_resource_track(&rtrack, ctx->fs->io);
#endif
clear_problem_context(&pctx);
if (!(ctx->options & E2F_OPT_PREEN))
@ -1120,12 +1118,7 @@ endit:
ext2fs_free_mem(&block_buf);
ext2fs_free_mem(&inode);
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track(_("Pass 1"), &rtrack, ctx->fs->io);
}
#endif
print_resource_track(ctx, _("Pass 1"), &rtrack, ctx->fs->io);
}
/*

27
e2fsck/pass1b.c
View File

@ -227,38 +227,17 @@ void e2fsck_pass1_dupblocks(e2fsck_t ctx, char *block_buf)
dict_set_allocator(&ino_dict, NULL, inode_dnode_free, NULL);
dict_set_allocator(&blk_dict, NULL, block_dnode_free, NULL);
#ifdef RESOURCE_TRACK
init_resource_track(&rtrack, ctx->fs->io);
#endif
pass1b(ctx, block_buf);
print_resource_track(ctx, "Pass 1b", &rtrack, ctx->fs->io);
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track("Pass 1b", &rtrack, ctx->fs->io);
}
init_resource_track(&rtrack, ctx->fs->io);
#endif
pass1c(ctx, block_buf);
print_resource_track(ctx, "Pass 1c", &rtrack, ctx->fs->io);
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track("Pass 1c", &rtrack, ctx->fs->io);
}
init_resource_track(&rtrack, ctx->fs->io);
#endif
pass1d(ctx, block_buf);
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track("Pass 1d", &rtrack, ctx->fs->io);
}
#endif
print_resource_track(ctx, "Pass 1d", &rtrack, ctx->fs->io);
/*
* Time to free all of the accumulated data structures that we

10
e2fsck/pass2.c
View File

@ -101,10 +101,7 @@ void e2fsck_pass2(e2fsck_t ctx)
problem_t code;
int bad_dir;
#ifdef RESOURCE_TRACK
init_resource_track(&rtrack, ctx->fs->io);
#endif
clear_problem_context(&cd.pctx);
#ifdef MTRACE
@ -284,12 +281,7 @@ void e2fsck_pass2(e2fsck_t ctx)
}
}
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track(_("Pass 2"), &rtrack, fs->io);
}
#endif
print_resource_track(ctx, _("Pass 2"), &rtrack, fs->io);
}
#define MAX_DEPTH 32000

18
e2fsck/pass3.c
View File

@ -60,10 +60,7 @@ void e2fsck_pass3(e2fsck_t ctx)
struct dir_info *dir;
unsigned long maxdirs, count;
#ifdef RESOURCE_TRACK
init_resource_track(&rtrack, ctx->fs->io);
#endif
clear_problem_context(&pctx);
#ifdef MTRACE
@ -84,13 +81,7 @@ void e2fsck_pass3(e2fsck_t ctx)
ctx->flags |= E2F_FLAG_ABORT;
goto abort_exit;
}
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME) {
e2fsck_clear_progbar(ctx);
print_resource_track(_("Peak memory"), &ctx->global_rtrack,
NULL);
}
#endif
print_resource_track(ctx, _("Peak memory"), &ctx->global_rtrack, NULL);
check_root(ctx);
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
@ -140,12 +131,7 @@ abort_exit:
inode_done_map = 0;
}
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track(_("Pass 3"), &rtrack, ctx->fs->io);
}
#endif
print_resource_track(ctx, _("Pass 3"), &rtrack, ctx->fs->io);
}
/*

9
e2fsck/pass4.c
View File

@ -99,9 +99,7 @@ void e2fsck_pass4(e2fsck_t ctx)
char *buf = 0;
int group, maxgroup;
#ifdef RESOURCE_TRACK
init_resource_track(&rtrack, ctx->fs->io);
#endif
#ifdef MTRACE
mtrace_print("Pass 4");
@ -190,11 +188,6 @@ errout:
ext2fs_free_mem(&buf);
ext2fs_free_mem(&inode);
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track(_("Pass 4"), &rtrack, ctx->fs->io);
}
#endif
print_resource_track(ctx, _("Pass 4"), &rtrack, ctx->fs->io);
}

10
e2fsck/pass5.c
View File

@ -29,10 +29,7 @@ void e2fsck_pass5(e2fsck_t ctx)
mtrace_print("Pass 5");
#endif
#ifdef RESOURCE_TRACK
init_resource_track(&rtrack, ctx->fs->io);
#endif
clear_problem_context(&pctx);
if (!(ctx->options & E2F_OPT_PREEN))
@ -64,12 +61,7 @@ void e2fsck_pass5(e2fsck_t ctx)
ext2fs_free_block_bitmap(ctx->block_found_map);
ctx->block_found_map = 0;
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track(_("Pass 5"), &rtrack, ctx->fs->io);
}
#endif
print_resource_track(ctx, _("Pass 5"), &rtrack, ctx->fs->io);
}
#define NO_BLK ((blk_t) -1)

10
e2fsck/rehash.c
View File

@ -800,10 +800,7 @@ void e2fsck_rehash_directories(e2fsck_t ctx)
errcode_t retval;
int cur, max, all_dirs, dir_index, first = 1;
#ifdef RESOURCE_TRACK
init_resource_track(&rtrack, ctx->fs->io);
#endif
all_dirs = ctx->options & E2F_OPT_COMPRESS_DIRS;
if (!ctx->dirs_to_hash && !all_dirs)
@ -867,10 +864,5 @@ void e2fsck_rehash_directories(e2fsck_t ctx)
ext2fs_u32_list_free(ctx->dirs_to_hash);
ctx->dirs_to_hash = 0;
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME2) {
e2fsck_clear_progbar(ctx);
print_resource_track("Pass 3A", &rtrack, ctx->fs->io);
}
#endif
print_resource_track(ctx, "Pass 3A", &rtrack, ctx->fs->io);
}

9
e2fsck/unix.c
View File

@ -939,10 +939,7 @@ int main (int argc, char *argv[])
}
reserve_stdio_fds();
#ifdef RESOURCE_TRACK
init_resource_track(&ctx->global_rtrack, NULL);
#endif
if (!(ctx->options & E2F_OPT_PREEN) || show_version_only)
fprintf(stderr, "e2fsck %s (%s)\n", my_ver_string,
my_ver_date);
@ -1409,11 +1406,9 @@ no_journal:
}
e2fsck_write_bitmaps(ctx);
#ifdef RESOURCE_TRACK
io_channel_flush(ctx->fs->io);
if (ctx->options & E2F_OPT_TIME)
print_resource_track(NULL, &ctx->global_rtrack, ctx->fs->io);
#endif
print_resource_track(ctx, NULL, &ctx->global_rtrack, ctx->fs->io);
ext2fs_close(fs);
ctx->fs = NULL;
free(ctx->journal_name);

9
e2fsck/util.c
View File

@ -313,8 +313,8 @@ static _INLINE_ float timeval_subtract(struct timeval *tv1,
((float) (tv1->tv_usec - tv2->tv_usec)) / 1000000);
}
void print_resource_track(const char *desc, struct resource_track *track,
io_channel channel)
void print_resource_track(e2fsck_t ctx, const char *desc,
struct resource_track *track, io_channel channel)
{
#ifdef HAVE_GETRUSAGE
struct rusage r;
@ -324,6 +324,11 @@ void print_resource_track(const char *desc, struct resource_track *track,
#endif
struct timeval time_end;
if ((desc && !(ctx->options & E2F_OPT_TIME2)) ||
(!desc && !(ctx->options & E2F_OPT_TIME)))
return;
e2fsck_clear_progbar(ctx);
gettimeofday(&time_end, 0);
if (desc)