X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fzebra-lock.h;h=44de1f4604097d6ab574e7c7ca117a1c8cf970d0;hb=e5ebc859654d84aa9098142b34015648d8e333de;hp=b7d61648de0462083d1803eb53e5b15e096878de;hpb=eb2b742588ce07fb4516bbca22c93b938b13e433;p=idzebra-moved-to-github.git diff --git a/include/zebra-lock.h b/include/zebra-lock.h index b7d6164..44de1f4 100644 --- a/include/zebra-lock.h +++ b/include/zebra-lock.h @@ -2,6 +2,9 @@ #ifndef ZEBRA_LOCK_H #define ZEBRA_LOCK_H +#ifdef WIN32 +#include +#endif #if HAVE_PTHREAD_H #include #endif @@ -11,7 +14,16 @@ YAZ_BEGIN_CDECL typedef struct { +#ifdef WIN32 + CRITICAL_SECTION mutex; +#else +# if HAVE_PTHREAD_H pthread_mutex_t mutex; +# else + int dummy; +# endif +#endif + int state; } Zebra_mutex; YAZ_EXPORT int zebra_mutex_init (Zebra_mutex *p); @@ -22,8 +34,10 @@ YAZ_EXPORT int zebra_mutex_unlock (Zebra_mutex *p); typedef struct { int readers_reading; int writers_writing; +#if HAVE_PTHREAD_H pthread_mutex_t mutex; pthread_cond_t lock_free; +#endif } Zebra_lock_rdwr; YAZ_EXPORT int zebra_lock_rdwr_init (Zebra_lock_rdwr *p); @@ -33,5 +47,22 @@ YAZ_EXPORT int zebra_lock_rdwr_wlock (Zebra_lock_rdwr *p); YAZ_EXPORT int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p); YAZ_EXPORT int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p); +typedef struct { +#if HAVE_PTHREAD_H + pthread_mutex_t mutex; + pthread_cond_t cond; +#else + int dummy; +#endif +} Zebra_mutex_cond; + +YAZ_EXPORT int zebra_mutex_cond_init (Zebra_mutex_cond *p); +YAZ_EXPORT int zebra_mutex_cond_destroy (Zebra_mutex_cond *p); +YAZ_EXPORT int zebra_mutex_cond_lock (Zebra_mutex_cond *p); +YAZ_EXPORT int zebra_mutex_cond_unlock (Zebra_mutex_cond *p); +YAZ_EXPORT int zebra_mutex_cond_wait (Zebra_mutex_cond *p); +YAZ_EXPORT int zebra_mutex_cond_signal (Zebra_mutex_cond *p); + YAZ_END_CDECL + #endif