upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#2580 - avoid cache deadlock

Browse source
This commit is contained in:
Howard Chu 2003-06-09 22:00:00 +00:00
parent af6b191c96
commit 782b481a9a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servers/slapd/back-bdb/cache.c
View file

@ -442,7 +442,7 @@ hdb_cache_find_parent(
ein->bei_state = CACHE_ENTRY_NOT_LINKED; ein->bei_state = CACHE_ENTRY_NOT_LINKED;
/* Insert this node into the ID tree */ /* Insert this node into the ID tree */
ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock ); ldap_pvt_thread_rdwr_wlock( &bdb->bi_cache.c_rwlock );
if ( avl_insert( &bdb->bi_cache.c_idtree, (caddr_t)ein, if ( avl_insert( &bdb->bi_cache.c_idtree, (caddr_t)ein,
bdb_id_cmp, avl_dup_error ) ) { bdb_id_cmp, avl_dup_error ) ) {
@ -482,7 +482,7 @@ hdb_cache_find_parent(
*res = eir; *res = eir;
bdb_cache_entryinfo_lock( eir ); bdb_cache_entryinfo_lock( eir );
} }
ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock ); ldap_pvt_thread_rdwr_wunlock( &bdb->bi_cache.c_rwlock );
if ( ei2 ) { if ( ei2 ) {
/* Found a link. Reset all the state info */ /* Found a link. Reset all the state info */
for (ein = eir; ein != ei2; ein=ein->bei_parent) for (ein = eir; ein != ei2; ein=ein->bei_parent)
@ -524,11 +524,16 @@ bdb_cache_find_id(
/* If we weren't given any info, see if we have it already cached */ /* If we weren't given any info, see if we have it already cached */
if ( !*eip ) { if ( !*eip ) {
ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock ); again: ldap_pvt_thread_rdwr_rlock( &bdb->bi_cache.c_rwlock );
*eip = (EntryInfo *) avl_find( bdb->bi_cache.c_idtree, *eip = (EntryInfo *) avl_find( bdb->bi_cache.c_idtree,
(caddr_t) &ei, bdb_id_cmp ); (caddr_t) &ei, bdb_id_cmp );
if ( *eip ) { if ( *eip ) {
bdb_cache_entryinfo_lock( *eip ); if ( ldap_pvt_thread_mutex_trylock(
&(*eip)->bei_kids_mutex )) {
ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock );
ldap_pvt_thread_yield();
goto again;
}
islocked = 1; islocked = 1;
} }
ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock ); ldap_pvt_thread_rdwr_runlock( &bdb->bi_cache.c_rwlock );