Tweak mutex order for SD

[bacula/bacula] / bacula / src / version.h

diff --git a/bacula/src/version.h b/bacula/src/version.h
index b02c75667b6e79541fba6f7fa57fc8115ee90913..7ec359d2a3327324939a2506d05e797f082b9576 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "3.0.1"
-#define BDATE   "26 April 2009"
-#define LSMDATE "26Apr09"
+#define VERSION "3.1.6"
+#define BDATE   "06 December 2009"
+#define LSMDATE "06Dec09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
@@ -54,7 +54,26 @@
  *  penalties.
  */
 #ifdef DEVELOPER
-#define SMCHECK
+# define SMCHECK
+#endif
+
+/*
+ * _USE_LOCKMGR does lock/unlock mutex tracking (dead lock)
+ *   it can always be turned on, but we advise to use it only
+ *   for debug
+ */
+#if DEVELOPER
+# ifndef _USE_LOCKMGR
+#  define _USE_LOCKMGR
+# endif
+/*
+ * Enable priority management with the lock manager
+ */
+//# define USE_LOCKMGR_PRIORITY
+#endif
+
+#if !HAVE_LINUX_OS
+# undef _USE_LOCKMGR
 #endif
 
 /*
@@ -62,18 +81,18 @@
  *  run regress test.
  */
 #ifdef HAVE_LINUX_OS
-#define USE_VTAPE
+# define USE_VTAPE
 #endif
 
 /* 
  * for fastest speed but you must have a UPS to avoid unwanted shutdowns
  */
-#define SQLITE3_INIT_QUERY "PRAGMA synchronous = OFF"
+//#define SQLITE3_INIT_QUERY "PRAGMA synchronous = OFF"
 
 /*
  * for more safety, but is 30 times slower than above
  */
-//#define SQLITE3_INIT_QUERY "PRAGMA synchronous = NORMAL"
+#define SQLITE3_INIT_QUERY "PRAGMA synchronous = NORMAL"
 
 /*
  * This should always be on. It enables data encryption code