From 110b54816bb56b8ba4878812ad300a3a277abb06 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Fri, 17 Sep 2010 15:06:17 -0700 Subject: [PATCH] python: timer_wait_until calculated current time incorrectly The timer_wait_until function in poller.py was using Time.msec to figure out the current time. Unfortunately, Time.msec does not in exist. Changed to use ovs.timeval.msec . --- python/ovs/poller.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python/ovs/poller.py b/python/ovs/poller.py index 57417c48..2a0b2ecb 100644 --- a/python/ovs/poller.py +++ b/python/ovs/poller.py @@ -15,6 +15,7 @@ import errno import logging import select +import ovs.timeval class Poller(object): """High-level wrapper around the "poll" system call. @@ -62,15 +63,15 @@ class Poller(object): self.__timer_wait(msec) def timer_wait_until(self, msec): - """Causes the following call to self.block() to wake up when the - current time, as returned by Time.msec(), reaches 'msec' or later. If + """Causes the following call to self.block() to wake up when the current + time, as returned by ovs.timeval.msec(), reaches 'msec' or later. If 'msec' is earlier than the current time, the following call to self.block() will not block at all. The timer registration is one-shot: only the following call to self.block() is affected. The timer will need to be re-registered after self.block() is called if it is to persist.""" - now = Time.msec() + now = ovs.timeval.msec() if msec <= now: self.immediate_wake() else: -- 2.30.2