X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Ftstflock.c;h=76166b493283fd47524de609fd3ec7a0e98720c1;hp=4abcdbf9d2ccb84a5ac8cd16a21b62f4b5484d3d;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=5ba92997dbb29abf9a102711533e1fb73424d956

diff --git a/util/tstflock.c b/util/tstflock.c
index 4abcdbf..76166b4 100644
--- a/util/tstflock.c
+++ b/util/tstflock.c
@@ -1,15 +1,32 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
- * See the file LICENSE for details.
- *
- * $Id: tstflock.c,v 1.13 2006-07-03 21:19:13 adam Exp $
- */
+/* $Id: tstflock.c,v 1.16 2006-08-14 10:40:34 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #include <assert.h>
 #include <stdlib.h>
 #include <yaz/test.h>
 #include <yaz/log.h>
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
 #include <time.h>
 
 #if HAVE_SYS_STAT_H
@@ -27,6 +44,10 @@
 
 #include <fcntl.h>
 
+#ifdef WIN32
+#include <io.h>
+#endif
+
 #if YAZ_POSIX_THREADS
 #include <pthread.h>
 #endif
@@ -53,7 +74,7 @@ int test_fd = 0;
 static void small_sleep()
 {
 #ifdef WIN32
-    Sleep(50);
+    Sleep(2);
 #else
 #if YAZ_POSIX_THREADS
     struct timespec abstime;
@@ -187,12 +208,9 @@ static void tst()
         }
     }
 
-#if 0
     tst_thread(6, 0);  /* read locks */
-#endif
-#if 1
+
     tst_thread(20, 2); /* random locks */
-#endif
 }
 
 void fork_tst()
@@ -221,7 +239,6 @@ void fork_tst()
 #endif
 }
 
-
 int main(int argc, char **argv)
 {
     char logname[220];
@@ -230,7 +247,11 @@ int main(int argc, char **argv)
     sprintf(logname, "%.200s.log", argv[0]);
     yaz_log_init_file(logname);
 
-    yaz_log_time_format("%s:%!");
+    /* log time + thread id (%!) */
+    yaz_log_time_format("%c:%!");
+
+    /* ensure the flock system logs in our test */
+    yaz_log_init_level(yaz_log_mask_str("flock"));
 
     zebra_flock_init();