Attachment 900480 Details for Bug 1102040 – Proposed patch

[patch] Proposed patch

0001-QPID-5790-avoid-use-of-poll-if-select-is-monkey-patc.patch (text/plain), 1.30 KB, created by Ken Giusti on 2014-05-29 18:20:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ken Giusti

Created: 2014-05-29 18:20:33 UTC

Size: 1.30 KB

patch

obsolete

>From a4c122c2370e97c643894a9bd7958c57c6101ab2 Mon Sep 17 00:00:00 2001
>From: Kenneth Giusti <kgiusti@redhat.com>
>Date: Thu, 29 May 2014 13:09:44 -0400
>Subject: [PATCH] QPID-5790: avoid use of poll if select is monkey-patched by
> Eventlet/Greenthreads
>
>---
> qpid/python/qpid/compat.py | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/qpid/python/qpid/compat.py b/qpid/python/qpid/compat.py
>index 1fad902..12966c2 100644
>--- a/qpid/python/qpid/compat.py
>+++ b/qpid/python/qpid/compat.py
>@@ -40,10 +40,18 @@ except ImportError:
>   def format_exc():
>     return "".join(traceback.format_exception(*sys.exc_info()))
> 
>-# prefer poll() to select(), as it performs better at scale:
>+# QPID-5588: prefer poll() to select(), as it allows file descriptors with
>+# values > FD_SETSIZE
> import select as _select_mod
>-if hasattr(_select_mod, "poll"):
>+try:
>+  # QPID-5790: unless eventlet/greenthreads have monkey-patched the select
>+  # module, as to date poll() is not properly supported by eventlet
>+  import eventlet
>+  _is_patched = eventlet.patcher.is_monkey_patched("select")
>+except ImportError:
>+  _is_patched = False
> 
>+if hasattr(_select_mod, "poll") and not _is_patched:
>   from select import error as SelectError
>   def select(rlist, wlist, xlist, timeout=None):
>     fd_count = 0
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1102040: 899956 | 900106 | 900480