INN commit: branches/2.4 (configure configure.in storage/ovdb/ovdb.c)

INN Commit Russ_Allbery at isc.org
Sat Apr 12 21:58:19 UTC 2008


    Date: Saturday, April 12, 2008 @ 14:58:18
  Author: iulius
Revision: 7765

INN now supports Berkeley DB 4.6.  Thanks to Marco d'Itri for the patch.

Modified:
  branches/2.4/configure
  branches/2.4/configure.in
  branches/2.4/storage/ovdb/ovdb.c

---------------------+
 configure           |    4 ++--
 configure.in        |    4 ++--
 storage/ovdb/ovdb.c |    6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

Modified: configure
===================================================================
--- configure	2008-04-12 21:53:19 UTC (rev 7764)
+++ configure	2008-04-12 21:58:18 UTC (rev 7765)
@@ -7526,7 +7526,7 @@
     if test x"$BERKELEY_DB_DIR" = xyes ; then
         for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \
                  BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 \
-                 BerkeleyDB.4.3 BerkeleyDB.4.4; do
+                 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6; do
             for d in $prefix /usr/local /opt /usr ; do
                 if test -d "$d/$v" ; then
                     BERKELEY_DB_DIR="$d/$v"
@@ -7536,7 +7536,7 @@
         done
     fi
     if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in db44 db43 db42 db41 db4 db3 db2 ; do
+        for v in db46 db45 db44 db43 db42 db41 db4 db3 db2 ; do
             if test -d "/usr/local/include/$v" ; then
                 BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
                 BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"

Modified: configure.in
===================================================================
--- configure.in	2008-04-12 21:53:19 UTC (rev 7764)
+++ configure.in	2008-04-12 21:58:18 UTC (rev 7765)
@@ -636,7 +636,7 @@
     if test x"$BERKELEY_DB_DIR" = xyes ; then
         for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \
                  BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 \
-                 BerkeleyDB.4.3 BerkeleyDB.4.4; do
+                 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6; do
             for d in $prefix /usr/local /opt /usr ; do
                 if test -d "$d/$v" ; then
                     BERKELEY_DB_DIR="$d/$v"
@@ -646,7 +646,7 @@
         done
     fi
     if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in db44 db43 db42 db41 db4 db3 db2 ; do
+        for v in db46 db45 db44 db43 db42 db41 db4 db3 db2 ; do
             if test -d "/usr/local/include/$v" ; then
                 BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
                 BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"

Modified: storage/ovdb/ovdb.c
===================================================================
--- storage/ovdb/ovdb.c	2008-04-12 21:53:19 UTC (rev 7764)
+++ storage/ovdb/ovdb.c	2008-04-12 21:58:18 UTC (rev 7765)
@@ -1526,7 +1526,13 @@
 
     OVDBenv->set_errcall(OVDBenv, OVDBerror);
     OVDBenv->set_cachesize(OVDBenv, 0, ovdb_conf.cachesize, 1);
+#if DB_VERSION_MAJOR >= 4
+    OVDBenv->set_lk_max_locks(OVDBenv, ovdb_conf.maxlocks);
+    OVDBenv->set_lk_max_lockers(OVDBenv, ovdb_conf.maxlocks);
+    OVDBenv->set_lk_max_objects(OVDBenv, ovdb_conf.maxlocks);
+#else
     OVDBenv->set_lk_max(OVDBenv, ovdb_conf.maxlocks);
+#endif
 
 #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 2)
     if(ovdb_conf.txn_nosync)



More information about the inn-committers mailing list