mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-19 14:37:21 +00:00
Code Issues Releases Wiki Activity

python/ovs: socket_util uses select.poll

Browse Source 
The changeset of ed815d9bd2 eliminated
the use of select.poll for eventlet/gevent.
It forgot to select.poll in socket_util.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Isaku Yamahata
2012-09-12 15:17:21 +09:00
committed by Ben Pfaff
parent 9bab681f33
commit 6d3c5b64b3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/ovs/poller.py
View File

@@ -73,7 +73,7 @@ class _SelectSelect(object):
return events_dict.items() return events_dict.items()
_SelectPoll = _SelectSelect SelectPoll = _SelectSelect
# If eventlet/gevent isn't used, we can use select.poll by replacing # If eventlet/gevent isn't used, we can use select.poll by replacing
# _SelectPoll with select.poll class # _SelectPoll with select.poll class
# _SelectPoll = select.poll # _SelectPoll = select.poll
@@ -181,5 +181,5 @@ class Poller(object):
vlog.dbg("%s on fd %d" % (s, fd)) vlog.dbg("%s on fd %d" % (s, fd))
def __reset(self): def __reset(self):
self.poll = _SelectPoll() self.poll = SelectPoll()
self.timeout = -1 self.timeout = -1

3
python/ovs/socket_util.py
View File

@@ -19,6 +19,7 @@ import socket
import sys import sys
import ovs.fatal_signal import ovs.fatal_signal
import ovs.poller
import ovs.vlog import ovs.vlog
vlog = ovs.vlog.Vlog("socket_util") 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): def check_connection_completion(sock):
p = select.poll() p = ovs.poller.SelectPoll()
p.register(sock, select.POLLOUT) p.register(sock, select.POLLOUT)
if len(p.poll(0)) == 1: if len(p.poll(0)) == 1:
return get_socket_error(sock) return get_socket_error(sock)