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

diff --git a/util/tstflock.c b/util/tstflock.c
index 4abcdbf..2bea667 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 $
- */
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
+
+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
+
+*/
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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
@@ -50,10 +71,10 @@ pthread_mutex_t sleep_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 int test_fd = 0;
 
-static void small_sleep()
+static void small_sleep(void)
 {
 #ifdef WIN32
-    Sleep(50);
+    Sleep(2);
 #else
 #if YAZ_POSIX_THREADS
     struct timespec abstime;
@@ -173,7 +194,7 @@ static void tst_thread(int num, int write_flag)
             num, write_flag, seq);
 }
 
-static void tst()
+static void tst(void)
 {
     tst_thread(4, 1); /* write locks */
     if (1)
@@ -187,15 +208,12 @@ static void tst()
         }
     }
 
-#if 0
     tst_thread(6, 0);  /* read locks */
-#endif
-#if 1
+
     tst_thread(20, 2); /* random locks */
-#endif
 }
 
-void fork_tst()
+void fork_tst(void)
 {
 #if HAVE_SYS_WAIT_H
     pid_t pid[2];
@@ -221,16 +239,13 @@ void fork_tst()
 #endif
 }
 
-
 int main(int argc, char **argv)
 {
-    char logname[220];
     YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK_LOG();
 
-    sprintf(logname, "%.200s.log", argv[0]);
-    yaz_log_init_file(logname);
-
-    yaz_log_time_format("%s:%!");
+    /* ensure the flock system logs in our test */
+    yaz_log_init_level(yaz_log_mask_str("flock"));
 
     zebra_flock_init();
 
@@ -247,6 +262,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab