From: Howard Chu Date: Sat, 25 Jul 2009 07:13:50 +0000 (+0000) Subject: ITS#6222 dncachesize defaults to 0 == unlimited X-Git-Tag: ACLCHECK_0~399 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=474991afdf81ab7298238e157c5933164c4649a0;p=openldap ITS#6222 dncachesize defaults to 0 == unlimited --- diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h index 0219e3ff14..1ea9f84f16 100644 --- a/servers/slapd/back-bdb/back-bdb.h +++ b/servers/slapd/back-bdb/back-bdb.h @@ -125,12 +125,12 @@ typedef struct bdb_cache { EntryInfo *c_lruhead; /* lru - add accessed entries here */ EntryInfo *c_lrutail; /* lru - rem lru entries from here */ EntryInfo c_dntree; - unsigned c_maxsize; - int c_cursize; - unsigned c_minfree; - unsigned c_eimax; - int c_eiused; /* EntryInfo's in use */ - int c_leaves; /* EntryInfo leaf nodes */ + ID c_maxsize; + ID c_cursize; + ID c_minfree; + ID c_eimax; + ID c_eiused; /* EntryInfo's in use */ + ID c_leaves; /* EntryInfo leaf nodes */ int c_purging; DB_TXN *c_txn; /* used by lru cleaner */ ldap_pvt_thread_rdwr_t c_rwlock; @@ -204,8 +204,8 @@ struct bdb_info { ID bi_lastid; ldap_pvt_thread_mutex_t bi_lastid_mutex; - unsigned bi_idl_cache_max_size; - int bi_idl_cache_size; + ID bi_idl_cache_max_size; + ID bi_idl_cache_size; Avlnode *bi_idl_tree; bdb_idl_cache_entry_t *bi_idl_lru_head; bdb_idl_cache_entry_t *bi_idl_lru_tail; diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c index 5d36a2db29..a6ba2b9b36 100644 --- a/servers/slapd/back-bdb/cache.c +++ b/servers/slapd/back-bdb/cache.c @@ -689,8 +689,9 @@ bdb_cache_lru_purge( struct bdb_info *bdb ) { DB_LOCK lock, *lockp; EntryInfo *elru, *elnext = NULL; - int count, islocked, eimax; - int efree = 0, eifree = 0, eicount, ecount; + int islocked; + ID eicount, ecount; + ID count, efree, eifree = 0; #ifdef LDAP_DEBUG int iter; #endif @@ -698,24 +699,24 @@ bdb_cache_lru_purge( struct bdb_info *bdb ) /* Wait for the mutex; we're the only one trying to purge. */ ldap_pvt_thread_mutex_lock( &bdb->bi_cache.c_lru_mutex ); + if ( bdb->bi_cache.c_cursize > bdb->bi_cache.c_maxsize ) { + efree = bdb->bi_cache.c_cursize - bdb->bi_cache.c_maxsize; + efree += bdb->bi_cache.c_minfree; + } else { + efree = 0; + } + /* maximum number of EntryInfo leaves to cache. In slapcat * we always free all leaf nodes. */ - if ( slapMode & SLAP_TOOL_READONLY ) - eimax = 0; - else - eimax = bdb->bi_cache.c_eimax; - - efree = bdb->bi_cache.c_cursize - bdb->bi_cache.c_maxsize; - if ( efree < 1 ) - efree = 0; - else - efree += bdb->bi_cache.c_minfree; - if ( bdb->bi_cache.c_leaves > eimax ) { + if ( slapMode & SLAP_TOOL_READONLY ) { + eifree = bdb->bi_cache.c_leaves; + } else if ( bdb->bi_cache.c_eimax && + bdb->bi_cache.c_leaves > bdb->bi_cache.c_eimax ) { eifree = bdb->bi_cache.c_minfree * 10; - if ( eifree >= eimax ) - eifree = eimax / 2; + if ( eifree >= bdb->bi_cache.c_leaves ) + eifree /= 2; } if ( !efree && !eifree ) { @@ -1065,7 +1066,7 @@ load1: int purge = 0; if ( bdb->bi_cache.c_cursize > bdb->bi_cache.c_maxsize || - bdb->bi_cache.c_leaves > bdb->bi_cache.c_eimax ) { + ( bdb->bi_cache.c_eimax && bdb->bi_cache.c_leaves > bdb->bi_cache.c_eimax )) { ldap_pvt_thread_mutex_lock( &bdb->bi_cache.c_count_mutex ); if ( !bdb->bi_cache.c_purging ) { if ( load && !( flag & ID_NOCACHE )) { @@ -1074,7 +1075,7 @@ load1: purge = 1; bdb->bi_cache.c_purging = 1; } - } else if ( bdb->bi_cache.c_leaves > bdb->bi_cache.c_eimax ) { + } else if ( bdb->bi_cache.c_eimax && bdb->bi_cache.c_leaves > bdb->bi_cache.c_eimax ) { purge = 1; bdb->bi_cache.c_purging = 1; } diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c index 1f75f0f4e6..1228cd6903 100644 --- a/servers/slapd/back-bdb/config.c +++ b/servers/slapd/back-bdb/config.c @@ -61,12 +61,12 @@ static ConfigTable bdbcfg[] = { "DESC 'Directory for database content' " "EQUALITY caseIgnoreMatch " "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL }, - { "cachefree", "size", 2, 2, 0, ARG_UINT|ARG_OFFSET, + { "cachefree", "size", 2, 2, 0, ARG_ULONG|ARG_OFFSET, (void *)offsetof(struct bdb_info, bi_cache.c_minfree), "( OLcfgDbAt:1.11 NAME 'olcDbCacheFree' " "DESC 'Number of extra entries to free when max is reached' " "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL }, - { "cachesize", "size", 2, 2, 0, ARG_UINT|ARG_OFFSET, + { "cachesize", "size", 2, 2, 0, ARG_ULONG|ARG_OFFSET, (void *)offsetof(struct bdb_info, bi_cache.c_maxsize), "( OLcfgDbAt:1.1 NAME 'olcDbCacheSize' " "DESC 'Entry cache size in entries' " @@ -109,12 +109,12 @@ static ConfigTable bdbcfg[] = { "( OLcfgDbAt:1.5 NAME 'olcDbDirtyRead' " "DESC 'Allow reads of uncommitted data' " "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL }, - { "dncachesize", "size", 2, 2, 0, ARG_UINT|ARG_OFFSET, + { "dncachesize", "size", 2, 2, 0, ARG_ULONG|ARG_OFFSET, (void *)offsetof(struct bdb_info, bi_cache.c_eimax), "( OLcfgDbAt:1.12 NAME 'olcDbDNcacheSize' " "DESC 'DN cache size' " "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL }, - { "idlcachesize", "size", 2, 2, 0, ARG_UINT|ARG_OFFSET, + { "idlcachesize", "size", 2, 2, 0, ARG_ULONG|ARG_OFFSET, (void *)offsetof(struct bdb_info, bi_idl_cache_max_size), "( OLcfgDbAt:1.6 NAME 'olcDbIDLcacheSize' " "DESC 'IDL cache size in IDLs' " diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c index 481d9298e7..93dc87d02e 100644 --- a/servers/slapd/back-bdb/idl.c +++ b/servers/slapd/back-bdb/idl.c @@ -376,7 +376,7 @@ bdb_idl_cache_put( } bdb->bi_idl_lru_head = ee; - if ( ++bdb->bi_idl_cache_size > bdb->bi_idl_cache_max_size ) { + if ( bdb->bi_idl_cache_size >= bdb->bi_idl_cache_max_size ) { int i; ee = bdb->bi_idl_lru_tail; for ( i = 0; ee != NULL && i < 10; i++, ee = eprev ) { @@ -405,6 +405,7 @@ bdb_idl_cache_put( assert( bdb->bi_idl_lru_tail != NULL || bdb->bi_idl_lru_head == NULL ); } + bdb->bi_idl_cache_size++; ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock ); ldap_pvt_thread_rdwr_wunlock( &bdb->bi_idl_tree_rwlock ); } diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index fe480e59a9..db51f2a014 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -369,13 +369,10 @@ shm_retry: } #endif - /* Default dncache to 2x entrycache */ - if ( bdb->bi_cache.c_maxsize && !bdb->bi_cache.c_eimax ) { - bdb->bi_cache.c_eimax = bdb->bi_cache.c_maxsize * 2; - } - - /* dncache must be >= entrycache */ - if ( bdb->bi_cache.c_eimax < bdb->bi_cache.c_maxsize ) { + /* dncache defaults to 0 == unlimited + * must be >= entrycache + */ + if ( bdb->bi_cache.c_eimax && bdb->bi_cache.c_eimax < bdb->bi_cache.c_maxsize ) { bdb->bi_cache.c_eimax = bdb->bi_cache.c_maxsize; } diff --git a/servers/slapd/back-bdb/monitor.c b/servers/slapd/back-bdb/monitor.c index 8a2b23b778..7de51ab92a 100644 --- a/servers/slapd/back-bdb/monitor.c +++ b/servers/slapd/back-bdb/monitor.c @@ -158,17 +158,17 @@ bdb_monitor_update( a = attr_find( e->e_attrs, ad_olmBDBEntryCache ); assert( a != NULL ); bv.bv_val = buf; - bv.bv_len = snprintf( buf, sizeof( buf ), "%d", bdb->bi_cache.c_cursize ); + bv.bv_len = snprintf( buf, sizeof( buf ), "%lud", bdb->bi_cache.c_cursize ); ber_bvreplace( &a->a_vals[ 0 ], &bv ); a = attr_find( e->e_attrs, ad_olmBDBDNCache ); assert( a != NULL ); - bv.bv_len = snprintf( buf, sizeof( buf ), "%d", bdb->bi_cache.c_eiused ); + bv.bv_len = snprintf( buf, sizeof( buf ), "%lud", bdb->bi_cache.c_eiused ); ber_bvreplace( &a->a_vals[ 0 ], &bv ); a = attr_find( e->e_attrs, ad_olmBDBIDLCache ); assert( a != NULL ); - bv.bv_len = snprintf( buf, sizeof( buf ), "%d", bdb->bi_idl_cache_size ); + bv.bv_len = snprintf( buf, sizeof( buf ), "%lud", bdb->bi_idl_cache_size ); ber_bvreplace( &a->a_vals[ 0 ], &bv ); #ifdef BDB_MONITOR_IDX