mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#5860 - NO_CACHE entries were not being counted when they were

Browse Source 
converted to regular cached entries (so the entry cache grew beyond
the configured size)
This commit is contained in:
Howard Chu 2009-03-02 08:26:30 +00:00
parent 225aa9f526
commit 288e99cb08
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,7 +809,7 @@ bdb_cache_find_id(
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
Entry *ep = NULL;
int rc = 0, load = 0;
int rc = 0, load = 0, added = 0;
EntryInfo ei = { 0 };
ei.bei_id = id;
@ -905,7 +905,10 @@ load1:
* loading it, i.e it is already cached or
* another thread is currently loading it.
*/
(*eip)->bei_state &= ~CACHE_ENTRY_NOT_CACHED;
if ( (*eip)->bei_state & CACHE_ENTRY_NOT_CACHED ) {
(*eip)->bei_state &= ~CACHE_ENTRY_NOT_CACHED;
added = 1;
}
flag &= ~ID_NOCACHE;
}
@ -933,6 +936,7 @@ load1:
#endif
ep = NULL;
bdb_cache_lru_link( bdb, *eip );
added = 1;
if (( flag & ID_NOCACHE ) &&
( bdb_cache_entryinfo_trylock( *eip ) == 0 )) {
/* Set the cached state only if no other thread
@ -997,7 +1001,7 @@ load1:
if ( rc == 0 ) {
int purge = 0;
if ( load ) {
if ( added ) {
ldap_pvt_thread_mutex_lock( &bdb->bi_cache.c_count_mutex );
if ( !( flag & ID_NOCACHE )) {
bdb->bi_cache.c_cursize++;