mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup for #6660

Browse Source
This commit is contained in:
Howard Chu 2010-12-23 04:40:57 +00:00
parent f58a646ad6
commit 0393fe8974
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
servers/slapd/back-bdb/cache.c
View File

@ -257,11 +257,6 @@ bdb_cache_entry_db_unlock ( struct bdb_info *bdb, DB_LOCK *lock )
#endif #endif
} }
/* These should move behind SLAPD_UNUSED */
static ldap_pvt_thread_mutex_t bdb_ncmutex;
static int bdb_notcached;
static int bdb_ncfreed;
void void
bdb_cache_return_entry_rw( struct bdb_info *bdb, Entry *e, bdb_cache_return_entry_rw( struct bdb_info *bdb, Entry *e,
int rw, DB_LOCK *lock ) int rw, DB_LOCK *lock )
@ -271,8 +266,6 @@ bdb_cache_return_entry_rw( struct bdb_info *bdb, Entry *e,
ei = e->e_private; ei = e->e_private;
if ( ei && ( ei->bei_state & CACHE_ENTRY_NOT_CACHED )) { if ( ei && ( ei->bei_state & CACHE_ENTRY_NOT_CACHED )) {
ldap_pvt_thread_mutex_lock(&bdb_ncmutex);
bdb_notcached++;
bdb_cache_entryinfo_lock( ei ); bdb_cache_entryinfo_lock( ei );
if ( ei->bei_state & CACHE_ENTRY_NOT_CACHED ) { if ( ei->bei_state & CACHE_ENTRY_NOT_CACHED ) {
/* Releasing the entry can only be done when /* Releasing the entry can only be done when
@ -288,10 +281,8 @@ bdb_cache_return_entry_rw( struct bdb_info *bdb, Entry *e,
ei->bei_e = NULL; ei->bei_e = NULL;
ei->bei_state ^= CACHE_ENTRY_NOT_CACHED; ei->bei_state ^= CACHE_ENTRY_NOT_CACHED;
free = 1; free = 1;
bdb_ncfreed++;
} }
bdb_cache_entryinfo_unlock( ei ); bdb_cache_entryinfo_unlock( ei );
ldap_pvt_thread_mutex_unlock(&bdb_ncmutex);
} }
bdb_cache_entry_db_unlock( bdb, lock ); bdb_cache_entry_db_unlock( bdb, lock );
if ( free ) { if ( free ) {
@ -979,6 +970,17 @@ load1:
flag |= ID_CHKPURGE; flag |= ID_CHKPURGE;
} }
if ( !load ) {
/* Clear the uncached state if we are not
* loading it, i.e it is already cached or
* another thread is currently loading it.
*/
if ( (*eip)->bei_state & CACHE_ENTRY_NOT_CACHED ) {
(*eip)->bei_state ^= CACHE_ENTRY_NOT_CACHED;
flag |= ID_CHKPURGE;
}
}
if ( flag & ID_LOCKED ) { if ( flag & ID_LOCKED ) {
bdb_cache_entryinfo_unlock( *eip ); bdb_cache_entryinfo_unlock( *eip );
flag ^= ID_LOCKED; flag ^= ID_LOCKED;
@ -1055,17 +1057,8 @@ load1:
} }
bdb_cache_entryinfo_lock( *eip ); bdb_cache_entryinfo_lock( *eip );
(*eip)->bei_finders--; (*eip)->bei_finders--;
if ( load ) { if ( load )
(*eip)->bei_state ^= CACHE_ENTRY_LOADING; (*eip)->bei_state ^= CACHE_ENTRY_LOADING;
} else {
/* Clear the uncached state if we didn't
* load it, i.e it was already cached.
*/
if ( (*eip)->bei_state & CACHE_ENTRY_NOT_CACHED ) {
(*eip)->bei_state ^= CACHE_ENTRY_NOT_CACHED;
flag |= ID_CHKPURGE;
}
}
bdb_cache_entryinfo_unlock( *eip ); bdb_cache_entryinfo_unlock( *eip );
} }
} }