Skip to content

feat: avoid python float conversion in listener hot path #1245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdraco merged 7 commits into from
Sep 2, 2023
Merged

feat: avoid python float conversion in listener hot path #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b98d253
feat: avoid python float conversion in listener hot path
bdraco Sep 2, 2023
cc6c490
Merge branch 'master' into patch__MAX_MSG_ABSOLUTE
bdraco Sep 2, 2023
ef38adf
feat: add uint
bdraco Sep 2, 2023
3b50641
fix: reduce variable copy
bdraco Sep 2, 2023
e6e94a8
fix: reduce variable copy
bdraco Sep 2, 2023
c6d4934
feat: add a cython def for _cancel_any_timers_for_addr
bdraco Sep 2, 2023
014e209
feat: cleanup loop overhead
bdraco Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/zeroconf/_listener.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ from ._utils.time cimport current_time_millis, millis_to_seconds

cdef object log
cdef object logging_DEBUG
cdef object TYPE_CHECKING

cdef cython.uint _MAX_MSG_ABSOLUTE
cdef cython.uint _DUPLICATE_PACKET_SUPPRESSION_INTERVAL

cdef class AsyncListener:

Expand All @@ -22,3 +25,5 @@ cdef class AsyncListener:

@cython.locals(now=cython.float, msg=DNSIncoming)
cpdef datagram_received(self, cython.bytes bytes, cython.tuple addrs)

cdef _cancel_any_timers_for_addr(self, object addr)
23 changes: 15 additions & 8 deletions src/zeroconf/_listener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@


_bytes = bytes
_str = str
_int = int

logging_DEBUG = logging.DEBUG

Expand Down Expand Up @@ -110,19 +112,23 @@ def datagram_received(
)
return

v6_flow_scope: Union[Tuple[()], Tuple[int, int]] = ()
if len(addrs) == 2:
v6_flow_scope: Union[Tuple[()], Tuple[int, int]] = ()
# https://github.com/python/mypy/issues/1178
addr, port = addrs # type: ignore
addr_port = addrs
if TYPE_CHECKING:
addr_port = cast(Tuple[str, int], addr_port)
scope = None
else:
# https://github.com/python/mypy/issues/1178
addr, port, flow, scope = addrs # type: ignore
if debug: # pragma: no branch
log.debug('IPv6 scope_id %d associated to the receiving interface', scope)
v6_flow_scope = (flow, scope)
addr_port = (addr, port)

msg = DNSIncoming(data, (addr, port), scope, now)
msg = DNSIncoming(data, addr_port, scope, now)
self.data = data
self.last_time = now
self.last_message = msg
Expand Down Expand Up @@ -176,22 +182,23 @@ def handle_query_or_defer(
return
deferred.append(msg)
delay = millis_to_seconds(random.randint(*_TC_DELAY_RANDOM_INTERVAL))
assert self.zc.loop is not None
loop = self.zc.loop
assert loop is not None
self._cancel_any_timers_for_addr(addr)
self._timers[addr] = self.zc.loop.call_later(
delay, self._respond_query, None, addr, port, transport, v6_flow_scope
self._timers[addr] = loop.call_at(
loop.time() + delay, self._respond_query, None, addr, port, transport, v6_flow_scope
)

def _cancel_any_timers_for_addr(self, addr: str) -> None:
def _cancel_any_timers_for_addr(self, addr: _str) -> None:
"""Cancel any future truncated packet timers for the address."""
if addr in self._timers:
self._timers.pop(addr).cancel()

def _respond_query(
self,
msg: Optional[DNSIncoming],
addr: str,
port: int,
addr: _str,
port: _int,
transport: _WrappedTransport,
v6_flow_scope: Union[Tuple[()], Tuple[int, int]] = (),
) -> None:
Expand Down