/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 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>
#endif
#if YAZ_POSIX_THREADS
#include <pthread.h>
#endif
-#if YAZ_GNU_THREADS
-#include <pth.h>
+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
-struct yaz_mutex {
- CRITICAL_SECTION m_handle;
-};
+ CONDITION_VARIABLE cond;
#elif YAZ_POSIX_THREADS
-struct yaz_mutex {
- pthread_mutex_t m_handle;
-};
-#elif YAZ_GNU_THREADS
-struct yaz_mutex {
- pth_mutex_t m_handle;
-};
-#else
-struct yaz_mutex {
- int dummy;
-};
+ pthread_cond_t cond;
#endif
+};
-YAZ_EXPORT void yaz_mutex_create(YAZ_MUTEX *p)
+void yaz_mutex_create(YAZ_MUTEX *p)
{
if (!*p)
{
*p = (YAZ_MUTEX) malloc(sizeof(**p));
#ifdef WIN32
- InitializeCriticalSection(&(*p)->m_handle);
+ InitializeCriticalSection(&(*p)->handle);
#elif YAZ_POSIX_THREADS
- pthread_mutex_init(&(*p)->m_handle, 0);
-#elif YAZ_GNU_THREADS
- pth_mutex_init(&(*p)->m_handle);
+ pthread_mutex_init(&(*p)->handle, 0);
#endif
+ (*p)->name = 0;
+ (*p)->log_level = 0;
}
}
-YAZ_EXPORT void yaz_mutex_enter(YAZ_MUTEX p)
+void yaz_mutex_set_name(YAZ_MUTEX p, int log_level, const char *name)
+{
+ if (p->name)
+ free(p->name);
+ p->name = 0;
+ p->log_level = 0;
+ if (name)
+ {
+ p->name = strdup(name);
+ p->log_level = log_level;
+ }
+}
+
+void yaz_mutex_enter(YAZ_MUTEX p)
{
if (p)
{
#ifdef WIN32
- EnterCriticalSection(&p->m_handle);
+ EnterCriticalSection(&p->handle);
#elif YAZ_POSIX_THREADS
- pthread_mutex_lock(&p->m_handle);
+ int r = 1; /* signal : not locked (yet) */
+
+ if (p->log_level)
+ { /* debugging */
+ r = pthread_mutex_trylock(&p->handle);
+ if (r)
+ {
+#if HAVE_SYS_TIME_H
+ long long d;
+ struct timeval tv1, tv2;
+ gettimeofday(&tv1, 0);
+#endif
+ yaz_log(p->log_level,
+ "yaz_mutex_enter: %p tid=%p name=%s waiting",
+ p, (void *) pthread_self(), p->name);
+#if HAVE_SYS_TIME_H
+ r = pthread_mutex_lock(&p->handle);
+ gettimeofday(&tv2, 0);
+ d = 1000000LL * ((long long) tv2.tv_sec - tv1.tv_sec) +
+ tv2.tv_usec - tv1.tv_usec;
+ yaz_log(p->log_level, "yaz_mutex_enter: %p tid=%p name=%s "
+ "lock delay %lld",
+ p, (void *) pthread_self(), p->name, d);
+#endif
+ }
+ else
+ {
+ yaz_log(p->log_level, "yaz_mutex_enter: %p tid=%p name=%s lock",
+ p, (void *) pthread_self(), p->name);
+ }
+ }
+ if (r)
+ {
+ r = pthread_mutex_lock(&p->handle);
+ if (p->log_level)
+ {
+ yaz_log(p->log_level, "yaz_mutex_enter: %p tid=%p name=%s lock",
+ p, (void *) pthread_self(), p->name);
+ }
+ }
#endif
}
}
-YAZ_EXPORT void yaz_mutex_leave(YAZ_MUTEX p)
+void yaz_mutex_leave(YAZ_MUTEX p)
{
if (p)
{
#ifdef WIN32
- LeaveCriticalSection(&p->m_handle);
+ LeaveCriticalSection(&p->handle);
#elif YAZ_POSIX_THREADS
- pthread_mutex_unlock(&p->m_handle);
+ pthread_mutex_unlock(&p->handle);
+ if (p->log_level)
+ {
+ yaz_log(p->log_level,
+ "yaz_mutex_leave: %p tid=%p name=%s unlock",
+ p, (void *) pthread_self(), p->name);
+ }
#endif
}
}
-YAZ_EXPORT void yaz_mutex_destroy(YAZ_MUTEX *p)
+void yaz_mutex_destroy(YAZ_MUTEX *p)
+{
+ if (*p)
+ {
+#ifdef WIN32
+ DeleteCriticalSection(&(*p)->handle);
+#elif YAZ_POSIX_THREADS
+ pthread_mutex_destroy(&(*p)->handle);
+#endif
+ if ((*p)->name)
+ free((*p)->name);
+ free(*p);
+ *p = 0;
+ }
+}
+
+
+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
- DeleteCriticalSection(&(*p)->m_handle);
+#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
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff