POSIX thread updates. First work on term sets.

[idzebra-moved-to-github.git] / util / zebra-lock.c

diff --git a/util/zebra-lock.c b/util/zebra-lock.c
index dfd8cea..7ed078e 100644 (file)
--- a/util/zebra-lock.c
+++ b/util/zebra-lock.c
@@ -7,12 +7,8 @@
 
 int zebra_mutex_init (Zebra_mutex *p)
 {
-    if (p->state == 1)
-    {
-        fprintf (stderr, "zebra_mutex_init. state=%d\n", p->state);
-    }
     p->state = 1;
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_init (&p->mutex, 0);
 #endif
 #ifdef WIN32
@@ -28,7 +24,7 @@ int zebra_mutex_destroy (Zebra_mutex *p)
     {
         fprintf (stderr, "zebra_mutex_destroy. state = %d\n", p->state);
     } 
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_destroy (&p->mutex);
 #endif
 #ifdef WIN32
@@ -43,7 +39,7 @@ int zebra_mutex_lock (Zebra_mutex *p)
     {
         fprintf (stderr, "zebra_mutex_lock. state = %d\n", p->state);
     }
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (&p->mutex);
 #endif
 #ifdef WIN32
@@ -58,7 +54,7 @@ int zebra_mutex_unlock (Zebra_mutex *p)
     {
         fprintf (stderr, "zebra_mutex_unlock. state = %d\n", p->state);
     }
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_unlock (&p->mutex);
 #endif
 #ifdef WIN32
@@ -71,7 +67,7 @@ int zebra_lock_rdwr_init (Zebra_lock_rdwr *p)
 {
     p->readers_reading = 0;
     p->writers_writing = 0;
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_init (&p->mutex, 0);
     pthread_cond_init (&p->lock_free, 0);
 #endif
@@ -82,7 +78,7 @@ int zebra_lock_rdwr_destroy (Zebra_lock_rdwr *p)
 {
     assert (p->readers_reading == 0);
     assert (p->writers_writing == 0);
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_destroy (&p->mutex);
     pthread_cond_destroy (&p->lock_free);
 #endif
@@ -91,7 +87,7 @@ int zebra_lock_rdwr_destroy (Zebra_lock_rdwr *p)
 
 int zebra_lock_rdwr_rlock (Zebra_lock_rdwr *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (& p->mutex);
     while (p->writers_writing)
        pthread_cond_wait (&p->lock_free, &p->mutex);
@@ -103,7 +99,7 @@ int zebra_lock_rdwr_rlock (Zebra_lock_rdwr *p)
 
 int zebra_lock_rdwr_wlock (Zebra_lock_rdwr *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (&p->mutex);
     while (p->writers_writing || p->readers_reading)
        pthread_cond_wait (&p->lock_free, &p->mutex);
@@ -115,7 +111,7 @@ int zebra_lock_rdwr_wlock (Zebra_lock_rdwr *p)
 
 int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (&p->mutex);
     if (p->readers_reading == 0)
     {
@@ -135,7 +131,7 @@ int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p)
 
 int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_lock (&p->mutex);
     if (p->writers_writing == 0)
     {
@@ -154,7 +150,7 @@ int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p)
 
 int zebra_mutex_cond_init (Zebra_mutex_cond *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_cond_init (&p->cond, 0);
     pthread_mutex_init (&p->mutex, 0);
 #endif
@@ -163,7 +159,7 @@ int zebra_mutex_cond_init (Zebra_mutex_cond *p)
 
 int zebra_mutex_cond_destroy (Zebra_mutex_cond *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_cond_destroy (&p->cond);
     pthread_mutex_destroy (&p->mutex);
 #endif
@@ -172,7 +168,7 @@ int zebra_mutex_cond_destroy (Zebra_mutex_cond *p)
 
 int zebra_mutex_cond_lock (Zebra_mutex_cond *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     return pthread_mutex_lock (&p->mutex);
 #else
     return 0;
@@ -181,7 +177,7 @@ int zebra_mutex_cond_lock (Zebra_mutex_cond *p)
 
 int zebra_mutex_cond_unlock (Zebra_mutex_cond *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     return pthread_mutex_unlock (&p->mutex);
 #else
     return 0;
@@ -190,7 +186,7 @@ int zebra_mutex_cond_unlock (Zebra_mutex_cond *p)
 
 int zebra_mutex_cond_wait (Zebra_mutex_cond *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     return pthread_cond_wait (&p->cond, &p->mutex);
 #else
     return 0;
@@ -199,7 +195,7 @@ int zebra_mutex_cond_wait (Zebra_mutex_cond *p)
 
 int zebra_mutex_cond_signal (Zebra_mutex_cond *p)
 {
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     return pthread_cond_signal (&p->cond);
 #else
     return 0;