# include <limits.h>
# include <time.h>
# include <strings.h>
+# include <sys/time.h>
#endif
#include <fcntl.h>
#include <sys/mman.h>
struct log_entry {
int operation;
+ struct timeval tv;
int args[3];
};
char *good_buf; /* a pointer to the correct data */
char *temp_buf; /* a pointer to the current data */
char *fname; /* name of our test file */
-int fd; /* fd for our test file */
+char logfile[1024]; /* name of our log file */
+char goodfile[1024]; /* name of our test file */
off_t file_size = 0;
off_t biggest = 0;
int fsxgoodfd = 0;
FILE * fsxlogf = NULL;
int badoff = -1;
-int closeopen = 0;
void
void
+__attribute__((format(printf, 1, 2)))
prt(char *fmt, ...)
{
va_list args;
va_start(args, fmt);
vfprintf(stdout, fmt, args);
- if (fsxlogf)
- vfprintf(fsxlogf, fmt, args);
va_end(args);
+
+ if (fsxlogf) {
+ va_start(args, fmt);
+ vfprintf(fsxlogf, fmt, args);
+ va_end(args);
+ }
}
void
void
-log4(int operation, int arg0, int arg1, int arg2)
+log4(int operation, int arg0, int arg1, int arg2, struct timeval *tv)
{
struct log_entry *le;
le = &oplog[logptr];
+ le->tv = *tv;
le->operation = operation;
- if (closeopen)
- le->operation = ~ le->operation;
le->args[0] = arg0;
le->args[1] = arg1;
le->args[2] = arg2;
int opnum;
opnum = i+1 + (logcount/LOGSIZE)*LOGSIZE;
- prt("%d(%d mod 256): ", opnum, opnum%256);
lp = &oplog[i];
- if ((closeopen = lp->operation < 0))
- lp->operation = ~ lp->operation;
+ prt("%d: %lu.%06lu ", opnum,
+ lp->tv.tv_sec, lp->tv.tv_usec);
switch (lp->operation) {
case OP_MAPREAD:
- prt("MAPREAD\t0x%x thru 0x%x\t(0x%x bytes)",
+ prt("MAPREAD 0x%x thru 0x%x (0x%x bytes)",
lp->args[0], lp->args[0] + lp->args[1] - 1,
lp->args[1]);
if (badoff >= lp->args[0] && badoff <
prt("\t***RRRR***");
break;
case OP_MAPWRITE:
- prt("MAPWRITE 0x%x thru 0x%x\t(0x%x bytes)",
+ prt("MAPWRITE 0x%x thru 0x%x (0x%x bytes)",
lp->args[0], lp->args[0] + lp->args[1] - 1,
lp->args[1]);
if (badoff >= lp->args[0] && badoff <
prt("\t******WWWW");
break;
case OP_READ:
- prt("READ\t0x%x thru 0x%x\t(0x%x bytes)",
+ prt("READ 0x%x thru 0x%x (0x%x bytes)",
lp->args[0], lp->args[0] + lp->args[1] - 1,
lp->args[1]);
if (badoff >= lp->args[0] &&
prt("\t***RRRR***");
break;
case OP_WRITE:
- prt("WRITE\t0x%x thru 0x%x\t(0x%x bytes)",
+ prt("WRITE 0x%x thru 0x%x (0x%x bytes)",
lp->args[0], lp->args[0] + lp->args[1] - 1,
lp->args[1]);
if (lp->args[0] > lp->args[2])
badoff < lp->args[!!down])
prt("\t******WWWW");
break;
+ case OP_CLOSEOPEN:
+ prt("CLOSE/OPEN");
+ break;
case OP_SKIPPED:
prt("SKIPPED (no operation)");
break;
prt("BOGUS LOG ENTRY (operation code = %d)!",
lp->operation);
}
- if (closeopen)
- prt("\n\t\tCLOSE/OPEN");
prt("\n");
i++;
if (i == LOGSIZE)
if (size_by_seek == (off_t)-1)
prterr("save_buffer: lseek eof");
else if (bufferlength > size_by_seek) {
- warn("save_buffer: .fsxgood file too short... will
-save 0x%llx bytes instead of 0x%llx\n", (unsigned long long)size_by_seek,
- (unsigned long long)bufferlength);
+ warn("save_buffer: .fsxgood file too short... will"
+ "save 0x%llx bytes instead of 0x%llx\n",
+ (unsigned long long)size_by_seek,
+ (unsigned long long)bufferlength);
bufferlength = size_by_seek;
}
}
if (byteswritten == -1)
prterr("save_buffer write");
else
- warn("save_buffer: short write, 0x%x bytes instead
-of 0x%llx\n",
+ warn("save_buffer: short write, 0x%x bytes instead"
+ "of 0x%llx\n",
(unsigned)byteswritten,
(unsigned long long)bufferlength);
}
if (good_buf) {
save_buffer(good_buf, file_size, fsxgoodfd);
prt("Correct content saved for comparison\n");
- prt("(maybe hexdump \"%s\" vs \"%s.fsxgood\")\n",
- fname, fname);
+ prt("(maybe hexdump \"%s\" vs \"%s\")\n",
+ fname, goodfile);
}
close(fsxgoodfd);
}
if (c != t) {
if (n == 0) {
bad = short_at(&temp_buf[i]);
- prt("0x%5x\t0x%04x\t0x%04x", offset,
+ prt("%#07x\t%#06x\t%#06x", offset,
short_at(&good_buf[offset]), bad);
op = temp_buf[offset & 1 ? i+1 : i];
}
size--;
}
if (n) {
- prt("\t0x%5x\n", n);
+ prt("\t%#7x\n", n);
if (bad)
- prt("operation# (mod 256) for the bad data
-may be %u\n", ((unsigned)op & 0xff));
+ prt("operation# (mod 256) for the bad data"
+ "may be %u\n", ((unsigned)op & 0xff));
else
- prt("operation# (mod 256) for the bad data
-unknown, check HOLE and EXTEND ops\n");
+ prt("operation# (mod 256) for the bad data"
+ "unknown, check HOLE and EXTEND ops\n");
} else
prt("????????????????\n");
report_failure(110);
}
}
+struct test_file {
+ char *path;
+ int fd;
+} *test_files = NULL;
+
+int num_test_files = 0;
+enum fd_iteration_policy {
+ FD_SINGLE,
+ FD_ROTATE,
+ FD_RANDOM,
+};
+int fd_policy = FD_RANDOM;
+int fd_last = 0;
+
+struct test_file *
+get_tf(void)
+{
+ unsigned index = 0;
+
+ switch (fd_policy) {
+ case FD_ROTATE:
+ index = fd_last++;
+ break;
+ case FD_RANDOM:
+ index = random();
+ break;
+ case FD_SINGLE:
+ index = 0;
+ break;
+ default:
+ prt("unknown policy");
+ exit(1);
+ break;
+ }
+ return &test_files[ index % num_test_files ];
+}
+
+void
+assign_fd_policy(char *policy)
+{
+ if (!strcmp(policy, "random"))
+ fd_policy = FD_RANDOM;
+ else if (!strcmp(policy, "rotate"))
+ fd_policy = FD_ROTATE;
+ else {
+ prt("unknown -I policy: '%s'\n", policy);
+ exit(1);
+ }
+}
+
+int
+get_fd(void)
+{
+ struct test_file *tf = get_tf();
+ return tf->fd;
+}
+
+static const char *basename(const char *path)
+{
+ char *c = strrchr(path, '/');
+
+ return c ? c++ : path;
+}
+
+void
+open_test_files(char **argv, int argc)
+{
+ struct test_file *tf;
+ int i;
+
+ num_test_files = argc;
+ if (num_test_files == 1)
+ fd_policy = FD_SINGLE;
+
+ test_files = calloc(num_test_files, sizeof(*test_files));
+ if (test_files == NULL) {
+ prterr("reallocating space for test files");
+ exit(1);
+ }
+
+ for (i = 0, tf = test_files; i < num_test_files; i++, tf++) {
+
+ tf->path = argv[i];
+ tf->fd = open(tf->path, O_RDWR|(lite ? 0 : O_CREAT|O_TRUNC),
+ 0666);
+ if (tf->fd < 0) {
+ prterr(tf->path);
+ exit(91);
+ }
+ }
+
+ if (quiet || fd_policy == FD_SINGLE)
+ return;
+
+ for (i = 0, tf = test_files; i < num_test_files; i++, tf++)
+ prt("fd %d: %s\n", i, tf->path);
+}
+
+void
+close_test_files(void)
+{
+ int i;
+ struct test_file *tf;
+
+ for (i = 0, tf = test_files; i < num_test_files; i++, tf++) {
+ if (close(tf->fd)) {
+ prterr("close");
+ report_failure(99);
+ }
+ }
+}
+
void
check_size(void)
{
struct stat statbuf;
off_t size_by_seek;
+ int fd = get_fd();
if (fstat(fd, &statbuf)) {
prterr("check_size: fstat");
check_trunc_hack(void)
{
struct stat statbuf;
+ int fd = get_fd();
ftruncate(fd, (off_t)0);
ftruncate(fd, (off_t)100000);
- fstat(fd, &statbuf);
+ if (fstat(fd, &statbuf)) {
+ prterr("trunc_hack: fstat");
+ statbuf.st_size = -1;
+ }
if (statbuf.st_size != (off_t)100000) {
prt("no extend on truncate! not posix!\n");
exit(130);
ftruncate(fd, 0);
}
+static char *tf_buf = NULL;
+static int max_tf_len = 0;
+
+void
+alloc_tf_buf(void)
+{
+ char dummy = '\0';
+ int highest = num_test_files - 1;
+ int len;
+
+ len = snprintf(&dummy, 0, "%u ", highest);
+ if (len < 1) {
+ prterr("finding max tf_buf");
+ exit(1);
+ }
+ len++;
+ tf_buf = malloc(len);
+ if (tf_buf == NULL) {
+ prterr("allocating tf_buf");
+ exit(1);
+ }
+ max_tf_len = snprintf(tf_buf, len, "%u ", highest);
+ if (max_tf_len < 1) {
+ prterr("fiding max_tv_len\n");
+ exit(1);
+ }
+ if (max_tf_len != len - 1) {
+ warn("snprintf() gave %d instead of %d?\n",
+ max_tf_len, len - 1);
+ exit(1);
+ }
+}
+
+char *
+fill_tf_buf(struct test_file *tf)
+{
+ if (tf_buf == NULL)
+ alloc_tf_buf();
+
+ sprintf(tf_buf,"%lu ", (unsigned long)(tf - test_files));
+ return tf_buf;
+}
+
+void
+output_line(struct test_file *tf, int op, unsigned offset,
+ unsigned size, struct timeval *tv)
+{
+ char *tf_num = "";
+
+ char *ops[] = {
+ [OP_READ] = "read",
+ [OP_WRITE] = "write",
+ [OP_TRUNCATE] = "trunc from",
+ [OP_MAPREAD] = "mapread",
+ [OP_MAPWRITE] = "mapwrite",
+ };
+
+ if (fd_policy != FD_SINGLE)
+ tf_num = fill_tf_buf(tf);
+
+ /* W. */
+ if (!(!quiet && ((progressinterval &&
+ testcalls % progressinterval == 0) ||
+ (debug &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend)))))))
+ return;
+
+ prt("%06lu %lu.%06lu %.*s%-10s %#08x %s %#08x\t(0x%x bytes)\n",
+ testcalls, tv->tv_sec, tv->tv_usec, max_tf_len,
+ tf_num, ops[op],
+ offset, op == OP_TRUNCATE ? " to " : "thru",
+ offset + size - 1, size);
+}
void
doread(unsigned offset, unsigned size)
{
+ struct timeval t;
off_t ret;
unsigned iret;
+ struct test_file *tf = get_tf();
+ int fd = tf->fd;
offset -= offset % readbdy;
+ gettimeofday(&t, NULL);
if (size == 0) {
if (!quiet && testcalls > simulatedopcount)
prt("skipping zero size read\n");
- log4(OP_SKIPPED, OP_READ, offset, size);
+ log4(OP_SKIPPED, OP_READ, offset, size, &t);
return;
}
if (size + offset > file_size) {
if (!quiet && testcalls > simulatedopcount)
prt("skipping seek/read past end of file\n");
- log4(OP_SKIPPED, OP_READ, offset, size);
+ log4(OP_SKIPPED, OP_READ, offset, size, &t);
return;
}
- log4(OP_READ, offset, size, 0);
+ log4(OP_READ, offset, size, 0, &t);
if (testcalls <= simulatedopcount)
return;
- if (!quiet && ((progressinterval &&
- testcalls % progressinterval == 0) ||
- (debug &&
- (monitorstart == -1 ||
- (offset + size > monitorstart &&
- (monitorend == -1 || offset <= monitorend))))))
- prt("%lu read\t0x%x thru\t0x%x\t(0x%x bytes)\n", testcalls,
- offset, offset + size - 1, size);
+ output_line(tf, OP_READ, offset, size, &t);
+
ret = lseek(fd, (off_t)offset, SEEK_SET);
if (ret == (off_t)-1) {
prterr("doread: lseek");
report_failure(140);
}
iret = read(fd, temp_buf, size);
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu read done\n", t.tv_sec, t.tv_usec);
+ }
if (iret != size) {
if (iret == -1)
prterr("doread: read");
void
domapread(unsigned offset, unsigned size)
{
+ struct timeval t;
unsigned pg_offset;
unsigned map_size;
char *p;
+ struct test_file *tf = get_tf();
+ int fd = tf->fd;
offset -= offset % readbdy;
+ gettimeofday(&t, NULL);
if (size == 0) {
if (!quiet && testcalls > simulatedopcount)
prt("skipping zero size read\n");
- log4(OP_SKIPPED, OP_MAPREAD, offset, size);
+ log4(OP_SKIPPED, OP_MAPREAD, offset, size, &t);
return;
}
if (size + offset > file_size) {
if (!quiet && testcalls > simulatedopcount)
prt("skipping seek/read past end of file\n");
- log4(OP_SKIPPED, OP_MAPREAD, offset, size);
+ log4(OP_SKIPPED, OP_MAPREAD, offset, size, &t);
return;
}
- log4(OP_MAPREAD, offset, size, 0);
+ log4(OP_MAPREAD, offset, size, 0, &t);
if (testcalls <= simulatedopcount)
return;
- if (!quiet && ((progressinterval &&
- testcalls % progressinterval == 0) ||
- (debug &&
- (monitorstart == -1 ||
- (offset + size > monitorstart &&
- (monitorend == -1 || offset <= monitorend))))))
- prt("%lu mapread\t0x%x thru\t0x%x\t(0x%x bytes)\n", testcalls,
- offset, offset + size - 1, size);
+ output_line(tf, OP_MAPREAD, offset, size, &t);
pg_offset = offset & page_mask;
map_size = pg_offset + size;
- if ((p = (char *)mmap(0, map_size, PROT_READ, MAP_FILE |
-MAP_SHARED, fd,
- (off_t)(offset - pg_offset))) == (char *)-1) {
+ if ((p = mmap(0, map_size, PROT_READ, MAP_FILE | MAP_SHARED, fd,
+ (off_t)(offset - pg_offset))) == MAP_FAILED) {
prterr("domapread: mmap");
report_failure(190);
}
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu mmap done\n", t.tv_sec, t.tv_usec);
+ }
memcpy(temp_buf, p + pg_offset, size);
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu memcpy done\n", t.tv_sec, t.tv_usec);
+ }
if (munmap(p, map_size) != 0) {
prterr("domapread: munmap");
report_failure(191);
}
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu munmap done\n", t.tv_sec, t.tv_usec);
+ }
check_buffers(offset, size);
}
void
dowrite(unsigned offset, unsigned size)
{
+ struct timeval t;
off_t ret;
unsigned iret;
+ struct test_file *tf = get_tf();
+ int fd = tf->fd;
offset -= offset % writebdy;
+ gettimeofday(&t, NULL);
if (size == 0) {
if (!quiet && testcalls > simulatedopcount)
prt("skipping zero size write\n");
- log4(OP_SKIPPED, OP_WRITE, offset, size);
+ log4(OP_SKIPPED, OP_WRITE, offset, size, &t);
return;
}
- log4(OP_WRITE, offset, size, file_size);
+ log4(OP_WRITE, offset, size, file_size, &t);
gendata(original_buf, good_buf, offset, size);
if (file_size < offset + size) {
if (testcalls <= simulatedopcount)
return;
- if (!quiet && ((progressinterval &&
- testcalls % progressinterval == 0) ||
- (debug &&
- (monitorstart == -1 ||
- (offset + size > monitorstart &&
- (monitorend == -1 || offset <= monitorend))))))
- prt("%lu write\t0x%x thru\t0x%x\t(0x%x bytes)\n", testcalls,
- offset, offset + size - 1, size);
+ output_line(tf, OP_WRITE, offset, size, &t);
+
ret = lseek(fd, (off_t)offset, SEEK_SET);
if (ret == (off_t)-1) {
prterr("dowrite: lseek");
report_failure(150);
}
iret = write(fd, good_buf + offset, size);
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu write done\n", t.tv_sec, t.tv_usec);
+ }
if (iret != size) {
if (iret == -1)
prterr("dowrite: write");
void
domapwrite(unsigned offset, unsigned size)
{
+ struct timeval t;
unsigned pg_offset;
unsigned map_size;
off_t cur_filesize;
char *p;
+ struct test_file *tf = get_tf();
+ int fd = tf->fd;
offset -= offset % writebdy;
+ gettimeofday(&t, NULL);
if (size == 0) {
if (!quiet && testcalls > simulatedopcount)
prt("skipping zero size write\n");
- log4(OP_SKIPPED, OP_MAPWRITE, offset, size);
+ log4(OP_SKIPPED, OP_MAPWRITE, offset, size, &t);
return;
}
cur_filesize = file_size;
- log4(OP_MAPWRITE, offset, size, 0);
+ log4(OP_MAPWRITE, offset, size, 0, &t);
gendata(original_buf, good_buf, offset, size);
if (file_size < offset + size) {
if (testcalls <= simulatedopcount)
return;
- if (!quiet && ((progressinterval &&
- testcalls % progressinterval == 0) ||
- (debug &&
- (monitorstart == -1 ||
- (offset + size > monitorstart &&
- (monitorend == -1 || offset <= monitorend))))))
- prt("%lu mapwrite\t0x%x thru\t0x%x\t(0x%x bytes)\n", testcalls,
- offset, offset + size - 1, size);
+ output_line(tf, OP_MAPWRITE, offset, size, &t);
if (file_size > cur_filesize) {
if (ftruncate(fd, file_size) == -1) {
prterr("domapwrite: ftruncate");
exit(201);
}
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu truncate done\n", t.tv_sec, t.tv_usec);
+ }
}
pg_offset = offset & page_mask;
map_size = pg_offset + size;
- if ((p = (char *)mmap(0, map_size, PROT_READ | PROT_WRITE,
- MAP_FILE | MAP_SHARED, fd,
- (off_t)(offset - pg_offset))) == (char *)-1) {
+ if ((p = mmap(0, map_size, PROT_READ | PROT_WRITE, MAP_FILE|MAP_SHARED,
+ fd, (off_t)(offset - pg_offset))) == MAP_FAILED) {
prterr("domapwrite: mmap");
report_failure(202);
}
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu mmap done\n", t.tv_sec, t.tv_usec);
+ }
memcpy(p + pg_offset, good_buf + offset, size);
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu memcpy done\n", t.tv_sec, t.tv_usec);
+ }
if (msync(p, map_size, 0) != 0) {
prterr("domapwrite: msync");
report_failure(203);
}
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu msync done\n", t.tv_sec, t.tv_usec);
+ }
if (munmap(p, map_size) != 0) {
prterr("domapwrite: munmap");
report_failure(204);
}
+ if (!quiet && (debug > 1 &&
+ (monitorstart == -1 ||
+ (offset + size > monitorstart &&
+ (monitorend == -1 || offset <= monitorend))))) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu munmap done\n", t.tv_sec, t.tv_usec);
+ }
}
void
dotruncate(unsigned size)
{
+ struct timeval t;
int oldsize = file_size;
+ struct test_file *tf = get_tf();
+ int fd = tf->fd;
size -= size % truncbdy;
+ gettimeofday(&t, NULL);
if (size > biggest) {
biggest = size;
if (!quiet && testcalls > simulatedopcount)
prt("truncating to largest ever: 0x%x\n", size);
}
- log4(OP_TRUNCATE, size, (unsigned)file_size, 0);
+ log4(OP_TRUNCATE, size, (unsigned)file_size, 0, &t);
if (size > file_size)
memset(good_buf + file_size, '\0', size - file_size);
if (testcalls <= simulatedopcount)
return;
- if ((progressinterval && testcalls % progressinterval == 0) ||
- (debug && (monitorstart == -1 || monitorend == -1 ||
- size <= monitorend)))
- prt("%lu trunc\tfrom 0x%x to 0x%x\n", testcalls, oldsize,
-size);
+ output_line(tf, OP_TRUNCATE, oldsize, size, &t);
+
if (ftruncate(fd, (off_t)size) == -1) {
prt("ftruncate1: %x\n", size);
prterr("dotruncate: ftruncate");
report_failure(160);
}
+ if (!quiet && debug > 1) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu trunc done\n", t.tv_sec, t.tv_usec);
+ }
}
writefileimage()
{
ssize_t iret;
+ int fd = get_fd();
if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) {
prterr("writefileimage: lseek");
if (iret == -1)
prterr("writefileimage: write");
else
- prt("short write: 0x%x bytes instead of 0x%llx\n",
- iret, (unsigned long long)file_size);
+ prt("short write: 0x%lx bytes instead of 0x%llx\n",
+ (unsigned long)iret,
+ (unsigned long long)file_size);
report_failure(172);
}
if (lite ? 0 : ftruncate(fd, file_size) == -1) {
void
docloseopen(void)
{
+ struct timeval t;
+ struct test_file *tf = get_tf();
+
if (testcalls <= simulatedopcount)
return;
+ gettimeofday(&t, NULL);
+ log4(OP_CLOSEOPEN, file_size, (unsigned)file_size, 0, &t);
+
if (debug)
- prt("%lu close/open\n", testcalls);
- if (close(fd)) {
+ prt("%06lu %lu.%06lu close/open\n", testcalls, t.tv_sec,
+ t.tv_usec);
+ if (close(tf->fd)) {
prterr("docloseopen: close");
report_failure(180);
}
- fd = open(fname, O_RDWR, 0);
- if (fd < 0) {
+ if (!quiet && debug > 1) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu close done\n", t.tv_sec, t.tv_usec);
+ }
+ tf->fd = open(tf->path, O_RDWR, 0);
+ if (tf->fd < 0) {
prterr("docloseopen: open");
report_failure(181);
}
+ if (!quiet && debug > 1) {
+ gettimeofday(&t, NULL);
+ prt(" %lu.%06lu open done\n", t.tv_sec, t.tv_usec);
+ }
}
testcalls++;
- if (closeprob)
- closeopen = (rv >> 3) < (1 << 28) / closeprob;
-
if (debugstart > 0 && testcalls >= debugstart)
debug = 1;
}
if (sizechecks && testcalls > simulatedopcount)
check_size();
- if (closeopen)
+ if (closeprob && (rv >> 3) < (1 << 28) / closeprob)
docloseopen();
}
usage(void)
{
fprintf(stdout, "usage: %s",
- "fsx [-dnqLOW] [-b opnum] [-c Prob] [-l flen] [-m
-start:end] [-o oplen] [-p progressinterval] [-r readbdy] [-s style] [-t
-truncbdy] [-w writebdy] [-D startingop] [-N numops] [-P dirpath] [-S seed]
-fname\n\
- -b opnum: beginning operation number (default 1)\n\
- -c P: 1 in P chance of file close+open at each op (default infinity)\n\
- -d: debug output for all operations\n\
- -l flen: the upper bound on file size (default 262144)\n\
- -m startop:endop: monitor (print debug output) specified byte range
-(default 0:infinity)\n\
- -n: no verifications of file size\n\
- -o oplen: the upper bound on operation size (default 65536)\n\
- -p progressinterval: debug output at specified operation interval\n\
- -q: quieter operation\n\
- -r readbdy: 4096 would make reads page aligned (default 1)\n\
- -s style: 1 gives smaller truncates (default 0)\n\
- -t truncbdy: 4096 would make truncates page aligned (default 1)\n\
- -w writebdy: 4096 would make writes page aligned (default 1)\n\
- -D startingop: debug output starting at specified operation\n\
- -L: fsxLite - no file creations & no file size changes\n\
- -N numops: total # operations to do (default infinity)\n\
- -O: use oplen (see -o flag) for every op (default random)\n\
- -P: save .fsxlog and .fsxgood files in dirpath (default ./)\n\
- -S seed: for random # generator (default 1) 0 gets timestamp\n\
- -W: mapped write operations DISabled\n\
- -R: read() system calls only (mapped reads disabled)\n\
- fname: this filename is REQUIRED (no default)\n");
+ "fsx [-dnqLOW] [-b opnum] [-c Prob] [-l flen] [-m "
+"start:end] [-o oplen] [-p progressinterval] [-r readbdy] [-s style] [-t "
+"truncbdy] [-w writebdy] [-D startingop] [-N numops] [-P dirpath] [-S seed] "
+"[ -I random|rotate ] fname [additional paths to fname..]\n"
+" -b opnum: beginning operation number (default 1)\n"
+" -c P: 1 in P chance of file close+open at each op (default infinity)\n"
+" -d: debug output for all operations [-d -d = more debugging]\n"
+" -l flen: the upper bound on file size (default 262144)\n"
+" -m startop:endop: monitor (print debug output) specified byte rang"
+"(default 0:infinity)\n"
+" -n: no verifications of file size\n"
+" -o oplen: the upper bound on operation size (default 65536)\n"
+" -p progressinterval: debug output at specified operation interval\n"
+" -q: quieter operation\n"
+" -r readbdy: 4096 would make reads page aligned (default 1)\n"
+" -s style: 1 gives smaller truncates (default 0)\n"
+" -t truncbdy: 4096 would make truncates page aligned (default 1)\n"
+" -w writebdy: 4096 would make writes page aligned (default 1)\n"
+" -D startingop: debug output starting at specified operation\n"
+" -L: fsxLite - no file creations & no file size changes\n"
+" -N numops: total # operations to do (default infinity)\n"
+" -O: use oplen (see -o flag) for every op (default random)\n"
+" -P: save .fsxlog and .fsxgood files in dirpath (default ./)\n"
+" -S seed: for random # generator (default 1) 0 gets timestamp\n"
+" -W: mapped write operations DISabled\n"
+" -R: read() system calls only (mapped reads disabled)\n"
+" -I: When multiple paths to the file are given each operation uses"
+" a different path. Iterate through them in order with 'rotate'"
+" or chose then at 'random'. (defaults to random)\n"
+" fname: this filename is REQUIRED (no default)\n");
exit(90);
}
return (ret);
}
-
int
main(int argc, char **argv)
{
int i, style, ch;
char *endp;
- char goodfile[1024];
- char logfile[1024];
+ int dirpath = 0;
goodfile[0] = 0;
logfile[0] = 0;
setvbuf(stdout, (char *)0, _IOLBF, 0); /* line buffered stdout */
- while ((ch = getopt(argc, argv, "b:c:dl:m:no:p:qr:s:t:w:D:LN:OP:RS:W"))
+ while ((ch = getopt(argc, argv,
+ "b:c:dl:m:no:p:qr:s:t:w:D:I:LN:OP:RS:W"))
!= EOF)
switch (ch) {
case 'b':
simulatedopcount = getnum(optarg, &endp);
if (!quiet)
- fprintf(stdout, "Will begin at operation
-%ld\n",
+ fprintf(stdout, "Will begin at operation"
+ "%ld\n",
simulatedopcount);
if (simulatedopcount == 0)
usage();
usage();
break;
case 'd':
- debug = 1;
+ debug++;
break;
case 'l':
maxfilelen = getnum(optarg, &endp);
if (debugstart < 1)
usage();
break;
+ case 'I':
+ assign_fd_policy(optarg);
+ break;
case 'L':
lite = 1;
break;
strcat(goodfile, "/");
strncpy(logfile, optarg, sizeof(logfile));
strcat(logfile, "/");
+ dirpath = 1;
break;
case 'R':
mapped_reads = 0;
}
argc -= optind;
argv += optind;
- if (argc != 1)
+ if (argc < 1)
usage();
fname = argv[0];
initstate(seed, state, 256);
setstate(state);
- fd = open(fname, O_RDWR|(lite ? 0 : O_CREAT|O_TRUNC), 0666);
- if (fd < 0) {
- prterr(fname);
- exit(91);
- }
- strncat(goodfile, fname, 256);
+
+ open_test_files(argv, argc);
+
+ strncat(goodfile, dirpath ? basename(fname) : fname, 256);
strcat (goodfile, ".fsxgood");
fsxgoodfd = open(goodfile, O_RDWR|O_CREAT|O_TRUNC, 0666);
if (fsxgoodfd < 0) {
prterr(goodfile);
exit(92);
}
- strncat(logfile, fname, 256);
+ strncat(logfile, dirpath ? basename(fname) : fname, 256);
strcat (logfile, ".fsxlog");
fsxlogf = fopen(logfile, "w");
if (fsxlogf == NULL) {
}
if (lite) {
off_t ret;
+ int fd = get_fd();
file_size = maxfilelen = lseek(fd, (off_t)0, SEEK_END);
if (file_size == (off_t)-1) {
prterr(fname);
memset(temp_buf, '\0', maxoplen);
if (lite) { /* zero entire existing file */
ssize_t written;
+ int fd = get_fd();
written = write(fd, good_buf, (size_t)maxfilelen);
if (written != maxfilelen) {
prterr(fname);
warn("main: error on write");
} else
- warn("main: short write, 0x%x bytes instead
-of 0x%x\n",
+ warn("main: short write, 0x%x bytes instead"
+ "of 0x%x\n",
(unsigned)written, maxfilelen);
exit(98);
}
while (numops == -1 || numops--)
test();
- if (close(fd)) {
- prterr("close");
- report_failure(99);
- }
+ close_test_files();
prt("All operations completed A-OK!\n");
exit(0);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff