[ovs-dev] [PATCH 1/5] python/ovs: socket_util uses select.poll
Isaku Yamahata
yamahata at valinux.co.jp
Wed Sep 12 06:17:21 UTC 2012
The changeset of ed815d9bd28422a490fe370d7804d24bcd676806 eliminated
the use of select.poll for eventlet/gevent.
It forgot to select.poll in socket_util.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
---
python/ovs/poller.py | 4 ++--
python/ovs/socket_util.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/python/ovs/poller.py b/python/ovs/poller.py
index 5c89f23..c04c9b3 100644
--- a/python/ovs/poller.py
+++ b/python/ovs/poller.py
@@ -73,7 +73,7 @@ class _SelectSelect(object):
return events_dict.items()
-_SelectPoll = _SelectSelect
+SelectPoll = _SelectSelect
# If eventlet/gevent isn't used, we can use select.poll by replacing
# _SelectPoll with select.poll class
# _SelectPoll = select.poll
@@ -181,5 +181,5 @@ class Poller(object):
vlog.dbg("%s on fd %d" % (s, fd))
def __reset(self):
- self.poll = _SelectPoll()
+ self.poll = SelectPoll()
self.timeout = -1
diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index a8c6dd6..845511e 100644
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -19,6 +19,7 @@ import socket
import sys
import ovs.fatal_signal
+import ovs.poller
import ovs.vlog
vlog = ovs.vlog.Vlog("socket_util")
@@ -75,7 +76,7 @@ def make_unix_socket(style, nonblock, bind_path, connect_path):
def check_connection_completion(sock):
- p = select.poll()
+ p = ovs.poller.SelectPoll()
p.register(sock, select.POLLOUT)
if len(p.poll(0)) == 1:
return get_socket_error(sock)
--
1.7.1.1
More information about the dev
mailing list