feat: improve ServiceBrowser performance by removing OrderedDict (#1148)

bdraco · web-flow · commit 9a16be56a9f6 · 2023-04-02T10:15:42.000-10:00
diff --git a/src/zeroconf/_services/browser.py b/src/zeroconf/_services/browser.py
@@ -26,7 +26,6 @@
 import threading
 import warnings
 from abc import abstractmethod
-from collections import OrderedDict
 from typing import (
     TYPE_CHECKING,
     Callable,
@@ -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
@@ -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()
diff --git a/src/zeroconf/asyncio.py b/src/zeroconf/asyncio.py
@@ -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):
