git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
lib
/
timer.c
diff --git
a/lib/timer.c
b/lib/timer.c
index
84d20a4
..
e90355b
100644
(file)
--- 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.
*
* 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
void
-
(timer_wait)
(const struct timer *timer, const char *where)
+
timer_wait_at
(const struct timer *timer, const char *where)
{
if (timer->t < LLONG_MAX) {
{
if (timer->t < LLONG_MAX) {
-
(poll_timer_wait_until)
(timer->t, where);
+
poll_timer_wait_until_at
(timer->t, where);
}
}
}
}