BugFix and selection in the test-suite of the bdb2 backend-specific

slapd server timing via a new slapd command line option '-t'.

diff --git a/servers/slapd/back-bdb2/abandon.c b/servers/slapd/back-bdb2/abandon.c
index bd12160f059669a6e04de350b189f2e70bf334f2..3e69e15f482822d65a7ece0517fa729aee2900dd 100644 (file)
--- a/servers/slapd/back-bdb2/abandon.c
+++ b/servers/slapd/back-bdb2/abandon.c
@@ -34,11 +34,11 @@ bdb2_back_abandon(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        ret = bdb2i_back_abandon_internal( be, conn, op, msgid );
 
-       bdb2i_stop_timing( be->be_private, time1, "ABND", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "ABND", conn, op );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/add.c b/servers/slapd/back-bdb2/add.c
index c96fd025ded574423b3caa82aa13daf26d79029d..c4e5147f682f006810fa556144af1bb66a0dacb4 100644 (file)
--- a/servers/slapd/back-bdb2/add.c
+++ b/servers/slapd/back-bdb2/add.c
@@ -239,7 +239,7 @@ bdb2_back_add(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        if ( bdb2i_enter_backend_w( get_dbenv( be ), &lock ) != 0 ) {
 
@@ -260,7 +260,7 @@ bdb2_back_add(
 
        ret = bdb2i_back_add_internal( be, conn, op, e );
        (void) bdb2i_leave_backend( get_dbenv( be ), lock );
-       bdb2i_stop_timing( be->be_private, time1, "ADD", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "ADD", conn, op );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/bind.c b/servers/slapd/back-bdb2/bind.c
index 47270e37b5793d43d43f2b603ab5a2cba502af76..8f0ae3c4a5992a0fffa3a1e5763488f5fe247ade 100644 (file)
--- a/servers/slapd/back-bdb2/bind.c
+++ b/servers/slapd/back-bdb2/bind.c
@@ -231,7 +231,7 @@ bdb2_back_bind(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        if ( bdb2i_enter_backend_r( get_dbenv( be ), &lock ) != 0 ) {
 
@@ -244,7 +244,7 @@ bdb2_back_bind(
 
        (void) bdb2i_leave_backend( get_dbenv( be ), lock );
 
-       bdb2i_stop_timing( be->be_private, time1, "BIND", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "BIND", conn, op );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/close.c b/servers/slapd/back-bdb2/close.c
index c956d1513cb377cfd7ca801c9e8e944716126464..9a78f07ab17a239e31f239b4e7d0271ab626fae5 100644 (file)
--- a/servers/slapd/back-bdb2/close.c
+++ b/servers/slapd/back-bdb2/close.c
@@ -32,11 +32,11 @@ bdb2_back_db_close( BackendDB *be )
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        ret = bdb2i_back_db_close_internal( be );
 
-       bdb2i_stop_timing( be->be_private, time1, "CLOSE", NULL, NULL );
+       bdb2i_stop_timing( be->bd_info, time1, "CLOSE", NULL, NULL );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/compare.c b/servers/slapd/back-bdb2/compare.c
index b0337db6065c1fd9d050544f48ab73a9fe94778e..00f37f17179bbc39247772e662ce565b01b27a2b 100644 (file)
--- a/servers/slapd/back-bdb2/compare.c
+++ b/servers/slapd/back-bdb2/compare.c
@@ -76,7 +76,7 @@ bdb2_back_compare(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        if ( bdb2i_enter_backend_r( get_dbenv( be ), &lock ) != 0 ) {
 
@@ -87,7 +87,7 @@ bdb2_back_compare(
 
        ret = bdb2i_back_compare_internal( be, conn, op, dn, ava );
        (void) bdb2i_leave_backend( get_dbenv( be ), lock );
-       bdb2i_stop_timing( be->be_private, time1, "CMP", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "CMP", conn, op );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/config.c b/servers/slapd/back-bdb2/config.c
index d67ea0f62b9430962a65f9b09ba0ecab56e00330..e38b8542ebbd22aa85bc081c1861b4b45d1beded 100644 (file)
--- a/servers/slapd/back-bdb2/config.c
+++ b/servers/slapd/back-bdb2/config.c
@@ -189,11 +189,11 @@ bdb2_back_db_config(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        ret = bdb2i_back_db_config_internal( be, fname, lineno, argc, argv );
 
-       bdb2i_stop_timing( be->be_private, time1, "DB-CONFIG", NULL, NULL );
+       bdb2i_stop_timing( be->bd_info, time1, "DB-CONFIG", NULL, NULL );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/delete.c b/servers/slapd/back-bdb2/delete.c
index ad009667884434b124208853ab0b149d48aadcca..d7fdb3cefa038bc8c1ef59588458c6f149ea823c 100644 (file)
--- a/servers/slapd/back-bdb2/delete.c
+++ b/servers/slapd/back-bdb2/delete.c
@@ -163,7 +163,7 @@ bdb2_back_delete(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        if ( bdb2i_enter_backend_w( get_dbenv( be ), &lock ) != 0 ) {
 
@@ -174,7 +174,7 @@ bdb2_back_delete(
 
        ret = bdb2i_back_delete_internal( be, conn, op, dn );
        (void) bdb2i_leave_backend( get_dbenv( be ), lock );
-       bdb2i_stop_timing( be->be_private, time1, "DEL", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "DEL", conn, op );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/group.c b/servers/slapd/back-bdb2/group.c
index a8f9d9c0ad17db3ddd966ca656a22a8bcb80fcbe..aa89afa078e3acab161832d81dcbba999fde0c6f 100644 (file)
--- a/servers/slapd/back-bdb2/group.c
+++ b/servers/slapd/back-bdb2/group.c
@@ -139,7 +139,7 @@ bdb2_back_group(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        if ( bdb2i_enter_backend_r( get_dbenv( be ), &lock ) != 0 ) {
 
@@ -151,7 +151,7 @@ bdb2_back_group(
                                        objectclassValue, groupattrName );
 
        (void) bdb2i_leave_backend( get_dbenv( be ), lock );
-       bdb2i_stop_timing( be->be_private, time1, "GRP", NULL, NULL );
+       bdb2i_stop_timing( be->bd_info, time1, "GRP", NULL, NULL );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/init.c b/servers/slapd/back-bdb2/init.c
index 2fd558cab52e4289809e9b5825d3bc93bb759c0a..eaa557f9deacde44c7a5c598322b5c3fc89e54f2 100644 (file)
--- a/servers/slapd/back-bdb2/init.c
+++ b/servers/slapd/back-bdb2/init.c
@@ -198,10 +198,10 @@ bdb2_back_db_init(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        ret = bdb2i_back_db_init_internal( be );
-       bdb2i_stop_timing( be->be_private, time1, "DB-INIT", NULL, NULL );
+       bdb2i_stop_timing( be->bd_info, time1, "DB-INIT", NULL, NULL );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/modify.c b/servers/slapd/back-bdb2/modify.c
index 4e602ef147d797c31fae82035252e1164333b0e6..d0c0ebe86a7881dec8bf6c25bcbffc37c66a7414 100644 (file)
--- a/servers/slapd/back-bdb2/modify.c
+++ b/servers/slapd/back-bdb2/modify.c
@@ -129,7 +129,7 @@ bdb2_back_modify(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        if ( bdb2i_enter_backend_w( get_dbenv( be ), &lock ) != 0 ) {
 
@@ -150,7 +150,7 @@ bdb2_back_modify(
 
         ret = bdb2i_back_modify_internal( be, conn, op, dn, modlist );
        (void) bdb2i_leave_backend( get_dbenv( be ), lock );
-       bdb2i_stop_timing( be->be_private, time1, "MOD", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "MOD", conn, op );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/modrdn.c b/servers/slapd/back-bdb2/modrdn.c
index 28c764e8ddd1549f5f9e4e6293afb027349c12e8..1cd85cb5d69c9b1f1432da2864c061dca7b275dd 100644 (file)
--- a/servers/slapd/back-bdb2/modrdn.c
+++ b/servers/slapd/back-bdb2/modrdn.c
@@ -206,7 +206,7 @@ bdb2_back_modrdn(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        if ( bdb2i_enter_backend_w( get_dbenv( be ), &lock ) != 0 ) {
 
@@ -219,7 +219,7 @@ bdb2_back_modrdn(
                                        newrdn, deleteoldrdn );
 
        (void) bdb2i_leave_backend( get_dbenv( be ), lock );
-       bdb2i_stop_timing( be->be_private, time1, "MODRDN", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "MODRDN", conn, op );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/search.c b/servers/slapd/back-bdb2/search.c
index cee22b908225271275168340d3e4ac889fd4dede..60b9d417e6ab96bf1b6264db9529ef21fe755205 100644 (file)
--- a/servers/slapd/back-bdb2/search.c
+++ b/servers/slapd/back-bdb2/search.c
@@ -335,7 +335,7 @@ bdb2_back_search(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        if ( bdb2i_enter_backend_r( get_dbenv( be ), &lock ) != 0 ) {
 
@@ -348,7 +348,7 @@ bdb2_back_search(
                                        slimit, tlimit, filter, filterstr, attrs, attrsonly );
 
        (void) bdb2i_leave_backend( get_dbenv( be ), lock );
-       bdb2i_stop_timing( be->be_private, time1, "SRCH", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "SRCH", conn, op );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/startup.c b/servers/slapd/back-bdb2/startup.c
index 3c7b6ecb7ede5e32830d4bf614093579b205a9a5..07a4b8d7d90eb658b8f8e9f3d76b90e7847363dd 100644 (file)
--- a/servers/slapd/back-bdb2/startup.c
+++ b/servers/slapd/back-bdb2/startup.c
@@ -191,10 +191,10 @@ bdb2_back_db_startup(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        ret = bdb2i_back_db_startup_internal( be );
-       bdb2i_stop_timing( be->be_private, time1, "DB-START", NULL, NULL );
+       bdb2i_stop_timing( be->bd_info, time1, "DB-START", NULL, NULL );
 
        return( ret );
 }
@@ -208,10 +208,10 @@ bdb2_back_db_shutdown(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        ret = bdb2i_back_db_shutdown_internal( be );
-       bdb2i_stop_timing( be->be_private, time1, "DB-SHUTDOWN", NULL, NULL );
+       bdb2i_stop_timing( be->bd_info, time1, "DB-SHUTDOWN", NULL, NULL );
 
        return( ret );
 }

diff --git a/servers/slapd/back-bdb2/unbind.c b/servers/slapd/back-bdb2/unbind.c
index f4aa508fda777884d77afe350d544ac76fbe3e42..6b3a8757d34e233215e7497413c5302528be9e33 100644 (file)
--- a/servers/slapd/back-bdb2/unbind.c
+++ b/servers/slapd/back-bdb2/unbind.c
@@ -29,10 +29,10 @@ bdb2_back_unbind(
        struct timeval  time1;
        int             ret;
 
-       bdb2i_start_timing( be->be_private, &time1 );
+       bdb2i_start_timing( be->bd_info, &time1 );
 
        ret = bdb2i_back_unbind_internal( be, conn, op );
-       bdb2i_stop_timing( be->be_private, time1, "UNBIND", conn, op );
+       bdb2i_stop_timing( be->bd_info, time1, "UNBIND", conn, op );
 
        return( ret );
 }

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index f7d9bf8d60791e83b31e258f588557a0fbe5b265..50c8497c45f3ba73630c3ae430d062d49e8db944 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -17,6 +17,7 @@ if test "$BACKEND" = "bdb2" ; then
        ACLCONF=$DATADIR/slapd-bdb2-acl.conf
        MASTERCONF=$DATADIR/slapd-bdb2-repl-master.conf
        SLAVECONF=$DATADIR/slapd-bdb2-repl-slave.conf
+       TIMING="-t"
 else
        LDIF2LDBM=../servers/slapd/tools/ldif2ldbm
        CONF=$DATADIR/slapd-master.conf

diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm
index 2c9ea80826fd30d5e20ec1cb91dbc8658f8012fb..6ab1a5c52b7034a8c5be920560baa1caa772d995 100755 (executable)
--- a/tests/scripts/test001-ldif2ldbm
+++ b/tests/scripts/test001-ldif2ldbm
@@ -28,7 +28,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 2c9ea80826fd30d5e20ec1cb91dbc8658f8012fb..6ab1a5c52b7034a8c5be920560baa1caa772d995 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -28,7 +28,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index afc71f45ad877b18dadcaea54bc1b6c50fa35c12..7852062ba11310a472d26064dc2977f0d8224822 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -16,7 +16,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to check that slapd is running..."

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index e5b5a2ab81cad83e23999614b57675b1bce5a62c..a5838c791867f97fa0c2a9bd64a7c33354423421 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -24,7 +24,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd searching..."

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 352c66c35fc01bb8fa8829184c099abb6d9b8cbb..a227160eaee4e1d05b017c062fd99b175e6c5ac8 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -24,7 +24,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd modify operations..."

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 6d03e68422ab92e652294ebf512e5cff13d50ec3..c9b378f97c5daae31a516f6d22ee1c8745a726de 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -24,7 +24,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $ACLCONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
+$SLAPD -f $ACLCONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd access control..."

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index b66f03a1e177a17f222a79db162e2aca91de755f..b2820ef4c1bee526ca715adb9684bb811904643c 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -33,11 +33,11 @@ echo "Cleaning up in $REPLDIR..."
 rm -f $REPLDIR/[!C]*
 
 echo "Starting master slapd on TCP/IP port $PORT..."
-$SLAPD -f $MASTERCONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
+$SLAPD -f $MASTERCONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
-$SLAPD -f $SLAVECONF -p $SLAVEPORT -d $LVL > $SLAVELOG 2>&1 &
+$SLAPD -f $SLAVECONF -p $SLAVEPORT -d $LVL $TIMING > $SLAVELOG 2>&1 &
 SLAVEPID=$!
 
 echo "Using ldapsearch to check that master slapd is running..."