openstack/deb-python-trollius
Code Issues Proposed changes

selectors: Make sure EpollSelecrtor.select() works when no FD is registered.

Browse Source 
Closes http://bugs.python.org/issue23009
This commit is contained in:
Yury Selivanov
2014-12-08 12:27:57 -05:00
parent 361a1cd6d8
commit abbbb433e5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
asyncio/selectors.py
View File

@@ -418,7 +418,12 @@ if hasattr(select, 'epoll'):
# epoll_wait() has a resolution of 1 millisecond, round away # epoll_wait() has a resolution of 1 millisecond, round away
# from zero to wait *at least* timeout seconds. # from zero to wait *at least* timeout seconds.
timeout = math.ceil(timeout * 1e3) * 1e-3 timeout = math.ceil(timeout * 1e3) * 1e-3
max_ev = len(self._fd_to_key)
# epoll_wait() expectcs `maxevents` to be greater than zero;
# we want to make sure that `select()` can be called when no
# FD is registered.
max_ev = max(len(self._fd_to_key), 1)
ready = [] ready = []
try: try:
fd_event_list = self._epoll.poll(timeout, max_ev) fd_event_list = self._epoll.poll(timeout, max_ev)