Bug #529. On Unix, combine pthreed locks with file locking because file

locking is per-process only. On Windows use file locking, because that
seems to be work per-thread.

diff --git a/include/idzebra/flock.h b/include/idzebra/flock.h
index 8e52e9f..375de8e 100644 (file)
--- a/include/idzebra/flock.h
+++ b/include/idzebra/flock.h
@@ -1,4 +1,4 @@
-/* $Id: flock.h,v 1.3 2006-05-10 08:13:20 adam Exp $
+/* $Id: flock.h,v 1.4 2006-06-27 11:56:28 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -27,7 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 YAZ_BEGIN_CDECL
 
-typedef struct zebra_lock_info *ZebraLockHandle;
+typedef struct zebra_lock_handle *ZebraLockHandle;
 
 YAZ_EXPORT
 ZebraLockHandle zebra_lock_create(const char *dir, const char *file);
@@ -45,6 +45,9 @@ int zebra_lock_w (ZebraLockHandle h);
 YAZ_EXPORT
 int zebra_lock_r (ZebraLockHandle h);
 
+YAZ_EXPORT 
+void zebra_flock_init(void);
+
 YAZ_END_CDECL
 
 #endif

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 38bc751..1685cab 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.222 2006-06-13 12:02:12 adam Exp $
+/* $Id: zebraapi.c,v 1.223 2006-06-27 11:56:28 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -181,6 +181,8 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
 {
     Res res;
 
+    zebra_flock_init();
+
     if (!log_level_initialized)
     {
         log_level = yaz_log_module_level("zebraapi");
@@ -2019,7 +2021,7 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
 
        zebra_lock_w(zh->lock_shadow);
         bf_commitClean (bfs, rval);
-       zebra_unlock (zh->lock_normal);
+       zebra_unlock (zh->lock_shadow);
     }
     else
     {

diff --git a/util/flock.c b/util/flock.c
index cae9fb1..4953741 100644 (file)
--- a/util/flock.c
+++ b/util/flock.c
@@ -1,5 +1,5 @@
-/* $Id: flock.c,v 1.7 2006-05-10 08:13:46 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: flock.c,v 1.8 2006-06-27 11:56:29 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -36,131 +36,273 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #include <idzebra/flock.h>
+#include <zebra-lock.h>
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
 
+/** have this module (mutex) been initialized? */
+static int initialized = 0;
+
+/** mutex for lock_list below */
+Zebra_mutex lock_list_mutex;
+
+/** our list of file locked files */
+static struct zebra_lock_info *lock_list = 0;
+
+/** the internal handle, with a pointer to each lock file info */
+struct zebra_lock_handle {
+#ifndef WIN32
+    /** so we can call zebra_lock_rdwr_wunlock or zebra_lock_lock_runlock */
+    int write_flag;
+#endif
+    struct zebra_lock_info *p;
+};
+
 struct zebra_lock_info {
+    /** file descriptor */
     int fd;
+    /** full path (xmalloc'ed) */
     char *fname;
+    /** reference counter: number of zebra_lock_handles pointing to us */
+    int ref_count;
+#ifndef WIN32
+    /** number of file write locks/read locks */
+    int no_file_write_lock;
+    int no_file_read_lock;
+    Zebra_lock_rdwr rdwr_lock;
+    Zebra_mutex file_mutex;
+#endif
+    /** next in lock list */
+    struct zebra_lock_info *next;
 };
 
-static int log_level = 0 /* YLOG_LOG|YLOG_FLUSH */;
+static int log_level = 0;
 
-char *zebra_mk_fname (const char *dir, const char *name)
+char *zebra_mk_fname(const char *dir, const char *name)
 {
     int dlen = dir ? strlen(dir) : 0;
-    char *fname = xmalloc (dlen + strlen(name) + 3);
-
+    char *fname = xmalloc(dlen + strlen(name) + 3);
+    
 #ifdef WIN32
     if (dlen)
     {
         int last_one = dir[dlen-1];
-
-        if (!strchr ("/\\:", last_one))
-            sprintf (fname, "%s\\%s", dir, name);
+        
+        if (!strchr("/\\:", last_one))
+            sprintf(fname, "%s\\%s", dir, name);
         else
-            sprintf (fname, "%s%s", dir, name);
+            sprintf(fname, "%s%s", dir, name);
     }
     else
-        sprintf (fname, "%s", name);
+        sprintf(fname, "%s", name);
 #else
     if (dlen)
     {
         int last_one = dir[dlen-1];
 
-        if (!strchr ("/", last_one))
-            sprintf (fname, "%s/%s", dir, name);
+        if (!strchr("/", last_one))
+            sprintf(fname, "%s/%s", dir, name);
         else
-            sprintf (fname, "%s%s", dir, name);
+            sprintf(fname, "%s%s", dir, name);
     }
     else
-        sprintf (fname, "%s", name);
+        sprintf(fname, "%s", name);
 #endif
     return fname;
 }
 
