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

diff --git a/src/mutex.c b/src/mutex.c
index 6360e30..d1cd50e 100644
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -21,40 +21,44 @@
 #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
 
-struct yaz_mutex {
-#ifdef WIN32
-    CRITICAL_SECTION handle;
-#elif YAZ_POSIX_THREADS
-    pthread_mutex_t handle;
-#endif
-    char *name;
-    int log_level;
-};
+#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(YAZ_MUTEX *p, 0);
+}
+
 void yaz_mutex_set_name(YAZ_MUTEX p, int log_level, const char *name)
 {
     if (p->name)
@@ -75,28 +79,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 +131,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
     }
 }
 
@@ -124,6 +148,8 @@ void yaz_mutex_destroy(YAZ_MUTEX *p)
 #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)