Skip to content

feat: speed up unpacking TXT record data in ServiceInfo #1318

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
Dec 2, 2023
Merged

feat: speed up unpacking TXT record data in ServiceInfo #1318

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
0c6fa1d
feat: Speed up unpacking TXT in ServiceInfo
bdraco Dec 2, 2023
93258ad
feat: fixes
bdraco Dec 2, 2023
93330b7
adjust
bdraco Dec 2, 2023
18b0040
remove unrelated changes
bdraco Dec 2, 2023
257c5ae
remove unrelated changes
bdraco Dec 2, 2023
437ac10
remove unrelated changes
bdraco Dec 2, 2023
42af9a0
bench
bdraco Dec 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
22 changes: 22 additions & 0 deletions bench/txt_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import timeit

from zeroconf import ServiceInfo

info = ServiceInfo(
"_test._tcp.local.",
"test._test._tcp.local.",
properties=(
b"\x19md=AlexanderHomeAssistant\x06pv=1.0\x14id=59:8A:0B:74:65:1D\x05"
b"c#=14\x04s#=1\x04ff=0\x04ci=2\x04sf=0\x0bsh=ccZLPA=="
),
)


def process_properties() -> None:
info._properties = None
info.properties


count = 100000
time = timeit.Timer(process_properties).timeit(count)
print(f"Processing {count} properties took {time} seconds")
3 changes: 2 additions & 1 deletion src/zeroconf/_services/info.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ cdef class ServiceInfo(RecordUpdateListener):
@cython.locals(cache=DNSCache)
cpdef bint _load_from_cache(self, object zc, cython.float now)

cdef _unpack_text_into_properties(self)
@cython.locals(length="unsigned char", index="unsigned int", key_value=bytes, key_sep_value=tuple)
cdef void _unpack_text_into_properties(self)

cdef _set_properties(self, cython.dict properties)

Expand Down
19 changes: 9 additions & 10 deletions src/zeroconf/_services/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,27 +388,26 @@ def _set_text(self, text: bytes) -> None:
def _unpack_text_into_properties(self) -> None:
"""Unpacks the text field into properties"""
text = self.text
if not text:
end = len(text)
if end == 0:
# Properties should be set atomically
# in case another thread is reading them
self._properties = {}
return

index = 0
pairs: List[bytes] = []
end = len(text)
properties: Dict[Union[str, bytes], Optional[Union[str, bytes]]] = {}
while index < end:
length = text[index]
index += 1
pairs.append(text[index : index + length])
key_value = text[index : index + length]
key_sep_value = key_value.partition(b'=')
key = key_sep_value[0]
if key not in properties:
properties[key] = key_sep_value[2] or None
index += length

# Reverse the list so that the first item in the list
# is the last item in the text field. This is important
# to preserve backwards compatibility where the first
# key always wins if the key is seen multiple times.
pairs.reverse()
self._properties = {key: value or None for key, _, value in (pair.partition(b'=') for pair in pairs)}
self._properties = properties

def get_name(self) -> str:
"""Name accessor"""
Expand Down