r3507: - added deferred replies on sharing violation in pvfs open. The

  deferred reply is short-circuited immediately when the file is
  closed by another user, allowing it to be opened by the waiting user.

- added a sane set of timeval manipulation routines

- converted all the events code and code that uses it to use struct
  timeval instead of time_t, which allows for microsecond resolution
  instead of 1 second resolution. This was needed for doing the pvfs
  deferred open code, and is why the patch is so big.
(This used to be commit 0d51511d408d91eb5f68a35e980e0875299b1831)

1 files changed, 3 insertions, 4 deletions

diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index 5d3ac8d1de..7921b3eb03 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -35,9 +35,9 @@ BOOL torture_dirtest1(void)
 	int i;
 	struct smbcli_state *cli;
 	int fnum;
-	double t1;
 	BOOL correct = True;
 	extern int torture_numops;
+	struct timeval tv;
 
 	printf("starting dirtest1\n");
 
@@ -48,6 +48,7 @@ BOOL torture_dirtest1(void)
 	printf("Creating %d random filenames\n", torture_numops);
 
 	srandom(0);
+	tv = timeval_current();
 	for (i=0;i<torture_numops;i++) {
 		char *fname;
 		asprintf(&fname, "\\%x", (int)random());
@@ -61,13 +62,11 @@ BOOL torture_dirtest1(void)
 		free(fname);
 	}
 
-	t1 = end_timer();
-
 	printf("Matched %d\n", smbcli_list(cli->tree, "a*.*", 0, list_fn, NULL));
 	printf("Matched %d\n", smbcli_list(cli->tree, "b*.*", 0, list_fn, NULL));
 	printf("Matched %d\n", smbcli_list(cli->tree, "xyzabc", 0, list_fn, NULL));
 
-	printf("dirtest core %g seconds\n", end_timer() - t1);
+	printf("dirtest core %g seconds\n", timeval_elapsed(&tv));
 
 	srandom(0);
 	for (i=0;i<torture_numops;i++) {