X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmutex.c;h=aff0a131f77e04393a6e1e0b41de380d5576f316;hb=6f2f82e34ee173a0626432b57ebcbb8375e83a68;hp=fad796b2779288d5076f50e5cdcba7ae26a307ed;hpb=0836f7a70cff4b7a8edc2c2a2fd1b3cb2c6588cc;p=yaz-moved-to-github.git

diff --git a/src/mutex.c b/src/mutex.c
index fad796b..aff0a13 100644
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -26,6 +26,10 @@
 #include <windows.h>
 #endif
 
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #if YAZ_POSIX_THREADS
 #include <pthread.h>
 #endif
@@ -37,6 +41,7 @@ struct yaz_mutex {
     pthread_mutex_t handle;
 #endif
     char *name;
+    int log_level;
 };
 
 void yaz_mutex_create(YAZ_MUTEX *p)
@@ -50,16 +55,21 @@ void yaz_mutex_create(YAZ_MUTEX *p)
         pthread_mutex_init(&(*p)->handle, 0);
 #endif
         (*p)->name = 0;
+        (*p)->log_level = 0;
     }
 }
 
-void yaz_mutex_set_name(YAZ_MUTEX p, const char *name)
+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)
@@ -69,25 +79,47 @@ void yaz_mutex_enter(YAZ_MUTEX p)
 #ifdef WIN32
         EnterCriticalSection(&p->handle);
 #elif YAZ_POSIX_THREADS
-        int r = 1;
-        if (p->name)
+        int r = 1; /* signal : not locked (yet) */
+        
+        if (p->log_level)
         {   /* debugging */
             r = pthread_mutex_trylock(&p->handle);
             if (r)
             {
-                yaz_log(YLOG_WARN|YLOG_ERRNO,
-                        "yaz_mutex_enter: %p name=%s waiting", p, p->name);
+#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 && pthread_mutex_lock(&p->handle))
+        if (r)
         {
-            yaz_log(YLOG_WARN|YLOG_ERRNO, "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->name)
-        {
-            yaz_log(YLOG_LOG, "yaz_mutex_enter: %p name=%s lock", p, p->name);
-        }
     }
 }
 
@@ -99,11 +131,13 @@ void yaz_mutex_leave(YAZ_MUTEX p)
         LeaveCriticalSection(&p->handle);
 #elif YAZ_POSIX_THREADS
         pthread_mutex_unlock(&p->handle);
-#endif
-        if (p->name)
+        if (p->log_level)
         {
-            yaz_log(YLOG_LOG, "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
     }
 }