Skip to content

feat: improve ServiceBrowser performance by removing OrderedDict #1148

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
merged 3 commits into from
Apr 2, 2023
Merged

feat: improve ServiceBrowser performance by removing OrderedDict #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa463c7
feat: improve ServiceBrowser performance by removing OrderedDict
bdraco Apr 2, 2023
0a0aad6
Merge branch 'master' into ordered_dict
bdraco Apr 2, 2023
d12fd12
Merge branch 'master' into ordered_dict
bdraco Apr 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
8 changes: 4 additions & 4 deletions src/zeroconf/_services/browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import threading
import warnings
from abc import abstractmethod
from collections import OrderedDict
from typing import (
TYPE_CHECKING,
Callable,
Expand Down Expand Up @@ -302,7 +301,7 @@ def __init__(
self.port = port
self.multicast = self.addr in (None, _MDNS_ADDR, _MDNS_ADDR6)
self.question_type = question_type
self._pending_handlers: OrderedDict[Tuple[str, str], ServiceStateChange] = OrderedDict()
self._pending_handlers: Dict[Tuple[str, str], ServiceStateChange] = {}
self._service_state_changed = Signal()
self.query_scheduler = QueryScheduler(self.types, delay, _FIRST_QUERY_DELAY_RANDOM_INTERVAL)
self.done = False
Expand Down Expand Up @@ -551,5 +550,6 @@ def async_update_records_complete(self) -> None:

This method will be run in the event loop.
"""
while self._pending_handlers:
self.queue.put(self._pending_handlers.popitem(False))
for pending in self._pending_handlers.items():
self.queue.put(pending)
self._pending_handlers.clear()
5 changes: 3 additions & 2 deletions src/zeroconf/asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,9 @@ def async_update_records_complete(self) -> None:

This method will be run in the event loop.
"""
while self._pending_handlers:
self._fire_service_state_changed_event(self._pending_handlers.popitem(False))
for pending in self._pending_handlers.items():
self._fire_service_state_changed_event(pending)
self._pending_handlers.clear()


class AsyncZeroconfServiceTypes(ZeroconfServiceTypes):
Expand Down