/*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/* Causes poll_block() to wake when 'timer' expires. */
void
-timer_wait(const struct timer *timer)
+(timer_wait)(const struct timer *timer, const char *where)
{
if (timer->t < LLONG_MAX) {
- poll_timer_wait_until(timer->t);
- }
-}
-
-/* Returns the time at which 'timer' was set with 'duration'. Infinite timers
- * were enabled at time LLONG_MAX. Manually expired timers were enabled at
- * LLONG_MIN. */
-long long int
-timer_enabled_at(const struct timer *timer, long long int duration)
-{
- switch (timer->t) {
- case LLONG_MAX: return LLONG_MAX;
- case LLONG_MIN: return LLONG_MIN;
- default: return timer->t - duration;
+ (poll_timer_wait_until)(timer->t, where);
}
}