diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-07-26 15:32:25 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-26 15:32:25 (GMT) |
commit | 6e4975a1c79d8433d9d5b50ff1c655b5b5a2acd2 (patch) | |
tree | a99edf6670355ef38928d7be852bbb410a614666 /Lib/selectors.py | |
parent | 41d1c04f73185c1238680142aa1a81f54f2bf4a4 (diff) | |
download | cpython-6e4975a1c79d8433d9d5b50ff1c655b5b5a2acd2.zip cpython-6e4975a1c79d8433d9d5b50ff1c655b5b5a2acd2.tar.gz cpython-6e4975a1c79d8433d9d5b50ff1c655b5b5a2acd2.tar.bz2 |
bpo-41182 selector: use DefaultSelector based upon implementation (GH-21257)
On some platform such as VMware ESXi, DefaultSelector fails
to detect selector due to default value.
This fix adds a check and uses the correct selector depending upon
select implementation and actual call.
Fixes: [bpo-41182]()
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
(cherry picked from commit bcd47837a9bf4806e559b40df73869493efcce27)
Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
Diffstat (limited to 'Lib/selectors.py')
-rw-r--r-- | Lib/selectors.py | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/Lib/selectors.py b/Lib/selectors.py index 90251dc..bb15a1c 100644 --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -57,6 +57,7 @@ if sys.version_info >= (3, 5): SelectorKey.data.__doc__ = ('''Optional opaque data associated to this file object. For example, this could be used to store a per-client session ID.''') + class _SelectorMapping(Mapping): """Mapping of file objects to selector keys.""" @@ -580,16 +581,39 @@ if hasattr(select, 'kqueue'): super().close() +def _can_use(method): + """Check if we can use the selector depending upon the + operating system. """ + # Implementation based upon https://github.com/sethmlarson/selectors2/blob/master/selectors2.py + selector = getattr(select, method, None) + if selector is None: + # select module does not implement method + return False + # check if the OS and Kernel actually support the method. Call may fail with + # OSError: [Errno 38] Function not implemented + try: + selector_obj = selector() + if method == 'poll': + # check that poll actually works + selector_obj.poll(0) + else: + # close epoll, kqueue, and devpoll fd + selector_obj.close() + return True + except OSError: + return False + + # Choose the best implementation, roughly: # epoll|kqueue|devpoll > poll > select. # select() also can't accept a FD > FD_SETSIZE (usually around 1024) -if 'KqueueSelector' in globals(): +if _can_use('kqueue'): DefaultSelector = KqueueSelector -elif 'EpollSelector' in globals(): +elif _can_use('epoll'): DefaultSelector = EpollSelector -elif 'DevpollSelector' in globals(): +elif _can_use('devpoll'): DefaultSelector = DevpollSelector -elif 'PollSelector' in globals(): +elif _can_use('poll'): DefaultSelector = PollSelector else: DefaultSelector = SelectSelector |