From: Ben Pfaff <blp@nicira.com>
Date: Fri, 1 Feb 2013 18:25:51 +0000 (-0800)
Subject: timeval: Don't issue poll interval warnings when we warp time.
X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~55
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6e97c6506ea22f300966d6210a2fa742a9e04e71;p=sliver-openvswitch.git

timeval: Don't issue poll interval warnings when we warp time.

It's not meaningful in that case.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/lib/timeval.c b/lib/timeval.c
index ef9c8fe88..2f0035528 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -516,7 +516,7 @@ log_poll_interval(long long int last_wakeup)
 {
     long long int interval = time_msec() - last_wakeup;
 
-    if (interval >= 1000) {
+    if (interval >= 1000 && !warp_offset.tv_sec && !warp_offset.tv_nsec) {
         const struct rusage *last_rusage = get_recent_rusage();
         struct rusage rusage;