Skip to content

feat: speed up adding and expiring records in the DNSCache #1490

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 4 commits into from
Jan 22, 2025
Merged

feat: speed up adding and expiring records in the DNSCache #1490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cffbaa1
feat: speed up adding records to the DNSCache
bdraco Jan 22, 2025
a05695d
feat: speed up adding records to the DNSCache
bdraco Jan 22, 2025
26738b4
Merge branch 'master' into speed_up_adding_records_to_cache
bdraco Jan 22, 2025
e7efb1a
chore: refactor
bdraco Jan 22, 2025
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
6 changes: 4 additions & 2 deletions src/zeroconf/_cache.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ cdef class DNSCache:
@cython.locals(store=cython.dict)
cpdef DNSRecord async_get_unique(self, DNSRecord entry)

@cython.locals(record=DNSRecord)
@cython.locals(record=DNSRecord, when_record=tuple, when=double)
cpdef list async_expire(self, double now)

@cython.locals(records=cython.dict, record=DNSRecord)
Expand All @@ -57,8 +57,10 @@ cdef class DNSCache:

@cython.locals(
store=cython.dict,
service_store=cython.dict,
service_record=DNSService,
when=object
when=object,
new=bint
)
cdef bint _async_add(self, DNSRecord record)

Expand Down
11 changes: 8 additions & 3 deletions src/zeroconf/_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ def _async_add(self, record: _DNSRecord) -> bool:
# replaces any existing records that are __eq__ to each other which
# removes the risk that accessing the cache from the wrong
# direction would return the old incorrect entry.
store = self.cache.setdefault(record.key, {})
if (store := self.cache.get(record.key)) is None:
store = self.cache[record.key] = {}
new = record not in store and not isinstance(record, DNSNsec)
store[record] = record
when = record.created + (record.ttl * 1000)
Expand All @@ -97,7 +98,9 @@ def _async_add(self, record: _DNSRecord) -> bool:

if isinstance(record, DNSService):
service_record = record
self.service_cache.setdefault(record.server_key, {})[service_record] = service_record
if (service_store := self.service_cache.get(service_record.server_key)) is None:
service_store = self.service_cache[service_record.server_key] = {}
service_store[service_record] = service_record
return new

def async_add_records(self, entries: Iterable[DNSRecord]) -> bool:
Expand Down Expand Up @@ -145,14 +148,16 @@ def async_expire(self, now: _float) -> List[DNSRecord]:
expired: List[DNSRecord] = []
# Find any expired records and add them to the to-delete list
while self._expire_heap:
when, record = self._expire_heap[0]
when_record = self._expire_heap[0]
when = when_record[0]
if when > now:
break
heappop(self._expire_heap)
# Check if the record hasn't been re-added to the heap
# with a different expiration time as it will be removed
# later when it reaches the top of the heap and its
# expiration time is met.
record = when_record[1]
if self._expirations.get(record) == when:
expired.append(record)

Expand Down