diff options
| author |   millert <millert@openbsd.org> | 2008-08-04 16:34:20 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2008-08-04 16:34:20 +0000 |
| commit | 58d09879b74dcca641851384ab35dfd9de33145c (patch) | |
| tree | 9df9d4faaf3aa74153e7f664d80916894230226b /usr.sbin/bind/lib/isc/timer.c | |
| parent | fix extended partition support by handling chained EBRs correctly (diff) | |
| download | wireguard-openbsd-58d09879b74dcca641851384ab35dfd9de33145c.tar.xz wireguard-openbsd-58d09879b74dcca641851384ab35dfd9de33145c.zip | |
Update to BIND 9.4.2-P2 and adapt our dynamic select changes. OK deraadt@
Diffstat (limited to 'usr.sbin/bind/lib/isc/timer.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/timer.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/usr.sbin/bind/lib/isc/timer.c b/usr.sbin/bind/lib/isc/timer.c index 99283412580..34235cc1b01 100644 --- a/usr.sbin/bind/lib/isc/timer.c +++ b/usr.sbin/bind/lib/isc/timer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: timer.c,v 1.73.18.7 2007/10/24 23:46:26 tbox Exp $ */ +/* $ISC: timer.c,v 1.73.18.7.10.3 2008/07/29 18:35:53 jinmei Exp $ */ /*! \file */ @@ -577,7 +577,7 @@ isc_timer_detach(isc_timer_t **timerp) { static void dispatch(isc_timermgr_t *manager, isc_time_t *now) { isc_boolean_t done = ISC_FALSE, post_event, need_schedule; - isc_event_t *event; + isc_timerevent_t *event; isc_eventtype_t type = 0; isc_timer_t *timer; isc_result_t result; @@ -650,16 +650,18 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) { /* * XXX We could preallocate this event. */ - event = isc_event_allocate(manager->mctx, + event = (isc_timerevent_t *)isc_event_allocate(manager->mctx, timer, type, timer->action, timer->arg, sizeof(*event)); - if (event != NULL) - isc_task_send(timer->task, &event); - else + if (event != NULL) { + event->due = timer->due; + isc_task_send(timer->task, + ISC_EVENT_PTR(&event)); + } else UNEXPECTED_ERROR(__FILE__, __LINE__, isc_msgcat_get(isc_msgcat, ISC_MSGSET_TIMER, |