#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)
-{
+void yaz_mutex_create_attr(YAZ_MUTEX *p, int flags) {
if (!*p)
{
*p = (YAZ_MUTEX) malloc(sizeof(**p));
#ifdef WIN32
InitializeCriticalSection(&(*p)->handle);
#elif YAZ_POSIX_THREADS
- pthread_mutex_init(&(*p)->handle, 0);
+ (*p)->attr = malloc(sizeof( (*p)->attr));
+ pthread_mutexattr_init((*p)->attr);
+ pthread_mutexattr_settype((*p)->attr, flags);
+ pthread_mutex_init(&(*p)->handle, (*p)->attr);
#endif
(*p)->name = 0;
(*p)->log_level = 0;
}
}
+void yaz_mutex_create(YAZ_MUTEX *p) {
+ yaz_mutex_create_attr(p, 0);
+}
+
void yaz_mutex_set_name(YAZ_MUTEX p, int log_level, const char *name)
{
if (p->name)
#ifdef WIN32
DeleteCriticalSection(&(*p)->handle);
#elif YAZ_POSIX_THREADS
+ pthread_mutexattr_destroy((*p)->attr);
+ free((*p)->attr);
pthread_mutex_destroy(&(*p)->handle);
#endif
if ((*p)->name)
}
}
-
-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