From 38241cbf471b954b9bfcb94e50375a25c069faf6 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 5 Jul 2006 12:02:12 +0000
Subject: [PATCH] Get rid of DEBUG_FLOCK. Just set flock level for tstflock
 program.

---
 util/flock.c    |   15 ++++-----------
 util/tstflock.c |   11 +++++------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/util/flock.c b/util/flock.c
index 98a1590..330fbf7 100644
--- a/util/flock.c
+++ b/util/flock.c
@@ -1,4 +1,4 @@
-/* $Id: flock.c,v 1.16 2006-07-03 13:40:58 adam Exp $
+/* $Id: flock.c,v 1.17 2006-07-05 12:02:12 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -40,9 +40,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
 
-/** whether this module should debug */
-#define DEBUG_FLOCK 1
-
 /** have this module (mutex) been initialized? */
 static int initialized = 0;
 
@@ -327,7 +324,6 @@ int zebra_lock_r(ZebraLockHandle h)
 int zebra_unlock(ZebraLockHandle h)
 {
     int r = 0;
-    int do_unlock = 0;
     yaz_log(log_level, "zebra_unlock fd=%d p=%p fname=%s begin",
             h->p->fd, h, h->p->fname);
 #ifdef WIN32
@@ -345,13 +341,13 @@ int zebra_unlock(ZebraLockHandle h)
             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)
         r = unixLock(h->p->fd, F_UNLCK, F_SETLKW);
     else
     {
+        r = 0;
         assert(posix_locks);
     }
+
     zebra_mutex_unlock(&h->p->file_mutex);
 
     if (posix_locks)
@@ -398,14 +394,11 @@ void zebra_flock_init()
     {
         initialized = 1;
         log_level = yaz_log_module_level("flock");
-#if DEBUG_FLOCK
-        log_level = YLOG_LOG|YLOG_FLUSH;
-#endif
+        yaz_log(log_level, "zebra_flock_init");
         check_for_linuxthreads();
         zebra_mutex_init(&lock_list_mutex);
         yaz_log(log_level, "posix_locks: %d", posix_locks);
     }
-    yaz_log(log_level, "zebra_flock_init");
 }
 
 /*
diff --git a/util/tstflock.c b/util/tstflock.c
index 4abcdbf..1c2fedb 100644
--- a/util/tstflock.c
+++ b/util/tstflock.c
@@ -2,7 +2,7 @@
  * 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.14 2006-07-05 12:02:12 adam Exp $
  */
 
 #include <assert.h>
@@ -187,12 +187,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 +218,6 @@ void fork_tst()
 #endif
 }
 
-
 int main(int argc, char **argv)
 {
     char logname[220];
@@ -232,6 +228,9 @@ int main(int argc, char **argv)
 
     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();
 
     test_fd = open("tstflock.out", (O_BINARY|O_CREAT|O_RDWR), 0666);
-- 
1.7.10.4