X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmutex.c;h=d1cd50e4bc70a4ed04683fb86fcadb1021815585;hp=9db9a54e49507e98fe497c30bc74381914d8f764;hb=9f11f349958f122419856006d9295eb0ce41274d;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c

diff --git a/src/mutex.c b/src/mutex.c
index 9db9a54..d1cd50e 100644
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 
@@ -21,83 +21,139 @@
 #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 YAZ_POSIX_THREADS
-#include <pthread.h>
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
 
-#if YAZ_GNU_THREADS
-#include <pth.h>
+#if YAZ_POSIX_THREADS
+#include <pthread.h>
 #endif
 
-#ifdef WIN32
-struct yaz_mutex {
-    CRITICAL_SECTION m_handle;
-};
-#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;
-};
-#endif
+#include "mutex-p.h"
 
-YAZ_EXPORT 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)->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);
+        (*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;
     }
 }
 
-YAZ_EXPORT void yaz_mutex_enter(YAZ_MUTEX p)
+void yaz_mutex_create(YAZ_MUTEX *p) {
+    yaz_mutex_create(YAZ_MUTEX *p, 0);
+}
+
+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)->m_handle);
+        DeleteCriticalSection(&(*p)->handle);
+#elif YAZ_POSIX_THREADS
+        pthread_mutexattr_destroy(&(*p)->attr);
+        free((*p)->attr);
+        pthread_mutex_destroy(&(*p)->handle);
 #endif
+        if ((*p)->name)
+            free((*p)->name);
         free(*p);
         *p = 0;
     }