*
* This file is based on the minix file system programs fsck and mkfs
* written and copyrighted by Linus Torvalds <Linus.Torvalds@cs.helsinki.fi>
- *
+ *
* %Begin-Header%
* This file may be redistributed under the terms of the GNU Public
* License.
* 99/06/30...99/07/26 - Added non-destructive write-testing,
* configurable blocks-at-once parameter,
* loading of badblocks list to avoid testing
- * blocks known to be bad, multiple passes to
+ * blocks known to be bad, multiple passes to
* make sure that no new blocks are added to the
* list. (Work done by David Beattie)
*/
#define _GNU_SOURCE /* for O_DIRECT */
+#ifndef O_LARGEFILE
+#define O_LARGEFILE 0
+#endif
+
#include <errno.h>
#include <fcntl.h>
#ifdef HAVE_GETOPT_H
#include <time.h>
#include <limits.h>
+#include <sys/time.h>
#include <sys/ioctl.h>
#include <sys/types.h>
static int current_O_DIRECT = 0; /* Current status of O_DIRECT flag */
static int exclusive_ok = 0;
static unsigned int max_bb = 0; /* Abort test if more than this number of bad blocks has been encountered */
+static unsigned int d_flag = 0; /* delay factor between reads */
+static struct timeval time_start;
#define T_INC 32
static void usage(void)
{
- fprintf(stderr, _("Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n [-c blocks_at_once] [-p num_passes] [-e max_bad_blocks] [-t test_pattern [-t test_pattern [...]]]\n device [last_block [start_block]]\n"),
+ fprintf(stderr, _(
+"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
+" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
+" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
+" device [last_block [first_block]]\n"),
program_name);
exit (1);
}
static void exclusive_usage(void)
{
- fprintf(stderr,
- _("%s: The -n and -w options are mutually exclusive.\n\n"),
+ fprintf(stderr,
+ _("%s: The -n and -w options are mutually exclusive.\n\n"),
program_name);
exit(1);
}
static void *allocate_buffer(size_t size)
{
void *ret = 0;
-
+
#ifdef HAVE_POSIX_MEMALIGN
if (posix_memalign(&ret, sys_page_size, size) < 0)
ret = 0;
#ifdef HAVE_VALLOC
ret = valloc(size);
#endif /* HAVE_VALLOC */
-#endif /* HAVE_MEMALIGN */
+#endif /* HAVE_MEMALIGN */
#endif /* HAVE_POSIX_MEMALIGN */
if (!ret)
}
/* kludge:
- increment the iteration through the bb_list if
+ increment the iteration through the bb_list if
an element was just added before the current iteration
position. This should not cause next_bad to change. */
if (bb_iter && bad < next_bad)
return 1;
}
+static char *time_diff_format(struct timeval *tv1,
+ struct timeval *tv2, char *buf)
+{
+ time_t diff = (tv1->tv_sec - tv2->tv_sec);
+ int hr,min,sec;
+
+ sec = diff % 60;
+ diff /= 60;
+ min = diff % 60;
+ hr = diff / 60;
+
+ if (hr)
+ sprintf(buf, "%d:%02d:%02d", hr, min, sec);
+ else
+ sprintf(buf, "%d:%02d", min, sec);
+ return buf;
+}
+
+static float calc_percent(unsigned long current, unsigned long total) {
+ float percent = 0.0;
+ if (total <= 0)
+ return percent;
+ if (current >= total) {
+ percent = 100.0;
+ } else {
+ percent=(100.0*(float)current/(float)total);
+ }
+ return percent;
+}
+
static void print_status(void)
{
- fprintf(stderr, "%15lu/%15lu", (unsigned long) currently_testing,
- (unsigned long) num_blocks);
- fputs("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b", stderr);
+ struct timeval time_end;
+ char diff_buf[32], line_buf[128];
+ int len;
+
+ gettimeofday(&time_end, 0);
+ len = snprintf(line_buf, sizeof(line_buf),
+ _("%6.2f%% done, %s elapsed"),
+ calc_percent((unsigned long) currently_testing,
+ (unsigned long) num_blocks),
+ time_diff_format(&time_end, &time_start, diff_buf));
+ fputs(line_buf, stderr);
+ memset(line_buf, '\b', len);
+ line_buf[len] = 0;
+ fputs(line_buf, stderr);
fflush (stderr);
}
static void terminate_intr(int signo EXT2FS_ATTR((unused)))
{
+ fflush(out);
+ fprintf(stderr, "\n\nInterrupted at block %llu\n",
+ (unsigned long long) currently_testing);
+ fflush(stderr);
if (terminate_addr)
longjmp(terminate_addr,1);
exit(1);
#ifdef O_DIRECT
int new_flag = O_DIRECT;
int flag;
-
+
if ((((unsigned long) buffer & (sys_page_size - 1)) != 0) ||
((size & (sys_page_size - 1)) != 0) ||
((current_block & ((sys_page_size >> 9)-1)) != 0))
{
unsigned int i, nb;
unsigned char bpattern[sizeof(pattern)], *ptr;
-
+
if (pattern == (unsigned int) ~0) {
for (ptr = buffer; ptr < buffer + n; ptr++) {
(*ptr) = random() % (1 << (8 * sizeof(char)));
blk_t current_block)
{
long got;
+ struct timeval tv1, tv2;
+#define NANOSEC (1000000000L)
+#define MILISEC (1000L)
set_o_direct(dev, buffer, try * block_size, current_block);
com_err (program_name, errno, _("during seek"));
/* Try the read */
+ if (d_flag)
+ gettimeofday(&tv1, NULL);
got = read (dev, buffer, try * block_size);
+ if (d_flag)
+ gettimeofday(&tv2, NULL);
if (got < 0)
- got = 0;
+ got = 0;
if (got & 511)
fprintf(stderr, _("Weird value (%ld) in do_read\n"), got);
got /= block_size;
+ if (d_flag && got == try) {
+#ifdef HAVE_NANOSLEEP
+ struct timespec ts;
+ ts.tv_sec = tv2.tv_sec - tv1.tv_sec;
+ ts.tv_nsec = (tv2.tv_usec - tv1.tv_usec) * MILISEC;
+ if (ts.tv_nsec < 0) {
+ ts.tv_nsec += NANOSEC;
+ ts.tv_sec -= 1;
+ }
+ /* increase/decrease the sleep time based on d_flag value */
+ ts.tv_sec = ts.tv_sec * d_flag / 100;
+ ts.tv_nsec = ts.tv_nsec * d_flag / 100;
+ if (ts.tv_nsec > NANOSEC) {
+ ts.tv_sec += ts.tv_nsec / NANOSEC;
+ ts.tv_nsec %= NANOSEC;
+ }
+ if (ts.tv_sec || ts.tv_nsec)
+ nanosleep(&ts, NULL);
+#else
+#ifdef HAVE_USLEEP
+ struct timeval tv;
+ tv.tv_sec = tv2.tv_sec - tv1.tv_sec;
+ tv.tv_usec = tv2.tv_usec - tv1.tv_usec;
+ tv.tv_sec = tv.tv_sec * d_flag / 100;
+ tv.tv_usec = tv.tv_usec * d_flag / 100;
+ if (tv.tv_usec > 1000000) {
+ tv.tv_sec += tv.tv_usec / 1000000;
+ tv.tv_usec %= 1000000;
+ }
+ if (tv.tv_sec)
+ sleep(tv.tv_sec);
+ if (tv.tv_usec)
+ usleep(tv.tv_usec);
+#endif
+#endif
+ }
return got;
}
/* Try the write */
got = write (dev, buffer, try * block_size);
if (got < 0)
- got = 0;
+ got = 0;
if (got & 511)
fprintf(stderr, "Weird value (%ld) in do_write\n", got);
got /= block_size;
}
static unsigned int test_ro (int dev, blk_t last_block,
- int block_size, blk_t from_count,
+ int block_size, blk_t first_block,
unsigned int blocks_at_once)
{
unsigned char * blkbuf;
unsigned int bb_count = 0;
errcode_t errcode;
+ /* set up abend handler */
+ capture_terminate(NULL);
+
errcode = ext2fs_badblocks_list_iterate_begin(bb_list,&bb_iter);
if (errcode) {
com_err (program_name, errcode,
}
do {
ext2fs_badblocks_list_iterate (bb_iter, &next_bad);
- } while (next_bad && next_bad < from_count);
+ } while (next_bad && next_bad < first_block);
if (t_flag) {
blkbuf = allocate_buffer((blocks_at_once + 1) * block_size);
exit (1);
}
if (v_flag) {
- fprintf (stderr, _("Checking blocks %lu to %lu\n"),
- (unsigned long) from_count,
+ fprintf (stderr, _("Checking blocks %lu to %lu\n"),
+ (unsigned long) first_block,
(unsigned long) last_block - 1);
}
if (t_flag) {
}
flush_bufs();
try = blocks_at_once;
- currently_testing = from_count;
+ currently_testing = first_block;
num_blocks = last_block - 1;
if (!t_flag && (s_flag || v_flag)) {
fputs(_("Checking for bad blocks (read-only test): "), stderr);
if ( (blocks_at_once >= sys_page_size >> 9)
&& (currently_testing % (sys_page_size >> 9)!= 0))
try -= (sys_page_size >> 9)
- - (currently_testing
+ - (currently_testing
% (sys_page_size >> 9));
continue;
}
ext2fs_badblocks_list_iterate_end(bb_iter);
+ uncapture_terminate();
+
return bb_count;
}
static unsigned int test_rw (int dev, blk_t last_block,
- int block_size, blk_t from_count,
+ int block_size, blk_t first_block,
unsigned int blocks_at_once)
{
unsigned char *buffer, *read_buffer;
int i, try, got, nr_pattern, pat_idx;
unsigned int bb_count = 0;
+ /* set up abend handler */
+ capture_terminate(NULL);
+
buffer = allocate_buffer(2 * blocks_at_once * block_size);
read_buffer = buffer + blocks_at_once * block_size;
-
+
if (!buffer) {
com_err (program_name, ENOMEM, _("while allocating buffers"));
exit (1);
flush_bufs();
if (v_flag) {
- fputs(_("Checking for bad blocks in read-write mode\n"),
+ fputs(_("Checking for bad blocks in read-write mode\n"),
stderr);
fprintf(stderr, _("From block %lu to %lu\n"),
- (unsigned long) from_count,
- (unsigned long) last_block);
+ (unsigned long) first_block,
+ (unsigned long) last_block - 1);
}
if (t_flag) {
pattern = t_patts;
pattern_fill(buffer, pattern[pat_idx],
blocks_at_once * block_size);
num_blocks = last_block - 1;
- currently_testing = from_count;
+ currently_testing = first_block;
if (s_flag && v_flag <= 1)
alarm_intr(SIGALRM);
try = blocks_at_once;
/* recover page-aligned offset for O_DIRECT */
if ( (blocks_at_once >= sys_page_size >> 9)
- && (currently_testing %
+ && (currently_testing %
(sys_page_size >> 9)!= 0))
try -= (sys_page_size >> 9)
- - (currently_testing
+ - (currently_testing
% (sys_page_size >> 9));
continue;
} else
bb_count += bb_output(currently_testing++);
}
}
-
+
num_blocks = 0;
alarm (0);
if (s_flag | v_flag)
if (s_flag | v_flag)
fputs(_("Reading and comparing: "), stderr);
num_blocks = last_block;
- currently_testing = from_count;
+ currently_testing = first_block;
if (s_flag && v_flag <= 1)
alarm_intr(SIGALRM);
if ( (blocks_at_once >= sys_page_size >> 9)
&& (currently_testing % (sys_page_size >> 9)!= 0))
try = blocks_at_once - (sys_page_size >> 9)
- - (currently_testing
+ - (currently_testing
% (sys_page_size >> 9));
else
try = blocks_at_once;
if (v_flag > 1)
print_status();
}
-
+
num_blocks = 0;
alarm (0);
if (s_flag | v_flag)
};
static unsigned int test_nd (int dev, blk_t last_block,
- int block_size, blk_t from_count,
+ int block_size, blk_t first_block,
unsigned int blocks_at_once)
{
unsigned char *blkbuf, *save_ptr, *test_ptr, *read_ptr;
}
do {
ext2fs_badblocks_list_iterate (bb_iter, &next_bad);
- } while (next_bad && next_bad < from_count);
+ } while (next_bad && next_bad < first_block);
blkbuf = allocate_buffer(3 * blocks_at_once * block_size);
test_record = malloc (blocks_at_once*sizeof(struct saved_blk_record));
save_base = blkbuf;
test_base = blkbuf + (blocks_at_once * block_size);
read_base = blkbuf + (2 * blocks_at_once * block_size);
-
+
num_saved = 0;
flush_bufs();
if (v_flag) {
fputs(_("Checking for bad blocks in non-destructive read-write mode\n"), stderr);
- fprintf (stderr, _("From block %lu to %lu\n"),
- (unsigned long) from_count, (unsigned long) last_block);
+ fprintf (stderr, _("From block %lu to %lu\n"),
+ (unsigned long) first_block,
+ (unsigned long) last_block - 1);
}
if (s_flag || v_flag > 1) {
fputs(_("Checking for bad blocks (non-destructive read-write test)\n"), stderr);
fflush (out);
exit(1);
}
-
+
/* set up abend handler */
capture_terminate(terminate_env);
bb_count = 0;
save_ptr = save_base;
test_ptr = test_base;
- currently_testing = from_count;
+ currently_testing = first_block;
num_blocks = last_block - 1;
if (s_flag && v_flag <= 1)
alarm_intr(SIGALRM);
if (written != got)
com_err (program_name, errno,
_("during test data write, block %lu"),
- (unsigned long) currently_testing +
+ (unsigned long) currently_testing +
written);
buf_used += got;
try = test_record[used2].num;
used2++;
}
-
+
got = do_read (dev, read_ptr, try,
block_size, currently_testing);
bb_count += bb_output(currently_testing + got);
got++;
}
-
+
/* write back original data */
do_write (dev, save_ptr, got,
block_size, currently_testing);
{
char *tmp;
unsigned long ret;
-
+
errno = 0;
ret = strtoul(str, &tmp, 0);
if (*tmp || errno || (ret > UINT_MAX) ||
FILE * in = NULL;
int block_size = 1024;
unsigned int blocks_at_once = 64;
- blk_t last_block, from_count;
+ blk_t last_block, first_block;
int num_passes = 0;
int passes_clean = 0;
int dev;
unsigned int (*test_func)(int, blk_t,
int, blk_t,
unsigned int);
- int open_flag = 0;
+ int open_flag;
long sysval;
setbuf(stdout, NULL);
sys_page_size = sysval;
#endif /* _SC_PAGESIZE */
#endif /* HAVE_SYSCONF */
-
+
if (argc && *argv)
program_name = *argv;
- while ((c = getopt (argc, argv, "b:e:fi:o:svwnc:p:h:t:X")) != EOF) {
+ while ((c = getopt (argc, argv, "b:d:e:fi:o:svwnc:p:h:t:X")) != EOF) {
switch (c) {
case 'b':
block_size = parse_uint(optarg, "block size");
- if (block_size > 4096) {
- com_err (program_name, 0,
- _("bad block size - %s"), optarg);
- exit (1);
- }
break;
case 'f':
force++;
case 'e':
max_bb = parse_uint(optarg, "max bad block count");
break;
+ case 'd':
+ d_flag = parse_uint(optarg, "read delay factor");
+ break;
case 'p':
- num_passes = parse_uint(optarg,
+ num_passes = parse_uint(optarg,
"number of clean passes");
break;
case 'h':
if (t_flag + 1 > t_max) {
unsigned int *t_patts_new;
- t_patts_new = realloc(t_patts, t_max + T_INC);
+ t_patts_new = realloc(t_patts, sizeof(int) *
+ (t_max + T_INC));
if (!t_patts_new) {
com_err(program_name, ENOMEM,
_("can't allocate memory for "
}
} else {
errno = 0;
- last_block = parse_uint(argv[optind], "last block");
- printf("last_block = %d (%s)\n", last_block, argv[optind]);
+ last_block = parse_uint(argv[optind], _("last block"));
last_block++;
optind++;
}
if (optind <= argc-1) {
errno = 0;
- from_count = parse_uint(argv[optind], "start block");
- printf("from_count = %d\n", from_count);
- } else from_count = 0;
- if (from_count >= last_block) {
+ first_block = parse_uint(argv[optind], _("first block"));
+ } else first_block = 0;
+ if (first_block >= last_block) {
com_err (program_name, 0, _("invalid starting block (%lu): must be less than %lu"),
- (unsigned long) from_count, (unsigned long) last_block);
+ (unsigned long) first_block, (unsigned long) last_block);
exit (1);
}
if (w_flag)
check_mount(device_name);
-
- open_flag = w_flag ? O_RDWR : O_RDONLY;
+
+ gettimeofday(&time_start, 0);
+ open_flag = O_LARGEFILE | (w_flag ? O_RDWR : O_RDONLY);
dev = open (device_name, open_flag);
if (dev == -1) {
com_err (program_name, errno, _("while trying to open %s"),
unsigned int bb_count;
bb_count = test_func(dev, last_block, block_size,
- from_count, blocks_at_once);
+ first_block, blocks_at_once);
if (bb_count)
passes_clean = 0;
else
++passes_clean;
-
+
if (v_flag)
fprintf(stderr,
- _("Pass completed, %u bad blocks found.\n"),
+ _("Pass completed, %u bad blocks found.\n"),
bb_count);
} while (passes_clean < num_passes);
close (dev);
if (out != stdout)
fclose (out);
- if (t_patts)
- free(t_patts);
+ free(t_patts);
return 0;
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff