[Bacula-commits] git: Bacula branch, Branch-5.1, updated. 5ccc5611bd8e2c22dcad18f5e0079a3ec3b42031

[Kern S. <ke...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula".

The branch, Branch-5.1 has been updated
       via  5ccc5611bd8e2c22dcad18f5e0079a3ec3b42031 (commit)
       via  2592e95eac7f56d63abf7cf965c6f48b814cfe98 (commit)
       via  b390ec004c2e45da0d2335b9fa238bc393cd1748 (commit)
       via  7692f0a1f738ea2086133880d7c2b31bda1b46c7 (commit)
       via  327f5f19af5a95f14944de5e0d4f7657b0afcf89 (commit)
       via  05113fbf03b1625da22ad9e92a6d3574410c131c (commit)
      from  b32f473222bc1a030109093973a671109d84654a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5ccc5611bd8e2c22dcad18f5e0079a3ec3b42031
Author: Kern Sibbald <ke...@si...>
Date:   Mon Jan 24 20:31:35 2011 +0100

    Tweak update date and version

commit 2592e95eac7f56d63abf7cf965c6f48b814cfe98
Author: Kern Sibbald <ke...@si...>
Date:   Sat Jan 22 18:00:06 2011 +0100

    Tweak bacula-ctl scripts for valgrind

commit b390ec004c2e45da0d2335b9fa238bc393cd1748
Author: Kern Sibbald <ke...@si...>
Date:   Sat Jan 22 20:29:56 2011 +0100

    Tweak tree.c debugging

commit 7692f0a1f738ea2086133880d7c2b31bda1b46c7
Author: Kern Sibbald <ke...@si...>
Date:   Sun Jan 23 12:01:49 2011 +0100

    Free unused pool memory after restore

commit 327f5f19af5a95f14944de5e0d4f7657b0afcf89
Author: Kern Sibbald <ke...@si...>
Date:   Sun Jan 23 12:02:04 2011 +0100

    Add pool memory debug output

commit 05113fbf03b1625da22ad9e92a6d3574410c131c
Author: Kern Sibbald <ke...@si...>
Date:   Thu Jan 13 20:14:32 2011 +0100

    Fix build of Windows bat -- Qt depends on libgcc_s_dw2-1.dll

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/scripts/bacula-ctl-dir.in b/bacula/scripts/bacula-ctl-dir.in
index 65cb888..0389584 100644
--- a/bacula/scripts/bacula-ctl-dir.in
+++ b/bacula/scripts/bacula-ctl-dir.in
@@ -208,7 +208,7 @@ case "$1" in
 	    OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
 	 fi
 
-	 if [ "x${VALGRIND}" = "x1" ]; then
+	 if [ "x${VALGRIND_DIR}" = "x1" ]; then
 	    valgrind --leak-check=full ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
 	 else
 	    ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
diff --git a/bacula/scripts/bacula-ctl-fd.in b/bacula/scripts/bacula-ctl-fd.in
index 86ad8db..3393ce6 100644
--- a/bacula/scripts/bacula-ctl-fd.in
+++ b/bacula/scripts/bacula-ctl-fd.in
@@ -208,7 +208,11 @@ case "$1" in
 	    OPTIONS="${OPTIONS} -g ${FD_GROUP}"
 	 fi
 
-	 ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+	 if [ "x${VALGRIND_FD}" = "x1" ]; then
+	    valgrind --leak-check=full ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+	 else
+	    ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+	 fi
       }
       ;;
 
diff --git a/bacula/scripts/bacula-ctl-sd.in b/bacula/scripts/bacula-ctl-sd.in
index 99ee115..1f85921 100644
--- a/bacula/scripts/bacula-ctl-sd.in
+++ b/bacula/scripts/bacula-ctl-sd.in
@@ -208,7 +208,11 @@ case "$1" in
 	    OPTIONS="${OPTIONS} -g ${SD_GROUP}"
 	 fi
 
-	 ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+	 if [ "x${VALGRIND_SD}" = "x1" ]; then
+	    valgrind --leak-check=full ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+	 else
+	    ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+	 fi
       }
       ;;
 
diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index b6e3912..7393f58 100644
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2002-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2002-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -46,7 +46,6 @@
 extern void print_bsr(UAContext *ua, RBSR *bsr);
 
 
-
 /* Forward referenced functions */
 static int last_full_handler(void *ctx, int num_fields, char **row);
 static int jobid_handler(void *ctx, int num_fields, char **row);
@@ -295,6 +294,7 @@ int restore_cmd(UAContext *ua, const char *cmd)
    parse_ua_args(ua);
    run_cmd(ua, ua->cmd);
    free_rx(&rx);
+   close_memory_pool();            /* release freed pool memory */
    return 1;
 
 bail_out:
