From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Tue, 16 Apr 2013 06:56:31 +0000 (+0900)
Subject: python/ovs/poller.py: workaround an eventlet bug
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=73f82807832ef3330188a99016848e9b27aed28b;p=sliver-openvswitch.git

python/ovs/poller.py: workaround an eventlet bug

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/python/ovs/poller.py b/python/ovs/poller.py
index 7d15f3edb..ffd6a3997 100644
--- a/python/ovs/poller.py
+++ b/python/ovs/poller.py
@@ -18,6 +18,15 @@ import ovs.vlog
 import select
 import socket
 
+try:
+    import eventlet.patcher
+
+    def _using_eventlet_green_select():
+        return eventlet.patcher.is_monkey_patched(select)
+except:
+    def _using_eventlet_green_select():
+        return False
+
 vlog = ovs.vlog.Vlog("poller")
 
 POLLIN = 0x001
@@ -59,6 +68,10 @@ class _SelectSelect(object):
             timeout = None
         else:
             timeout = float(timeout) / 1000
+        # XXX workaround a bug in eventlet
+        # see https://github.com/eventlet/eventlet/pull/25
+        if timeout == 0 and _using_eventlet_green_select():
+            timeout = 0.1
 
         rlist, wlist, xlist = select.select(self.rlist, self.wlist, self.xlist,
                                             timeout)