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

diff --git a/util/tstflock.c b/util/tstflock.c
index d17c010..76166b4 100644
--- a/util/tstflock.c
+++ b/util/tstflock.c
@@ -1,14 +1,33 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
- * See the file LICENSE for details.
- *
- * $Id: tstflock.c,v 1.11 2006-06-30 14:01:22 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
 #include <sys/stat.h>
@@ -25,6 +44,10 @@
 
 #include <fcntl.h>
 
+#ifdef WIN32
+#include <io.h>
+#endif
+
 #if YAZ_POSIX_THREADS
 #include <pthread.h>
 #endif
@@ -41,14 +64,34 @@ static char *seqp = 0;
 
 #define NUM_THREADS 100
 
+#if YAZ_POSIX_THREADS
+pthread_cond_t sleep_cond = PTHREAD_COND_INITIALIZER;
+pthread_mutex_t sleep_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
 int test_fd = 0;
 
 static void small_sleep()
 {
 #ifdef WIN32
-    Sleep(50);
+    Sleep(2);
 #else
-    sleep(1);
+#if YAZ_POSIX_THREADS
+    struct timespec abstime;
+    struct timeval now;
+
+    gettimeofday(&now, 0);
+    abstime.tv_sec = now.tv_sec;
+    abstime.tv_nsec = 1000000 + now.tv_usec * 1000;
+    if (abstime.tv_nsec > 1000000000) /* 1s = 1e9 ns */
+    {
+        abstime.tv_nsec -= 1000000000;
+        abstime.tv_sec++;
+    }
+    pthread_mutex_lock(&sleep_mutex);
+    pthread_cond_timedwait(&sleep_cond, &sleep_mutex, &abstime);
+    pthread_mutex_unlock(&sleep_mutex);
+#endif
 #endif
 }
 
@@ -147,15 +190,13 @@ static void tst_thread(int num, int write_flag)
     for (i = 0; i < num; i++)
         YAZ_CHECK(id[i] == 123);
     *seqp++ = '\0';
+    yaz_log(YLOG_LOG, "tst_thread(%d,%d) returns seq=%s", 
+            num, write_flag, seq);
 }
 
 static void tst()
 {
     tst_thread(4, 1); /* write locks */
-    yaz_log(YLOG_LOG, "seq=%s", seq);
-#if 0
-    printf("seq=%s\n", seq);
-#endif
     if (1)
     {
         int i = 0;
@@ -167,14 +208,9 @@ static void tst()
         }
     }
 
-#if 0
     tst_thread(6, 0);  /* read locks */
-    printf("seq=%s\n", seq);
-#endif
-#if 0
+
     tst_thread(20, 2); /* random locks */
-    printf("seq=%s\n", seq);
-#endif
 }
 
 void fork_tst()
@@ -189,7 +225,7 @@ void fork_tst()
         if (!pid[i])
         {
             tst();
-            return;
+            exit(0);
         }
     }
     for (i = 0; i<2; i++)
@@ -203,7 +239,6 @@ void fork_tst()
 #endif
 }
 
-
 int main(int argc, char **argv)
 {
     char logname[220];
@@ -212,15 +247,20 @@ 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();
 
     test_fd = open("tstflock.out", (O_BINARY|O_CREAT|O_RDWR), 0666);
     YAZ_CHECK(test_fd != -1);
     if (test_fd != -1)
+    {
         fork_tst();
-
+    }
     YAZ_CHECK_TERM;
 }