X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Ftimer.c;h=e90355bdb2b2ca9aa477a955d1da4e120ac7e8a7;hb=ca7e7bee86b4ee821d61b58bf15c89a9d8a3cb30;hp=b640a7be89f0bb2ca1dbf4cf5cd3d2dff4f3ade0;hpb=8650b075065d03db50dac26f33bb0ec3c485d044;p=cascardo%2Fovs.git

diff --git a/lib/timer.c b/lib/timer.c
index b640a7be8..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,11 +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);
+        poll_timer_wait_until_at(timer->t, where);
     }
 }