From c21a787325efe24dbc297bf65ada518a8e493845 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 15 Jan 2014 18:41:06 +0000 Subject: QPID-2294: handle signal interruptions to select git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1558503 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/qpid/compat.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/qpid/python/qpid/compat.py b/qpid/python/qpid/compat.py index 8b1f4b746b..ee3bf919ad 100644 --- a/qpid/python/qpid/compat.py +++ b/qpid/python/qpid/compat.py @@ -18,6 +18,8 @@ # import sys +import errno +import time try: set = set @@ -42,6 +44,7 @@ if tuple(sys.version_info[0:2]) < (2, 4): return old_select(list(rlist), list(wlist), list(xlist), timeout) else: from select import select + from select import error as SelectError class BaseWaiter: @@ -49,8 +52,18 @@ class BaseWaiter: self._do_write() def wait(self, timeout=None): + start = time.time() if timeout is not None: - ready, _, _ = select([self], [], [], timeout) + while True: + try: + ready, _, _ = select([self], [], [], timeout) + break + except SelectError, e: + if e[0] == errno.EINTR: + elapsed = time.time() - start + timeout = timeout - elapsed + else: + raise e else: ready = True -- cgit v1.2.1