@@ -311,6 +311,7 @@ bail_out:
    }
 
    free_rx(&rx);
+   close_memory_pool();            /* release freed pool memory */
    return 0;
 
 }
diff --git a/bacula/src/lib/mem_pool.c b/bacula/src/lib/mem_pool.c
index 2c8f9e4..a371fdd 100644
--- a/bacula/src/lib/mem_pool.c
+++ b/bacula/src/lib/mem_pool.c
@@ -404,7 +404,10 @@ void close_memory_pool()
       }
       pool_ctl[i].free_buf = NULL;
    }
-   Dmsg2(100, "Freed mem_pool count=%d size=%s\n", count, edit_uint64_with_commas(bytes, ed1));
+   Dmsg2(001, "Freed mem_pool count=%d size=%s\n", count, edit_uint64_with_commas(bytes, ed1));
+   if (debug_level >= 1) {
+      print_memory_pool_stats();
+   }
    V(mutex);
 
 }
diff --git a/bacula/src/lib/tree.c b/bacula/src/lib/tree.c
index 3dbb962..f9fc4ac 100644
--- a/bacula/src/lib/tree.c
+++ b/bacula/src/lib/tree.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2002-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -170,17 +170,19 @@ static char *tree_alloc(TREE_ROOT *root, int size)
 void free_tree(TREE_ROOT *root)
 {
    struct s_mem *mem, *rel;
+   uint32_t freed_blocks = 0;
 
    for (mem=root->mem; mem; ) {
       rel = mem;
       mem = mem->next;
       free(rel);
+      freed_blocks++;
    }
    if (root->cached_path) {
       free_pool_memory(root->cached_path);
       root->cached_path = NULL;
    }
-   Dmsg2(400, "Total size=%u blocks=%d\n", root->total_size, root->blocks);
+   Dmsg3(100, "Total size=%u blocks=%u freed_blocks=%u\n", root->total_size, root->blocks, freed_blocks);
    free(root);
    return;
 }
diff --git a/bacula/src/version.h b/bacula/src/version.h
index a40023f..fae317b 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,16 +1,16 @@
 
 #undef  VERSION
-#define VERSION "5.1.7"
-#define BDATE   "24 July 2010"
-#define LSMDATE "24Jul10"
+#define VERSION "5.1.8"
+#define BDATE   "24 January 2011"
+#define LSMDATE "24Jan11"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2010 Free Software Foundation Europe e.V.\n"
-#define BYEAR "2010"       /* year for copyright messages in progs */
+#define BYEAR "2011"       /* year for copyright messages in progs */
 
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index 188d17f..1004c67 100644
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -47,7 +47,8 @@ DEPKGS_BINARIES := \
 	mkisofs.exe \
 	growisofs.exe \
 	QtCore4.dll \
-	QtGui4.dll
+	QtGui4.dll \
+	libgcc_s_dw2-1.dll
 
 NONGCC_BINARIES :=
 
diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi
index 2e0d668..49da832 100644
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -503,6 +503,7 @@ Section "Bat Console" SecBatConsole
   Call InstallCommonFiles
   File "${SRC_DIR}\QtCore4.dll"
   File "${SRC_DIR}\QtGui4.dll"
+  File "${SRC_DIR}\libgcc_s_dw2-1.dll"
 
   File "${SRC_DIR}\bat.exe"
 
diff --git a/bacula/src/win32/win64_installer/Makefile b/bacula/src/win32/win64_installer/Makefile
index 8ae15e0..eddc9a8 100644
--- a/bacula/src/win32/win64_installer/Makefile
+++ b/bacula/src/win32/win64_installer/Makefile
@@ -159,6 +159,7 @@ $(INSTALL_EXE): winbacula.nsi $(addprefix release64/,$(BACULA_BINARIES) $(DEPKGS
 	cp -f ../release32/bat.exe release64
 	cp -f ../release32/QtCore4.dll release64
 	cp -f ../release32/QtGui4.dll release64
+	cp -f ../win32_installer/release32/libgcc_s_dw2-1.dll release64
 	cp -f ../win32_installer/release32/mingwm10.dll release64
 	cp -f ../win32_installer/release32/ssleay32.dll release64
 	cp -f ../win32_installer/release32/libeay32.dll release64
diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index 27a0915..59b5a15 100644
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -509,6 +509,7 @@ Section "Bat Console" SecBatConsole
   Call InstallCommonFiles
   File "${SRC_DIR}\QtCore4.dll"
   File "${SRC_DIR}\QtGui4.dll"
+  File "${SRC_DIR}\libgcc_s_dw2-1.dll"
   File "${SRC_DIR}\mingwm10.dll"
   File "${SRC_DIR}\ssleay32.dll"
   File "${SRC_DIR}\libeay32.dll"


hooks/post-receive
-- 
Bacula