X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ffsx.c;h=b4673339d13536c37c4175e1641d00574b8e4101;hp=af9359952070270a92d26eff5897d6e5f74950cd;hb=c394068ee148595711c661651368b91373bcc78a;hpb=fbf5870b9848929d352460f1f005b79c0b5ccc5a

diff --git a/lustre/tests/fsx.c b/lustre/tests/fsx.c
index af93599..b467333 100644
--- a/lustre/tests/fsx.c
+++ b/lustre/tests/fsx.c
@@ -60,13 +60,33 @@
 #define NUMPRINTCOLUMNS 32	/* # columns of data to print on each line */
 
 /*
+ * Each test run will work with one or more separate file descriptors for the
+ * same file.  This allows testing cache coherency across multiple mountpoints
+ * of the same network filesystem on a single client.
+ */
+struct test_file {
+	char *path;
+	int fd;
+} *test_files = NULL;
+
+int num_test_files;
+enum fd_iteration_policy {
+	FD_SINGLE,
+	FD_ROTATE,
+	FD_RANDOM,
+};
+int fd_policy = FD_RANDOM;
+int fd_last;
+
+/*
  *	A log entry is an operation and a bunch of arguments.
  */
 
 struct log_entry {
-	int	operation;
-	struct timeval tv;
-	int	args[3];
+	int			operation;
+	int			args[3];
+	struct timeval		tv;
+	const struct test_file	*tf;
 };
 
 #define	LOGSIZE	100000
@@ -102,15 +122,15 @@ off_t		biggest = 0;
 char		state[256];
 unsigned long	testcalls = 0;		/* calls to function "test" */
 
-unsigned long	simulatedopcount = 0;	/* -b flag */
+long	simulatedopcount = 0;		/* -b flag */
 int	closeprob = 0;			/* -c flag */
 int	debug = 0;			/* -d flag */
-unsigned long	debugstart = 0;		/* -D flag */
-unsigned long	maxfilelen = 256 * 1024;	/* -l flag */
+long	debugstart = 0;			/* -D flag */
+long	maxfilelen = 256 * 1024;	/* -l flag */
 int	sizechecks = 1;			/* -n flag disables them */
 int	maxoplen = 64 * 1024;		/* -o flag */
 int	quiet = 0;			/* -q flag */
-unsigned long progressinterval = 0;	/* -p flag */
+long	progressinterval = 0;		/* -p flag */
 int	readbdy = 1;			/* -r flag */
 int	style = 0;			/* -s flag */
 int	truncbdy = 1;			/* -t flag */
@@ -178,22 +198,42 @@ prterr(char *prefix)
 
 
 void
-log4(int operation, int arg0, int arg1, int arg2, struct timeval *tv)
+log4(int operation, int arg0, int arg1, int arg2, struct timeval *tv,
+	const struct test_file *tf)
 {
 	struct log_entry *le;
 
 	le = &oplog[logptr];
-	le->tv = *tv;
 	le->operation = operation;
 	le->args[0] = arg0;
 	le->args[1] = arg1;
 	le->args[2] = arg2;
+	le->tv = *tv;
+	le->tf = tf;
 	logptr++;
 	logcount++;
 	if (logptr >= LOGSIZE)
 		logptr = 0;
 }
 
+const char *
+fill_tf_buf(const struct test_file *tf)
+{
+	static int max_tf_len;
+	static char tf_buf[32];
+
+	if (fd_policy == FD_SINGLE)
+		return "";
+
+	if (max_tf_len == 0)
+		max_tf_len = snprintf(tf_buf, sizeof(tf_buf) - 1,
+				      "%u", num_test_files - 1);
+
+	sprintf(tf_buf, "[%0*lu]", max_tf_len,
+		(unsigned long)(tf - test_files));
+
+	return tf_buf;
+}
 
 void
 logdump(void)
@@ -214,7 +254,7 @@ logdump(void)
 
 		opnum = i+1 + (logcount/LOGSIZE)*LOGSIZE;
 		lp = &oplog[i];
-		prt("%d: %lu.%06lu ", opnum,
+		prt("%d%s: %lu.%06lu ", opnum, fill_tf_buf(lp->tf),
 		    lp->tv.tv_sec, lp->tv.tv_usec);
 
 		switch (lp->operation) {
@@ -388,20 +428,6 @@ check_buffers(unsigned offset, unsigned size)
 	}
 }
 
