X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fflock.c;h=98a1590fdb533a4adcac6cfc176d3fd7daaa3396;hb=11edef8271df7f3598f94373720aea3a5b6b3ad5;hp=009c971d6fdd7847e6a364dff4a8a1992af77072;hpb=32389c925760f3dadf9091390e039075c99470c5;p=idzebra-moved-to-github.git

diff --git a/util/flock.c b/util/flock.c
index 009c971..98a1590 100644
--- a/util/flock.c
+++ b/util/flock.c
@@ -1,4 +1,4 @@
-/* $Id: flock.c,v 1.14 2006-07-03 09:50:51 adam Exp $
+/* $Id: flock.c,v 1.16 2006-07-03 13:40:58 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -46,7 +46,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /** have this module (mutex) been initialized? */
 static int initialized = 0;
 
-/** whether fcntl locks are shared for all threads in a process */
+/** whether fcntl locks are shared for all threads in a process (POSIX) */
 static int posix_locks = 1;
 
 /** mutex for lock_list below */
@@ -335,9 +335,15 @@ int zebra_unlock(ZebraLockHandle h)
 #else
     zebra_mutex_lock(&h->p->file_mutex);
     if (h->write_flag)
-        h->p->no_file_write_lock--;
+    {
+        if (h->p->no_file_write_lock > 0)
+            h->p->no_file_write_lock--;
+    }
     else
-        h->p->no_file_read_lock--;
+    {
+        if (h->p->no_file_read_lock > 0)
+            h->p->no_file_read_lock--;
+    }
     if (h->p->no_file_read_lock == 0 && h->p->no_file_write_lock == 0)
         do_unlock = 1;
     if (do_unlock)
@@ -361,23 +367,30 @@ int zebra_unlock(ZebraLockHandle h)
     return r;
 }
 
-#if HAVE_CONFSTR
-static int test_for_linuxthreads()
+/** \brief see if the fcntl locking is not POSIX 
+ *
+ * The default posix_locks=1 is assumed.. This function sets posix_locks
+ * to zero if linuxthreads is in use.
+ */
+static int check_for_linuxthreads()
 {
+#if __linux
+#ifdef _CS_GNU_LIBPTHREAD_VERSION
     char conf_buf[512];
-    size_t r;
-
-    r = confstr(_CS_GNU_LIBPTHREAD_VERSION, conf_buf, sizeof(conf_buf));
+    size_t r = confstr(_CS_GNU_LIBPTHREAD_VERSION, conf_buf, sizeof(conf_buf));
     if (r == 0)
     {
         yaz_log(YLOG_WARN|YLOG_ERRNO, "confstr failed");
         return -1;
     }
     if (strncmp(conf_buf, "linuxthreads", 12) == 0)
-        posix_locks = 0;
+        posix_locks = 0; /* Using linuxthreads.. */
+#else
+    posix_locks = 0; /* Old GLIBC on Linux. Assume linuxthreads */
+#endif
+#endif
     return 0;
 }
-#endif
 
 void zebra_flock_init()
 {
@@ -388,9 +401,7 @@ void zebra_flock_init()
 #if DEBUG_FLOCK
         log_level = YLOG_LOG|YLOG_FLUSH;
 #endif
-#if HAVE_CONFSTR
-        test_for_linuxthreads();
-#endif
+        check_for_linuxthreads();
         zebra_mutex_init(&lock_list_mutex);
         yaz_log(log_level, "posix_locks: %d", posix_locks);
     }