/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
#include <yaz/nmem.h>
#include <yaz/log.h>
#include <yaz/mutex.h>
-
+#include <yaz/gettimeofday.h>
#ifdef WIN32
#include <windows.h>
+#include <sys/timeb.h>
#endif
+#include <time.h>
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#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
-
-#elif YAZ_POSIX_THREADS
- pthread_cond_t cond;
-#endif
-};
+#include "mutex-p.h"
void yaz_mutex_create(YAZ_MUTEX *p)
{
EnterCriticalSection(&p->handle);
#elif YAZ_POSIX_THREADS
int r = 1; /* signal : not locked (yet) */
-
+
if (p->log_level)
{ /* debugging */
r = pthread_mutex_trylock(&p->handle);
}
}
-
-void yaz_cond_create(YAZ_COND *p)
-{
- *p = (YAZ_COND) malloc(sizeof(**p));
-#ifdef WIN32
-#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 timespec *abstime)
-{
-#ifdef WIN32
- return -1;
-#elif YAZ_POSIX_THREADS
- if (abstime)
- return pthread_cond_timedwait(&p->cond, &m->handle, abstime);
- else
- return pthread_cond_wait(&p->cond, &m->handle);
-#else
- return -1;
-#endif
-}
-
-int yaz_cond_signal(YAZ_COND p)
-{
-#ifdef WIN32
- return -1;
-#elif YAZ_POSIX_THREADS
- return pthread_cond_signal(&p->cond);
-#else
- return -1;
-#endif
-}
-
-int yaz_cond_broadcast(YAZ_COND p)
-{
-#ifdef WIN32
- return -1;
-#elif YAZ_POSIX_THREADS
- return pthread_cond_broadcast(&p->cond);
-#else
- return -1;
-#endif
-}
-
/*
* Local variables:
* c-basic-offset: 4