From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Tue, 25 Oct 2022 16:13:15 +0000 (+0200)
Subject: perf: use wait_select() as even if kqueue is the default
X-Git-Tag: 3.1.5~7^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce225c12112d935b36cc2819b22df28e4503c937;p=thirdparty%2Fpsycopg.git

perf: use wait_select() as even if kqueue is the default

There is a bit less overhead using this simpler function than using
wait_selector.
---

diff --git a/psycopg/psycopg/waiting.py b/psycopg/psycopg/waiting.py
index 3fb4cf097..3b1329649 100644
--- a/psycopg/psycopg/waiting.py
+++ b/psycopg/psycopg/waiting.py
@@ -240,7 +240,7 @@ def wait_select(gen: PQGen[RV], fileno: int, timeout: Optional[float] = None) ->
                 ready |= READY_W
             if not ready:
                 continue
-            assert s & ready
+            # assert s & ready
             s = gen.send(ready)  # type: ignore
 
     except StopIteration as ex:
@@ -290,7 +290,7 @@ def wait_epoll(gen: PQGen[RV], fileno: int, timeout: Optional[float] = None) ->
                     ready = READY_R
                 if ev & ~select.EPOLLIN:
                     ready |= READY_W
-                assert s & ready
+                # assert s & ready
                 s = gen.send(ready)
                 evmask = poll_evmasks[s]
                 epoll.modify(fileno, evmask)
@@ -313,10 +313,11 @@ elif selectors.DefaultSelector is getattr(selectors, "EpollSelector", None):
     # NOTE: select seems more performing than epoll. It is admittedly unlikely
     # that a platform has epoll but not select, so maybe we could kill
     # wait_epoll altogether(). More testing to do.
-    if hasattr(selectors, "SelectSelector"):
-        wait = wait_select
-    else:
-        wait = wait_epoll
+    wait = wait_select if hasattr(selectors, "SelectSelector") else wait_epoll
+
+elif selectors.DefaultSelector is getattr(selectors, "KqueueSelector", None):
+    # wait_select is faster than wait_selector, probably because of less overhead
+    wait = wait_select if hasattr(selectors, "SelectSelector") else wait_selector
 
 else:
     wait = wait_selector