/*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <stdbool.h>
#include "timeval.h"
+#include "util.h"
struct timer {
long long int t;
};
long long int timer_msecs_until_expired(const struct timer *);
-long long int timer_enabled_at(const struct timer *, long long int duration);
-void timer_wait(const struct timer *);
+void timer_wait_at(const struct timer *, const char *where);
+#define timer_wait(timer) timer_wait_at(timer, SOURCE_LOCATOR)
/* Causes 'timer' to expire when 'duration' milliseconds have passed.
*
timer->t = LLONG_MIN;
}
-/* True if 'timer' had (or will have) expired at 'time'. */
-static inline bool
-timer_expired_at(const struct timer *timer, long long int time)
-{
- return time >= timer->t;
-}
-
/* True if 'timer' has expired. */
static inline bool
timer_expired(const struct timer *timer)
{
- return timer_expired_at(timer, time_msec());
+ return time_msec() >= timer->t;
}
/* Returns ture if 'timer' will never expire. */