From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 23 Oct 2009 17:06:59 +0000 (+0200)
Subject: add lmgr to bconsole
X-Git-Tag: Release-7.0.0~2598^2~52
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5db318020b91b03389a4553fad8648e890d39591;p=bacula%2Fbacula

add lmgr to bconsole
---

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index e7cdf0fd53..26629ad669 100644
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -590,6 +590,7 @@ int main(int argc, char *argv[])
    textdomain("bacula");
 
    init_stack_dump();
+   lmgr_init_thread();
    my_name_is(argc, argv, "bconsole");
    init_msg(NULL, NULL);
    working_directory = "/tmp";
diff --git a/bacula/src/lib/lockmgr.c b/bacula/src/lib/lockmgr.c
index 7ded06978e..d11017c43d 100644
--- a/bacula/src/lib/lockmgr.c
+++ b/bacula/src/lib/lockmgr.c
@@ -243,7 +243,8 @@ public:
    }
 
    void _dump(FILE *fp) {
-      fprintf(fp, "threadid=0x%x max=%i current=%i\n", (int)thread_id, max, current);
+      fprintf(fp, "threadid=%p max=%i current=%i\n", 
+              (void *)thread_id, max, current);
       for(int i=0; i<=current; i++) {
          fprintf(fp, "   lock=%p state=%c %s:%i\n", 
                lock_list[i].lock, lock_list[i].state,