-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)
 {
@@ -529,8 +555,15 @@ check_trunc_hack(void)
 	struct stat statbuf;
 	int fd = get_fd();
 
-	ftruncate(fd, (off_t)0);
-	ftruncate(fd, (off_t)100000);
+        /* should not ignore ftruncate(2)'s return value */
+        if (ftruncate(fd, (off_t)0) < 0) {
+                prterr("trunc_hack: ftruncate(0)");
+                exit(1);
+        }
+        if (ftruncate(fd, (off_t)100000) < 0) {
+                prterr("trunc_hack: ftruncate(100000)");
+                exit(1);
+        }
 	if (fstat(fd, &statbuf)) {
 		prterr("trunc_hack: fstat");
 		statbuf.st_size = -1;
@@ -539,58 +572,16 @@ check_trunc_hack(void)
 		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;
+        if (ftruncate(fd, 0) < 0) {
+                prterr("trunc_hack: ftruncate(0) (2nd call)");
+                exit(1);
+        }
 }
 
 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",
@@ -599,9 +590,6 @@ output_line(struct test_file *tf, int op, unsigned offset,
 		[OP_MAPWRITE] = "mapwrite",
 	};
 
-	if (fd_policy != FD_SINGLE)
-		tf_num = fill_tf_buf(tf);
-
 	/* W. */
 	if (!(!quiet && ((progressinterval &&
 			testcalls % progressinterval == 0) ||
@@ -611,9 +599,9 @@ output_line(struct test_file *tf, int op, unsigned offset,
 			  (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],
+	prt("%06lu%s %lu.%06lu %-10s %#08x %s %#08x\t(0x%x bytes)\n",
+		testcalls, fill_tf_buf(tf), tv->tv_sec, tv->tv_usec,
+		ops[op],
 		offset, op == OP_TRUNCATE ? " to " : "thru",
 		offset + size - 1, size);
 }
@@ -632,17 +620,17 @@ doread(unsigned offset, unsigned size)
 	if (size == 0) {
 		if (!quiet && testcalls > simulatedopcount)
 			prt("skipping zero size read\n");
-		log4(OP_SKIPPED, OP_READ, offset, size, &t);
+		log4(OP_SKIPPED, OP_READ, offset, size, &t, tf);
 		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, &t);
+		log4(OP_SKIPPED, OP_READ, offset, size, &t, tf);
 		return;
 	}
 
-	log4(OP_READ, offset, size, 0, &t);
+	log4(OP_READ, offset, size, 0, &t, tf);
 
 	if (testcalls <= simulatedopcount)
 		return;
@@ -689,17 +677,17 @@ domapread(unsigned offset, unsigned size)
 	if (size == 0) {
 		if (!quiet && testcalls > simulatedopcount)
 			prt("skipping zero size read\n");
-		log4(OP_SKIPPED, OP_MAPREAD, offset, size, &t);
+		log4(OP_SKIPPED, OP_MAPREAD, offset, size, &t, tf);
 		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, &t);
+		log4(OP_SKIPPED, OP_MAPREAD, offset, size, &t, tf);
 		return;
 	}
 
-	log4(OP_MAPREAD, offset, size, 0, &t);
+	log4(OP_MAPREAD, offset, size, 0, &t, tf);
 
 	if (testcalls <= simulatedopcount)
 		return;
@@ -771,11 +759,11 @@ dowrite(unsigned offset, unsigned size)
 	if (size == 0) {
 		if (!quiet && testcalls > simulatedopcount)
 			prt("skipping zero size write\n");
-		log4(OP_SKIPPED, OP_WRITE, offset, size, &t);
+		log4(OP_SKIPPED, OP_WRITE, offset, size, &t, tf);
 		return;
 	}
 
-	log4(OP_WRITE, offset, size, file_size, &t);
+	log4(OP_WRITE, offset, size, file_size, &t, tf);
 
 	gendata(original_buf, good_buf, offset, size);
 	if (file_size < offset + size) {
@@ -833,12 +821,12 @@ domapwrite(unsigned offset, unsigned size)
 	if (size == 0) {
 		if (!quiet && testcalls > simulatedopcount)
 			prt("skipping zero size write\n");
-		log4(OP_SKIPPED, OP_MAPWRITE, offset, size, &t);
+		log4(OP_SKIPPED, OP_MAPWRITE, offset, size, &t, tf);
 		return;
 	}
 	cur_filesize = file_size;
 
-	log4(OP_MAPWRITE, offset, size, 0, &t);
+	log4(OP_MAPWRITE, offset, size, 0, &t, tf);
 
 	gendata(original_buf, good_buf, offset, size);
 	if (file_size < offset + size) {
@@ -933,7 +921,7 @@ dotruncate(unsigned size)
 			prt("truncating to largest ever: 0x%x\n", size);
 	}
 
-	log4(OP_TRUNCATE, size, (unsigned)file_size, 0, &t);
+	log4(OP_TRUNCATE, size, (unsigned)file_size, 0, &t, tf);
 
 	if (size > file_size)
 		memset(good_buf + file_size, '\0', size - file_size);
@@ -994,7 +982,7 @@ docloseopen(void)
 		return;
 
 	gettimeofday(&t, NULL);
-	log4(OP_CLOSEOPEN, file_size, (unsigned)file_size, 0, &t);
+	log4(OP_CLOSEOPEN, file_size, (unsigned)file_size, 0, &t, tf);
 
 	if (debug)
 		prt("%06lu %lu.%06lu close/open\n", testcalls, t.tv_sec,