upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-09 08:23:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bare minimum changes to support BDB 4.0

Browse source
This commit is contained in:
Howard Chu 2001-12-07 05:05:00 +00:00
parent 343e2df772
commit 66266f9c25
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-bdb/add.c
View file

@ -299,7 +299,7 @@ return_results:
if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
ldap_pvt_thread_yield();
txn_checkpoint( bdb->bi_dbenv,
TXN_CHECKPOINT( bdb->bi_dbenv,
bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
}

8
servers/slapd/back-bdb/back-bdb.h
View file

@ -110,6 +110,14 @@ struct bdb_op_info {
int boi_err;
};
#if DB_VERSION_MAJOR < 4
#define TXN_CHECKPOINT(env, k, m, f) txn_checkpoint(env, k, m, f)
#define LOCK_DETECT(env, f, t, a) lock_detect(env, f, t, a)
#else
#define TXN_CHECKPOINT(env, k, m, f) (env)->txn_checkpoint(env, k, m, f)
#define LOCK_DETECT(env, f, t, a) (env)->lock_detect(env, f, t, a)
#endif
LDAP_END_DECL
#include "proto-bdb.h"

2
servers/slapd/back-bdb/delete.c
View file

@ -316,7 +316,7 @@ return_results:
if(rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
ldap_pvt_thread_yield();
txn_checkpoint( bdb->bi_dbenv,
TXN_CHECKPOINT( bdb->bi_dbenv,
bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
}

4
servers/slapd/back-bdb/init.c
View file

@ -87,7 +87,7 @@ static void *lock_detect_task( void *arg )
int rc;
sleep( bdb->bi_lock_detect_seconds );
rc = lock_detect( bdb->bi_dbenv, 0,
rc = LOCK_DETECT( bdb->bi_dbenv, 0,
bdb->bi_lock_detect, NULL );
if( rc != 0 ) {
@ -311,7 +311,7 @@ bdb_db_destroy( BackendDB *be )
/* force a checkpoint */
if( bdb->bi_txn ) {
rc = txn_checkpoint( bdb->bi_dbenv, 0, 0, DB_FORCE );
rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
"bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",

2
servers/slapd/back-bdb/modify.c
View file

@ -330,7 +330,7 @@ return_results:
if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
ldap_pvt_thread_yield();
txn_checkpoint( bdb->bi_dbenv,
TXN_CHECKPOINT( bdb->bi_dbenv,
bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
}

2
servers/slapd/back-bdb/modrdn.c
View file

@ -635,7 +635,7 @@ return_results:
if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
ldap_pvt_thread_yield();
txn_checkpoint( bdb->bi_dbenv,
TXN_CHECKPOINT( bdb->bi_dbenv,
bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
}