ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

The call to incremental_cleaning_action() added to cleaning_timer_action()

Browse Source 
in revision 1.40 is clearly incorrect.  If the cleaner is already in the busy state, a call to
incremental_cleaning_action() has already been scheduled as an event, and there is no
need to do an extra call.  Furthermore, the call passed the timer event as an argument
to incremental_cleaning_action(), which would ultimately cause it to be passed
to end_cleanin() and assigned to cleaner->resched_event rather than freed.
This commit may or may not fix RT #1912.
This commit is contained in:
Andreas Gustafsson
2001-10-18 01:40:56 +00:00
parent 7d5b9de6c7
commit 937ccb270e
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/dns/cache.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cache.c,v 1.45 2001/07/02 20:44:30 gson Exp $ */
/* $Id: cache.c,v 1.46 2001/10/18 01:40:56 gson Exp $ */
#include <config.h>
@@ -622,16 +622,10 @@ cleaning_timer_action(isc_task_t *task, isc_event_t *event) {
INSIST(task == cleaner->task);
INSIST(event->ev_type == ISC_TIMEREVENT_TICK);
if (cleaner->state == cleaner_s_idle) {
if (cleaner->state == cleaner_s_idle)
begin_cleaning(cleaner);
isc_event_free(&event);
} else
/*
* incremental_cleaning_action() takes responsibility
* for freeing or preserving the event.
*/
incremental_cleaning_action(task, event);
isc_event_free(&event);
}
/*
@@ -679,8 +673,7 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
UNUSED(task);
INSIST(task == cleaner->task);
INSIST(event->ev_type == DNS_EVENT_CACHECLEAN ||
event->ev_type == ISC_TIMEREVENT_TICK);
INSIST(event->ev_type == DNS_EVENT_CACHECLEAN);
if (cleaner->state == cleaner_s_done) {
cleaner->state = cleaner_s_busy;