X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Ftimer.c;h=e90355bdb2b2ca9aa477a955d1da4e120ac7e8a7;hb=HEAD;hp=1c3c0f488a5b660e1a24f1e4e50892106e706492;hpb=76c9c4231400245864addfc7a8aabaa79843b4bd;p=sliver-openvswitch.git

diff --git a/lib/timer.c b/lib/timer.c
index 1c3c0f488..e90355bdb 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -32,24 +32,15 @@ timer_msecs_until_expired(const struct timer *timer)
     }
 }
 
-/* Causes poll_block() to wake when 'timer' expires. */
+/* Causes poll_block() to wake when 'timer' expires.
+ *
+ * ('where' is used in debug logging.  Commonly one would use timer_wait() to
+ * automatically provide the caller's source file and line number for
+ * 'where'.) */
 void
-timer_wait(const struct timer *timer)
+timer_wait_at(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_at(timer->t, where);
     }
 }