-ZebraLockHandle zebra_lock_create (const char *dir, const char *name)
+ZebraLockHandle zebra_lock_create(const char *dir, const char *name)
 {
     char *fname = zebra_mk_fname(dir, name);
-    ZebraLockHandle h = (ZebraLockHandle) xmalloc (sizeof(*h));
+    struct zebra_lock_info *p;
+    ZebraLockHandle h = 0;
+
+    assert(initialized);
 
-    h->fd = -1;
+    zebra_mutex_lock(&lock_list_mutex);
+    for (p = lock_list; p ; p = p->next)
+        if (!strcmp(p->fname, fname))
+            break;
+    if (!p)
+    {
+        p = (struct zebra_lock_info *) xmalloc(sizeof(*p));
+        
+        p->ref_count = 0;
 #ifdef WIN32
-    h->fd = open (name, O_BINARY|O_RDONLY);
-    if (h->fd == -1)
-        h->fd = open (fname, (O_BINARY|O_CREAT|O_RDWR), 0666);
+        p->fd = open(name, O_BINARY|O_RDONLY);
+        if (p->fd == -1)
+            p->fd = open(fname, (O_BINARY|O_CREAT|O_RDWR), 0666);
 #else
-    h->fd= open (fname, (O_BINARY|O_CREAT|O_RDWR), 0666);
+        p->fd = open(fname, (O_BINARY|O_CREAT|O_RDWR), 0666);
+#endif
+        if (p->fd == -1)
+        {
+            xfree(p);
+            yaz_log(YLOG_WARN | YLOG_ERRNO, 
+                    "zebra_lock_create fail fname=%s", fname);
+            p = 0;
+        }
+        else
+        {
+            p->fname = fname;
+            fname = 0;  /* fname buffer now owned by p->fname */
+            yaz_log(log_level, "zebra_lock_create fd=%d p=%p fname=%s",
+                    p->fd, p, p->fname);
+#ifndef WIN32
+            zebra_lock_rdwr_init(&p->rdwr_lock);
+            zebra_mutex_init(&p->file_mutex);
+            p->no_file_write_lock = 0;
+            p->no_file_read_lock = 0;
 #endif
-    if (h->fd == -1)
+            p->next = lock_list;
+            lock_list = p;
+        }
+    }
+    if (p)
     {
-       xfree (h);
-       yaz_log(YLOG_WARN | YLOG_ERRNO, "zebra_lock_create fail fname=%s", fname);
-        return 0;
+        p->ref_count++;
+        h = (ZebraLockHandle) xmalloc(sizeof(*h));
+        h->p = p;
+        h->write_flag = 0;
     }
-    h->fname = fname;
-    yaz_log(log_level, "zebra_lock_create fd=%d p=%p fname=%s", h->fd, h, h->fname);
+    zebra_mutex_unlock(&lock_list_mutex);
+    xfree(fname); /* free it - if it's still there */
+
     return h;
 }
 
-void zebra_lock_destroy (ZebraLockHandle h)
+void zebra_lock_destroy(ZebraLockHandle h)
 {
     if (!h)
        return;
-    yaz_log(log_level, "zebra_lock_destroy fd=%d p=%p fname=%s", h->fd, h, h->fname);
-    if (h->fd != -1)
-       close (h->fd);
-    xfree (h->fname);
-    xfree (h);
+    yaz_log(log_level, "zebra_lock_destroy fd=%d p=%p fname=%s",
+            h->p->fd, h, h->p->fname);
+    zebra_mutex_lock(&lock_list_mutex);
+    yaz_log(log_level, "zebra_lock_destroy fd=%d p=%p fname=%s 1",
+            h->p->fd, h, h->p->fname);
+    assert(h->p->ref_count > 0);
+    --(h->p->ref_count);
+    if (h->p->ref_count == 0)
+    {
+        struct zebra_lock_info **hp = &lock_list;
+        while (*hp)
+        {
+            if (*hp == h->p)
+            {
+                *hp = h->p->next;
+                break;
+            }
+            else
+                hp = &(*hp)->next;
+        }
+#ifndef WIN32
+        zebra_lock_rdwr_destroy(&h->p->rdwr_lock);
+        zebra_mutex_destroy(&h->p->file_mutex);
+#endif
+        if (h->p->fd != -1)
+            close(h->p->fd);
+        xfree(h->p->fname);
+        xfree(h->p);
+    }
+    xfree(h);
+    zebra_mutex_unlock(&lock_list_mutex);
 }
 
 #ifndef WIN32
