json: Correct position tracking in JSON parser implementations.

[sliver-openvswitch.git] / python / ovs / poller.py

diff --git a/python/ovs/poller.py b/python/ovs/poller.py
index 57417c4..8d52d32 100644 (file)
--- a/python/ovs/poller.py
+++ b/python/ovs/poller.py
@@ -13,8 +13,12 @@
 # limitations under the License.
 
 import errno
-import logging
 import select
+import ovs.timeval
+import ovs.vlog
+
+vlog = ovs.vlog.Vlog("poller")
+
 
 class Poller(object):
     """High-level wrapper around the "poll" system call.
@@ -35,7 +39,7 @@ class Poller(object):
         be select.POLLIN or select.POLLOUT or their bitwise-OR).  The following
         call to self.block() will wake up when 'fd' becomes ready for one or
         more of the requested events.
-        
+
         The event registration is one-shot: only the following call to
         self.block() is affected.  The event will need to be re-registered
         after self.block() is called if it is to persist.
@@ -63,14 +67,14 @@ class Poller(object):
 
     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
-        'msec' is earlier than the current time, the following call to
-        self.block() will not block at all.
+        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:
@@ -94,13 +98,13 @@ class Poller(object):
                 # XXX rate-limit
                 error, msg = e
                 if error != errno.EINTR:
-                    logging.error("poll: %s" % e[1])
+                    vlog.err("poll: %s" % e[1])
         finally:
             self.__reset()
 
     def __log_wakeup(self, events):
         if not events:
-            logging.debug("%d-ms timeout" % self.timeout)
+            vlog.dbg("%d-ms timeout" % self.timeout)
         else:
             for fd, revents in events:
                 if revents != 0:
@@ -115,9 +119,8 @@ class Poller(object):
                         s += "[POLLHUP]"
                     if revents & select.POLLNVAL:
                         s += "[POLLNVAL]"
-                    logging.debug("%s on fd %d" % (s, fd))
+                    vlog.dbg("%s on fd %d" % (s, fd))
 
     def __reset(self):
         self.poll = select.poll()
-        self.timeout = -1            
-
+        self.timeout = -1