Updates for Windows WRT timing and condition vars

[yaz-moved-to-github.git] / src / mutex.c

diff --git a/src/mutex.c b/src/mutex.c
index 6360e30..6b80fe5 100644 (file)
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -21,9 +21,15 @@
 #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
@@ -40,6 +46,14 @@ struct yaz_mutex {
     int log_level;
 };
 
+struct yaz_cond {
+#ifdef WIN32
+    CONDITION_VARIABLE cond;
+#elif YAZ_POSIX_THREADS
+    pthread_cond_t cond;
+#endif
+};
+
 void yaz_mutex_create(YAZ_MUTEX *p)
 {
     if (!*p)
@@ -75,28 +89,47 @@ void yaz_mutex_enter(YAZ_MUTEX p)
 #ifdef WIN32
         EnterCriticalSection(&p->handle);
 #elif YAZ_POSIX_THREADS
-        int r = 1;
+        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 name=%s waiting", p, p->name);
+                        "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);
             }
         }
-        /* r == 0 if already locked */
-        if (r && pthread_mutex_lock(&p->handle))
+        if (r)
         {
-            yaz_log(p->log_level ? p->log_level : YLOG_WARN,
-                    "yaz_mutex_enter: %p error", p);
+            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
-        if (p->log_level)
-        {
-            yaz_log(p->log_level, "yaz_mutex_enter: %p name=%s lock", p,
-                    p->name);
-        }
     }
 }
 
@@ -108,12 +141,13 @@ void yaz_mutex_leave(YAZ_MUTEX p)
         LeaveCriticalSection(&p->handle);
 #elif YAZ_POSIX_THREADS
         pthread_mutex_unlock(&p->handle);
-#endif
         if (p->log_level)
         {
-            yaz_log(p->log_level, "yaz_mutex_leave: %p name=%s unlock", p,
-                    p->name);
+            yaz_log(p->log_level,
+                    "yaz_mutex_leave: %p tid=%p name=%s unlock",
+                    p, (void *) pthread_self(), p->name);
         }
+#endif
     }
 }
 
@@ -133,6 +167,85 @@ 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