-static int unixLock (int fd, int type, int cmd)
+static int unixLock(int fd, int type, int cmd)
 {
     struct flock area;
     area.l_type = type;
     area.l_whence = SEEK_SET;
     area.l_len = area.l_start = 0L;
-    return fcntl (fd, cmd, &area);
+    return fcntl(fd, cmd, &area);
 }
 #endif
 
-int zebra_lock_w (ZebraLockHandle h)
+int zebra_lock_w(ZebraLockHandle h)
 {
     int r;
-    yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s", h->fd, h, h->fname);
+    yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s", 
+            h->p->fd, h, h->p->fname);
+    
 #ifdef WIN32
-    while ((r = _locking (h->fd, _LK_LOCK, 1)))
+    while ((r = _locking(h->p->fd, _LK_LOCK, 1)))
         ;
 #else
-    r = unixLock (h->fd, F_WRLCK, F_SETLKW);
+    zebra_mutex_lock(&h->p->file_mutex);
+    if (h->p->no_file_write_lock == 0)
+    {
+        /* if there is already a read lock.. upgrade to write lock */
+        r = unixLock(h->p->fd, F_WRLCK, F_SETLKW);
+    }
+    h->p->no_file_write_lock++;
+    zebra_mutex_unlock(&h->p->file_mutex);
+
+    zebra_lock_rdwr_wlock(&h->p->rdwr_lock);
 #endif
-    yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s OK", h->fd, h, h->fname);
+    h->write_flag = 1;
     return r;
 }
 
-int zebra_lock_r (ZebraLockHandle h)
+int zebra_lock_r(ZebraLockHandle h)
 {
     int r;
-    yaz_log(log_level, "zebra_lock_r fd=%d p=%p fname=%s", h->fd, h, h->fname);
+    yaz_log(log_level, "zebra_lock_r fd=%d p=%p fname=%s", 
+            h->p->fd, h, h->p->fname);
 #ifdef WIN32
-    while ((r = _locking (h->fd, _LK_LOCK, 1)))
+    while ((r = _locking(h->p->fd, _LK_LOCK, 1)))
         ;
 #else
-    r = unixLock (h->fd, F_RDLCK, F_SETLKW);
+    zebra_mutex_lock(&h->p->file_mutex);
+    if (h->p->no_file_read_lock == 0 && h->p->no_file_write_lock == 0)
+    {
+        /* only read lock if no write locks already */
+        r = unixLock(h->p->fd, F_RDLCK, F_SETLKW);
+    }
+    h->p->no_file_read_lock++;
+    zebra_mutex_unlock(&h->p->file_mutex);
+
+    zebra_lock_rdwr_rlock(&h->p->rdwr_lock);
+    h->write_flag = 0;
 #endif
-    yaz_log(log_level, "zebra_lock_r fd=%d p=%p fname=%s OK", h->fd, h, h->fname);
     return r;
 }
 
-int zebra_unlock (ZebraLockHandle h)
+int zebra_unlock(ZebraLockHandle h)
 {
-    yaz_log(log_level, "zebra_unlock fd=%d p=%p fname=%s", h->fd, h, h->fname);
+    int r = 0;
+    yaz_log(log_level, "zebra_unlock fd=%d p=%p fname=%s",
+            h->p->fd, h, h->p->fname);
 #ifdef WIN32
-    return _locking (h->fd, _LK_UNLCK, 1);
+    r = _locking(h->p->fd, _LK_UNLCK, 1);
 #else
-    return unixLock (h->fd, F_UNLCK, F_SETLKW);
+    if (h->write_flag)
+        zebra_lock_rdwr_wunlock(&h->p->rdwr_lock);
+    else
+        zebra_lock_rdwr_runlock(&h->p->rdwr_lock);
+
+    zebra_mutex_lock(&h->p->file_mutex);
+    if (h->write_flag)
+        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_write_lock == 0)
+    {
+        r = unixLock(h->p->fd, F_UNLCK, F_SETLKW);
+    }
+    zebra_mutex_unlock(&h->p->file_mutex);
 #endif
