X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmutex.c;h=2ed3afca39e9bdd5a06ea2d064e269bff7d5cd68;hp=6b80fe5199931018b152fd29c75b82b40cb72b84;hb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35;hpb=a60cfb6333496199c7c1d52d67ab8a3835597b48

diff --git a/src/mutex.c b/src/mutex.c
index 6b80fe5..2ed3afc 100644
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
 
@@ -36,23 +36,7 @@
 #include <pthread.h>
 #endif
 
-struct yaz_mutex {
-#ifdef WIN32
-    CRITICAL_SECTION handle;
-#elif YAZ_POSIX_THREADS
-    pthread_mutex_t handle;
-#endif
-    char *name;
-    int log_level;
-};
-
-struct yaz_cond {
-#ifdef WIN32
-    CONDITION_VARIABLE cond;
-#elif YAZ_POSIX_THREADS
-    pthread_cond_t cond;
-#endif
-};
+#include "mutex-p.h"
 
 void yaz_mutex_create(YAZ_MUTEX *p)
 {
@@ -167,85 +151,6 @@ void yaz_mutex_destroy(YAZ_MUTEX *p)
     }
 }
 
-
-void yaz_cond_create(YAZ_COND *p)
-{
-    *p = (YAZ_COND) malloc(sizeof(**p));
-#ifdef WIN32
-    InitializeConditionVariable(&(*p)->cond);
-#elif YAZ_POSIX_THREADS
-    pthread_cond_init(&(*p)->cond, 0);
-#endif
-}
-
-void yaz_cond_destroy(YAZ_COND *p)
-{
-    if (*p)
-    {
-#ifdef WIN32
-#elif YAZ_POSIX_THREADS
-        pthread_cond_destroy(&(*p)->cond);
-#endif
-        free(*p);
-        *p = 0;
-    }
-}
-
-int yaz_cond_wait(YAZ_COND p, YAZ_MUTEX m, const struct timeval *abstime)
-{
-#ifdef WIN32
-    if (abstime)
-    {
-        struct timeval tval_now;
-        int sec, msec;
-
-        yaz_gettimeofday(&tval_now);
-
-        sec = abstime->tv_sec - tval_now.tv_sec;
-        msec = (abstime->tv_usec - tval_now.tv_usec) / 1000;
-        return SleepConditionVariableCS(&p->cond, &m->handle, sec*1000 + msec);
-    }
-    else
-        return SleepConditionVariableCS(&p->cond, &m->handle, INFINITE);
-#elif YAZ_POSIX_THREADS
-    if (abstime)
-    {
-        struct timespec s;
-        s.tv_sec = abstime->tv_sec;
-        s.tv_nsec = abstime->tv_usec * 1000;
-        return pthread_cond_timedwait(&p->cond, &m->handle, &s);
-    }
-    else
-        return pthread_cond_wait(&p->cond, &m->handle);
-#else
-    return -1;
-#endif
-}
-
-int yaz_cond_signal(YAZ_COND p)
-{
-#ifdef WIN32
-    WakeConditionVariable(&p->cond);
-    return 0;
-#elif YAZ_POSIX_THREADS
-    return pthread_cond_signal(&p->cond);
-#else
-    return -1;
-#endif
-}
-
-int yaz_cond_broadcast(YAZ_COND p)
-{
-#ifdef WIN32
-    WakeAllConditionVariable(&p->cond);
-    return 0;
-#elif YAZ_POSIX_THREADS
-    return pthread_cond_broadcast(&p->cond);
-#else
-    return -1;
-#endif
-}
-
 /*
  * Local variables:
  * c-basic-offset: 4