Do not declare static function f in AC_TRY_LINK test

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

diff --git a/util/zebra-lock.c b/util/zebra-lock.c
index 769de1b..14cc1d1 100644 (file)
--- a/util/zebra-lock.c
+++ b/util/zebra-lock.c
@@ -1,11 +1,37 @@
+/* $Id: zebra-lock.c,v 1.7 2002-08-02 19:26:57 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <assert.h>
+#include <stdio.h>
 
 #include <zebra-lock.h>
 
+
 int zebra_mutex_init (Zebra_mutex *p)
 {
-#if HAVE_PTHREAD_H
+    p->state = 1;
+#if YAZ_POSIX_THREADS
     pthread_mutex_init (&p->mutex, 0);
 #endif
 #ifdef WIN32
@@ -16,7 +42,12 @@ int zebra_mutex_init (Zebra_mutex *p)
 
 int zebra_mutex_destroy (Zebra_mutex *p)
 {
-#if HAVE_PTHREAD_H
+    --(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
@@ -27,7 +58,11 @@ int zebra_mutex_destroy (Zebra_mutex *p)
 
 int zebra_mutex_lock (Zebra_mutex *p)
 {
-#if HAVE_PTHREAD_H
+    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
@@ -38,7 +73,11 @@ int zebra_mutex_lock (Zebra_mutex *p)
 
 int zebra_mutex_unlock (Zebra_mutex *p)
 {
-#if HAVE_PTHREAD_H
+    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
@@ -51,7 +90,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
@@ -62,7 +101,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
@@ -71,7 +110,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);
@@ -83,7 +122,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);
@@ -95,7 +134,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)
     {
@@ -115,7 +154,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)
     {
@@ -134,7 +173,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
@@ -143,7 +182,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
@@ -152,7 +191,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;
@@ -161,7 +200,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;
@@ -170,7 +209,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;
@@ -179,7 +218,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;