+    return r;
+}
+
+void zebra_flock_init()
+{
+    if (!initialized)
+    {
+        log_level = yaz_log_module_level("flock");
+        initialized = 1;
+        zebra_mutex_init(&lock_list_mutex);
+    }
 }
 
 /*

diff --git a/util/tstflock.c b/util/tstflock.c
index ec26477..cf2039b 100644 (file)
--- a/util/tstflock.c
+++ b/util/tstflock.c
@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tstflock.c,v 1.6 2006-05-10 08:13:46 adam Exp $
+ * $Id: tstflock.c,v 1.7 2006-06-27 11:56:29 adam Exp $
  */
 
+#include <assert.h>
 #include <yaz/test.h>
 #if YAZ_POSIX_THREADS
 #include <pthread.h>
@@ -20,10 +21,10 @@
 #endif
 #include <string.h>
 
-static char seq[20];
+static char seq[40];
 static char *seqp = seq;
 
-#define NUM_THREADS 2
+#define NUM_THREADS 5
 
 static void small_sleep()
 {
@@ -33,21 +34,38 @@ static void small_sleep()
     sleep(1);
 #endif
 }
+
 void *run_func(void *arg)
 {
     int i;
+    int *pdata = (int*) arg;
+    int use_write_lock = *pdata;
     ZebraLockHandle lh = zebra_lock_create(0, "my.LCK");
     for (i = 0; i<2; i++)
     {
-        zebra_lock_w(lh);
-     
-        *seqp++ = 'L';
-        small_sleep();
-        *seqp++ = 'U';
-        
-        zebra_unlock(lh);
+        if (use_write_lock)
+        {
+            zebra_lock_w(lh);
+            
+            *seqp++ = 'L';
+            small_sleep();
+            *seqp++ = 'U';
+            
+            zebra_unlock(lh);
+        }
+        else
+        {
+            zebra_lock_r(lh);
+            
+            *seqp++ = 'l';
+            small_sleep();
+            *seqp++ = 'u';
+            
+            zebra_unlock(lh);
+        }
     }
     zebra_lock_destroy(lh);
+    *pdata = 123;
     return 0;
 }
 
@@ -58,15 +76,17 @@ DWORD WINAPI ThreadProc(void *p)
     return 0;
 }
 
-static void tst_win32()
+static void tst_win32(int num)
 {
     HANDLE handles[NUM_THREADS];
     DWORD dwThreadId[NUM_THREADS];
     int i, id[NUM_THREADS];
     
-    for (i = 0; i<NUM_THREADS; i++)
+    assert (num <= NUM_THREADS);
+    for (i = 0; i<num; i++)
     {
         void *pData = &id[i];
+        id[i] = i >= 2 ? 0 : 1; /* first two are writing.. rest is reading */
         handles[i] = CreateThread(
             NULL,              /* default security attributes */
             0,                 /* use default stack size */
@@ -81,15 +101,23 @@ static void tst_win32()
 #endif
 
 #if YAZ_POSIX_THREADS
-static void tst_pthread()
+static void tst_pthread(int num)
 {
     pthread_t child_thread[NUM_THREADS];
     int i, id[NUM_THREADS];
-    for (i = 0; i<NUM_THREADS; i++)
+
+    assert (num <= NUM_THREADS);
+    for (i = 0; i<num; i++)
+    {
+        id[i] = i >= 2 ? 0 : 1; /* first two are writing.. rest is reading */
         pthread_create(&child_thread[i], 0 /* attr */, run_func, &id[i]);
+    }
 
-    for (i = 0; i<NUM_THREADS; i++)
+    for (i = 0; i<num; i++)
         pthread_join(child_thread[i], 0);
+
+    for (i = 0; i<num; i++)
+        YAZ_CHECK(id[i] == 123);
 }
 #endif
 
@@ -97,18 +125,21 @@ int main(int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
 
+    zebra_flock_init();
 #ifdef WIN32
-    tst_win32();
+    tst_win32(2);
 #endif
 #if YAZ_POSIX_THREADS
-    tst_pthread();
+    tst_pthread(2);
 #endif
 
     *seqp++ = '\0';
-    printf("seq=%s\n", seq);
 #if 0
+    printf("seq=%s\n", seq);
+#endif
+#if 1
     /* does not pass.. for bug 529 */
-    YAZ_CHECK(strcmp(seq, "LULULULU") == 0);
+    YAZ_CHECK(strcmp(seq, "LULULULU") == 0); /* for tst_pthread when num=2 */
 #endif
     YAZ_CHECK_TERM;
 }