mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

incremental_cleaning_action() is now re-called as a result of normal event

Browse Source 
processing, not as the result of timer action.
This commit is contained in:
Mark Andrews 2001-06-28 13:51:40 +00:00
parent f47c41b5fe
commit dee489d6c1
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/dns/cache.c
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: cache.c,v 1.43 2001/06/27 20:18:03 tale Exp $ */ /* $Id: cache.c,v 1.44 2001/06/28 13:51:40 marka Exp $ */
#include <config.h> #include <config.h>
@ -40,11 +40,9 @@
* The following three variables control incremental cleaning. * The following three variables control incremental cleaning.
* MINSIZE is how many bytes is the floor for dns_cache_setcachesize(). * MINSIZE is how many bytes is the floor for dns_cache_setcachesize().
* CLEANERINCREMENT is how many nodes are examined in one pass. * CLEANERINCREMENT is how many nodes are examined in one pass.
* CLEANERINTERVAL is the minimum amount of time between passes.
*/ */
#define DNS_CACHE_MINSIZE 2097152 /* Bytes. 2097152 = 2 MB */ #define DNS_CACHE_MINSIZE 2097152 /* Bytes. 2097152 = 2 MB */
#define DNS_CACHE_CLEANERINCREMENT 1000 /* Number of nodes. */ #define DNS_CACHE_CLEANERINCREMENT 1000 /* Number of nodes. */
#define DNS_CACHE_CLEANERINTERVAL 6 /* Seconds. */
/*** /***
*** Types *** Types
@ -434,9 +432,6 @@ dns_cache_setcleaninginterval(dns_cache_t *cache, unsigned int t) {
if (cache->cleaner.cleaning_timer == NULL) if (cache->cleaner.cleaning_timer == NULL)
goto unlock; goto unlock;
if (t < DNS_CACHE_CLEANERINTERVAL)
t = DNS_CACHE_CLEANERINTERVAL;
cache->cleaner.cleaning_interval = t; cache->cleaner.cleaning_interval = t;
if (t == 0) { if (t == 0) {
@ -678,7 +673,6 @@ overmem_cleaning_action(isc_task_t *task, isc_event_t *event) {
static void static void
incremental_cleaning_action(isc_task_t *task, isc_event_t *event) { incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
cache_cleaner_t *cleaner = event->ev_arg; cache_cleaner_t *cleaner = event->ev_arg;
isc_interval_t interval;
isc_result_t result; isc_result_t result;
int n_names; int n_names;
@ -767,23 +761,14 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
result = dns_dbiterator_pause(cleaner->iterator); result = dns_dbiterator_pause(cleaner->iterator);
RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(result == ISC_R_SUCCESS);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_CACHE, isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_CACHE,
ISC_LOG_DEBUG(1), "cache cleaner: checked %d nodes, " ISC_LOG_DEBUG(1), "cache cleaner: checked %d nodes, "
"mem inuse %d, sleeping", "mem inuse %d, sleeping",
cleaner->increment, isc_mem_inuse(cleaner->cache->mctx)); cleaner->increment, isc_mem_inuse(cleaner->cache->mctx));
/* isc_task_send(task, &event);
* Even though the interval timer might be in use for periodic INSIST(CLEANER_BUSY(cleaner));
* cache cleaning, steal it for scheduling another iteration.
* When end_cleaning() is finally called, it will reset the
* interval for the periodic cleaner.
*/
isc_interval_set(&interval, DNS_CACHE_CLEANERINTERVAL, 0);
isc_timer_reset(cleaner->cleaning_timer, isc_timertype_ticker,
NULL, &interval, ISC_FALSE);
isc_event_free(&event);
return; return;
} }