X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fzebra-lock.c;h=7ed078ef6f5cfd0dbf559e5fce520160f80f6383;hb=cc9f94a61cbd9dcc0df0cf7d0c7c41d2cec88189;hp=0e08cde91986130eab37566cf3813c1d0bcea641;hpb=c41c84a497ae744aa825a90f144c85b54f1cd4bb;p=idzebra-moved-to-github.git

diff --git a/util/zebra-lock.c b/util/zebra-lock.c
index 0e08cde..7ed078e 100644
--- a/util/zebra-lock.c
+++ b/util/zebra-lock.c
@@ -1,29 +1,65 @@
 
 #include <assert.h>
+#include <stdio.h>
 
 #include <zebra-lock.h>
 
+
 int zebra_mutex_init (Zebra_mutex *p)
 {
+    p->state = 1;
+#if YAZ_POSIX_THREADS
     pthread_mutex_init (&p->mutex, 0);
+#endif
+#ifdef WIN32
+    InitializeCriticalSection (&p->mutex);
+#endif
     return 0;
 }
 
 int zebra_mutex_destroy (Zebra_mutex *p)
 {
+    --(p->state);
+    if (p->state != 0)
+    {
+        fprintf (stderr, "zebra_mutex_destroy. state = %d\n", p->state);
+    } 
+#if YAZ_POSIX_THREADS
     pthread_mutex_destroy (&p->mutex);
+#endif
+#ifdef WIN32
+    DeleteCriticalSection (&p->mutex);
+#endif
     return 0;
 }
 
 int zebra_mutex_lock (Zebra_mutex *p)
 {
+    if (p->state != 1)
+    {
+        fprintf (stderr, "zebra_mutex_lock. state = %d\n", p->state);
+    }
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (&p->mutex);
+#endif
+#ifdef WIN32
+    EnterCriticalSection (&p->mutex);
+#endif
     return 0;
 }
 
 int zebra_mutex_unlock (Zebra_mutex *p)
 {
+    if (p->state != 1)
+    {
+        fprintf (stderr, "zebra_mutex_unlock. state = %d\n", p->state);
+    }
+#if YAZ_POSIX_THREADS
     pthread_mutex_unlock (&p->mutex);
+#endif
+#ifdef WIN32
+    LeaveCriticalSection (&p->mutex);
+#endif
     return 0;
 }
 
@@ -31,8 +67,10 @@ int zebra_lock_rdwr_init (Zebra_lock_rdwr *p)
 {
     p->readers_reading = 0;
     p->writers_writing = 0;
+#if YAZ_POSIX_THREADS
     pthread_mutex_init (&p->mutex, 0);
     pthread_cond_init (&p->lock_free, 0);
+#endif
     return 0;
 }
 
@@ -40,33 +78,40 @@ int zebra_lock_rdwr_destroy (Zebra_lock_rdwr *p)
 {
     assert (p->readers_reading == 0);
     assert (p->writers_writing == 0);
+#if YAZ_POSIX_THREADS
     pthread_mutex_destroy (&p->mutex);
     pthread_cond_destroy (&p->lock_free);
+#endif
     return 0;
 }
 
 int zebra_lock_rdwr_rlock (Zebra_lock_rdwr *p)
 {
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (& p->mutex);
     while (p->writers_writing)
 	pthread_cond_wait (&p->lock_free, &p->mutex);
     p->readers_reading++;
     pthread_mutex_unlock(&p->mutex);
+#endif
     return 0;
 }
 
 int zebra_lock_rdwr_wlock (Zebra_lock_rdwr *p)
 {
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (&p->mutex);
     while (p->writers_writing || p->readers_reading)
 	pthread_cond_wait (&p->lock_free, &p->mutex);
     p->writers_writing++;
     pthread_mutex_unlock (&p->mutex);
+#endif
     return 0;
 }
 
 int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p)
 {
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (&p->mutex);
     if (p->readers_reading == 0)
     {
@@ -80,11 +125,13 @@ int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p)
 	    pthread_cond_signal (&p->lock_free);
 	pthread_mutex_unlock (&p->mutex);
     }
+#endif
     return 0;
 }
 
 int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p)
 {
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (&p->mutex);
     if (p->writers_writing == 0)
     {
@@ -97,40 +144,60 @@ int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p)
 	pthread_cond_broadcast(&p->lock_free);
 	pthread_mutex_unlock(&p->mutex);
     }
+#endif
     return 0;
 }
 
 int zebra_mutex_cond_init (Zebra_mutex_cond *p)
 {
+#if YAZ_POSIX_THREADS
     pthread_cond_init (&p->cond, 0);
     pthread_mutex_init (&p->mutex, 0);
+#endif
     return 0;
 }
 
 int zebra_mutex_cond_destroy (Zebra_mutex_cond *p)
 {
+#if YAZ_POSIX_THREADS
     pthread_cond_destroy (&p->cond);
     pthread_mutex_destroy (&p->mutex);
+#endif
     return 0;
 }
 
 int zebra_mutex_cond_lock (Zebra_mutex_cond *p)
 {
+#if YAZ_POSIX_THREADS
     return pthread_mutex_lock (&p->mutex);
+#else
+    return 0;
+#endif
 }
 
 int zebra_mutex_cond_unlock (Zebra_mutex_cond *p)
 {
+#if YAZ_POSIX_THREADS
     return pthread_mutex_unlock (&p->mutex);
+#else
+    return 0;
+#endif
 }
 
 int zebra_mutex_cond_wait (Zebra_mutex_cond *p)
 {
+#if YAZ_POSIX_THREADS
     return pthread_cond_wait (&p->cond, &p->mutex);
+#else
+    return 0;
+#endif
 }
 
 int zebra_mutex_cond_signal (Zebra_mutex_cond *p)
 {
+#if YAZ_POSIX_THREADS
     return pthread_cond_signal (&p->cond);
+#else
+    return 0;
+#endif
 }
-