From c9ef467d600d36a588bcfe1ec756d4455a53a874 Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Wed, 19 Jul 2023 09:57:33 +0200 Subject: [PATCH 1/6] optimize _PolllikeSelector --- Lib/selectors.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Lib/selectors.py b/Lib/selectors.py index 13497a24097232..5a30e8b111ca1e 100644 --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -369,11 +369,8 @@ def modify(self, fileobj, events, data=None): changed = False if events != key.events: - selector_events = 0 - if events & EVENT_READ: - selector_events |= self._EVENT_READ - if events & EVENT_WRITE: - selector_events |= self._EVENT_WRITE + selector_events = ((events & EVENT_READ and self._EVENT_READ) + | (events & EVENT_WRITE and self._EVENT_WRITE) ) try: self._selector.modify(key.fd, selector_events) except: @@ -404,15 +401,12 @@ def select(self, timeout=None): fd_event_list = self._selector.poll(timeout) except InterruptedError: return ready + fd_to_key_get = self._fd_to_key.get for fd, event in fd_event_list: - events = 0 - if event & ~self._EVENT_READ: - events |= EVENT_WRITE - if event & ~self._EVENT_WRITE: - events |= EVENT_READ - - key = self._fd_to_key.get(fd) + key = fd_to_key_get(fd) if key: + events = ( (event & ~self._EVENT_READ and EVENT_WRITE) + | (event & ~self.EVENT_WRITE and EVENT_READ)) ready.append((key, events & key.events)) return ready From 6bc10876568b93c8f74d4676e1bceb8ea1a36a36 Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Wed, 19 Jul 2023 10:00:37 +0200 Subject: [PATCH 2/6] whitespace --- Lib/selectors.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/selectors.py b/Lib/selectors.py index 5a30e8b111ca1e..9a637367047f86 100644 --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -401,6 +401,7 @@ def select(self, timeout=None): fd_event_list = self._selector.poll(timeout) except InterruptedError: return ready + fd_to_key_get = self._fd_to_key.get for fd, event in fd_event_list: key = fd_to_key_get(fd) From ff2157f7030d0c5bcdead9e5154ca73e3d0d7d50 Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Wed, 19 Jul 2023 11:07:33 +0200 Subject: [PATCH 3/6] Update Lib/selectors.py Co-authored-by: Dong-hee Na --- Lib/selectors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/selectors.py b/Lib/selectors.py index 5a30e8b111ca1e..28795e9d43c2d4 100644 --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -370,7 +370,7 @@ def modify(self, fileobj, events, data=None): changed = False if events != key.events: selector_events = ((events & EVENT_READ and self._EVENT_READ) - | (events & EVENT_WRITE and self._EVENT_WRITE) ) + | (events & EVENT_WRITE and self._EVENT_WRITE)) try: self._selector.modify(key.fd, selector_events) except: From 119f01c2f8b20944cc6f5bc84492e1f354774e9f Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Wed, 19 Jul 2023 11:08:21 +0200 Subject: [PATCH 4/6] fix typo; convert register as well --- Lib/selectors.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Lib/selectors.py b/Lib/selectors.py index 9a637367047f86..6d2374f3cf2ec0 100644 --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -339,11 +339,8 @@ def __init__(self): def register(self, fileobj, events, data=None): key = super().register(fileobj, events, data) - poller_events = 0 - if events & EVENT_READ: - poller_events |= self._EVENT_READ - if events & EVENT_WRITE: - poller_events |= self._EVENT_WRITE + poller_events = ((events & EVENT_READ and self._EVENT_READ) + | (events & EVENT_WRITE and self._EVENT_WRITE) ) try: self._selector.register(key.fd, poller_events) except: @@ -407,7 +404,7 @@ def select(self, timeout=None): key = fd_to_key_get(fd) if key: events = ( (event & ~self._EVENT_READ and EVENT_WRITE) - | (event & ~self.EVENT_WRITE and EVENT_READ)) + | (event & ~self._EVENT_WRITE and EVENT_READ)) ready.append((key, events & key.events)) return ready From d367470f4252149936c165ff8f158f0aede68eb0 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 09:11:12 +0000 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/Library/2023-07-19-09-11-08.gh-issue-106751.U9nD_B.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2023-07-19-09-11-08.gh-issue-106751.U9nD_B.rst diff --git a/Misc/NEWS.d/next/Library/2023-07-19-09-11-08.gh-issue-106751.U9nD_B.rst b/Misc/NEWS.d/next/Library/2023-07-19-09-11-08.gh-issue-106751.U9nD_B.rst new file mode 100644 index 00000000000000..b9a9b563ad2267 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-07-19-09-11-08.gh-issue-106751.U9nD_B.rst @@ -0,0 +1 @@ +Optimize :meth:`_PollLikeSelector.select` for many iteration case. From f60f88715c1d4cd299145e64781a616c516be85e Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Wed, 19 Jul 2023 17:05:50 +0200 Subject: [PATCH 6/6] Update Lib/selectors.py Co-authored-by: Dong-hee Na --- Lib/selectors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/selectors.py b/Lib/selectors.py index 11f7dbfdcdf3b8..20367c9152f331 100644 --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -403,7 +403,7 @@ def select(self, timeout=None): for fd, event in fd_event_list: key = fd_to_key_get(fd) if key: - events = ( (event & ~self._EVENT_READ and EVENT_WRITE) + events = ((event & ~self._EVENT_READ and EVENT_WRITE) | (event & ~self._EVENT_WRITE and EVENT_READ)) ready.append((key, events & key.events)) return ready