X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Ftimer.h;h=e9650ada9b46f07ff0e0595c562b202a4252c4de;hb=c3f72482ba4d375d2dd32de6f58ed4cdcef37ddd;hp=73020556659ef21ac7a5289cfdc64c2edffda953;hpb=76c9c4231400245864addfc7a8aabaa79843b4bd;p=sliver-openvswitch.git

diff --git a/lib/timer.h b/lib/timer.h
index 730205566..e9650ada9 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -20,14 +20,15 @@
 #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(const struct timer *, const char *where);
+#define timer_wait(timer) timer_wait(timer, SOURCE_LOCATOR)
 
 /* Causes 'timer' to expire when 'duration' milliseconds have passed.
  *
@@ -56,18 +57,11 @@ timer_set_expired(struct timer *timer)
     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. */