mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Save DB_LOCK structure so it can be released later.

Browse Source
This commit is contained in:
Howard Chu 2003-03-26 13:33:51 +00:00
parent c9ec6b0cab
commit 51e10cf23c
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
servers/slapd/back-bdb/back-bdb.h
View File

@ -155,6 +155,7 @@ struct bdb_info {
struct bdb_op_info {
BackendDB* boi_bdb;
DB_TXN* boi_txn;
DB_LOCK boi_lock; /* used when no txn */
u_int32_t boi_err;
u_int32_t boi_locker;
int boi_acl_cache;

21
servers/slapd/back-bdb/id2entry.c
View File

@ -251,13 +251,24 @@ int bdb_entry_release(
int rw )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
struct bdb_op_info *boi = NULL;
/* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_MODE,
SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */
if ( slapMode == SLAP_SERVER_MODE ) {
/* free entry and reader or writer lock */
bdb_unlocked_cache_return_entry_rw( &bdb->bi_cache, e, rw );
if ( o ) {
boi = (struct bdb_op_info *)o->o_private;
}
/* lock is freed with txn */
if ( boi && boi->boi_txn ) {
bdb_unlocked_cache_return_entry_rw( &bdb->bi_cache, e, rw );
} else {
bdb_cache_return_entry_rw( bdb->bi_dbenv, &bdb->bi_cache, e, rw, &boi->boi_lock );
ch_free( boi );
o->o_private = NULL;
}
} else {
if (e->e_private != NULL)
free (e->e_private);
@ -418,6 +429,14 @@ return_results:
bdb_cache_return_entry_rw(bdb->bi_dbenv, &bdb->bi_cache, e, rw, &lock);
} else {
*ent = e;
/* big drag. we need a place to store a read lock so we can
* release it later??
*/
if ( op && !boi ) {
boi = ch_calloc(1,sizeof(struct bdb_op_info));
boi->boi_lock = lock;
op->o_private = boi;
}
}
if ( free_lock_id ) {