Debugging level "mutex" enables log mutexes

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 4e4b1ef..cb69a5e 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -171,8 +171,7 @@ static int sc_main(
         yaz_log(YLOG_FATAL, "Configuration must be given with option -f");
         return 1;
     }
         yaz_log(YLOG_FATAL, "Configuration must be given with option -f");
         return 1;
     }

-    if (global_parameters.debug_mode > 1)
-        pazpar2_mutex_enable_debug(1);
+    pazpar2_mutex_init();

     
     config = config_create(config_fname, global_parameters.dump_records);
     if (!config)
     
     config = config_create(config_fname, global_parameters.dump_records);
     if (!config)

diff --git a/src/ppmutex.c b/src/ppmutex.c
index fa187b2..c389db4 100644 (file)
--- a/src/ppmutex.c
+++ b/src/ppmutex.c
@@ -26,22 +26,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #include <assert.h>
 #endif
 
 #include <assert.h>

-
+#include <yaz/log.h>

 #include "ppmutex.h"
 
 #include "ppmutex.h"
 

-static int pazpar2_mutex_debug = 0;
+static int ppmutex_level = 0;

 
 

-void pazpar2_mutex_enable_debug(int debug)
+void pazpar2_mutex_init(void)

 {
 {

-    pazpar2_mutex_debug = debug;
+    ppmutex_level = yaz_log_module_level("mutex");

 }
 
 void pazpar2_mutex_create(YAZ_MUTEX *p, const char *name)
 {
     assert(p);
     yaz_mutex_create(p);
 }
 
 void pazpar2_mutex_create(YAZ_MUTEX *p, const char *name)
 {
     assert(p);
     yaz_mutex_create(p);

-    if (pazpar2_mutex_debug && name)
-        yaz_mutex_set_name(*p, name);
+    yaz_mutex_set_name(*p, ppmutex_level, name);

 }
 
 /*
 }
 
 /*

diff --git a/src/ppmutex.h b/src/ppmutex.h
index c6b8c9e..d924e7f 100644 (file)
--- a/src/ppmutex.h
+++ b/src/ppmutex.h
@@ -26,10 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <yaz/mutex.h>
 
 
 #include <yaz/mutex.h>
 

-YAZ_EXPORT
-void pazpar2_mutex_enable_debug(int debug);
+void pazpar2_mutex_init(void);

 
 

-YAZ_EXPORT

 void pazpar2_mutex_create(YAZ_MUTEX *p, const char *name);
 
 #endif
 void pazpar2_mutex_create(YAZ_MUTEX *p, const char *name);
 
 #endif