generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove expired dns cache entries before removing oldest"

Browse Source
This commit is contained in:
Elliott Hughes
2012-05-07 10:41:52 -07:00
committed by android code review
parent 8657eafc35 dd16182b4b
commit 73a6566da3
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libc/netbsd/resolv/res_cache.c
View File

@@ -1412,6 +1412,27 @@ _cache_remove_oldest( Cache* cache )
_cache_remove_p(cache, lookup); _cache_remove_p(cache, lookup);
} }
/* Remove all expired entries from the hash table.
*/
static void _cache_remove_expired(Cache* cache) {
Entry* e;
time_t now = _time_now();
for (e = cache->mru_list.mru_next; e != &cache->mru_list;) {
// Entry is old, remove
if (now >= e->expires) {
Entry** lookup = _cache_lookup_p(cache, e);
if (*lookup == NULL) { /* should not happen */
XLOG("%s: ENTRY NOT IN HTABLE ?", __FUNCTION__);
return;
}
e = e->mru_next;
_cache_remove_p(cache, lookup);
} else {
e = e->mru_next;
}
}
}
ResolvCacheStatus ResolvCacheStatus
_resolv_cache_lookup( struct resolv_cache* cache, _resolv_cache_lookup( struct resolv_cache* cache,
@@ -1525,8 +1546,11 @@ _resolv_cache_add( struct resolv_cache* cache,
goto Exit; goto Exit;
} }
if (cache->num_entries >= cache->max_entries) {
_cache_remove_expired(cache);
if (cache->num_entries >= cache->max_entries) { if (cache->num_entries >= cache->max_entries) {
_cache_remove_oldest(cache); _cache_remove_oldest(cache);
}
/* need to lookup again */ /* need to lookup again */
lookup = _cache_lookup_p(cache, key); lookup = _cache_lookup_p(cache, key);
e = *lookup; e = *lookup;