diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h index 78a0a583df..ac3133fa31 100644 --- a/lib/isc/include/isc/timer.h +++ b/lib/isc/include/isc/timer.h @@ -196,27 +196,6 @@ isc_timer_reset(isc_timer_t *timer, isc_timertype_t type, *\li Unexpected error */ -isc_result_t -isc_timer_touch(isc_timer_t *timer); -/*%< - * Set the last-touched time of 'timer' to the current time. - * - * Requires: - * - *\li 'timer' is a valid once timer. - * - * Ensures: - * - *\li An idle timeout will not be generated until at least Now + the - * timer's interval if 'timer' is a once timer with a non-zero - * interval. - * - * Returns: - * - *\li Success - *\li Unexpected error - */ - void isc_timer_attach(isc_timer_t *timer, isc_timer_t **timerp); /*%< diff --git a/lib/isc/timer.c b/lib/isc/timer.c index fad06767ae..02eeafe4e8 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -420,36 +420,6 @@ isc_timer_gettype(isc_timer_t *timer) { return (t); } -isc_result_t -isc_timer_touch(isc_timer_t *timer) { - isc_result_t result; - isc_time_t now; - - /* - * Set the last-touched time of 'timer' to the current time. - */ - - REQUIRE(VALID_TIMER(timer)); - - LOCK(&timer->lock); - - /* - * We'd like to - * - * REQUIRE(timer->type == isc_timertype_once); - * - * but we cannot without locking the manager lock too, which we - * don't want to do. - */ - - TIME_NOW(&now); - result = isc_time_add(&now, &timer->interval, &timer->idle); - - UNLOCK(&timer->lock); - - return (result); -} - void isc_timer_attach(isc_timer_t *timer, isc_timer_t **timerp) { REQUIRE(VALID_TIMER(timer));