Skip to content

Commit fad1ad8

Browse files
committed
refactor(gap): rename _uncached_parse_advertisement_data/_tuple to reflect bytes-cache routing
1 parent 21d0855 commit fad1ad8

5 files changed

Lines changed: 18 additions & 18 deletions

File tree

bench/test_parse_gap_tuple.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
parse_advertisement_data_bytes,
33
parse_advertisement_data_tuple,
44
)
5-
from bluetooth_data_tools.gap import _uncached_parse_advertisement_data
5+
from bluetooth_data_tools.gap import _parse_advertisement_data_miss_via_bytes
66

77
# cythonize -X language_level=3 -a -i src/bluetooth_data_tools/gap.py
88

@@ -91,7 +91,7 @@ def test_parse_advertisement_data_tuple(benchmark):
9191

9292
def test_parse_advertisement_data_tuple_uncached(benchmark):
9393
joined_advs = b"".join(advs)
94-
benchmark(lambda: _uncached_parse_advertisement_data(joined_advs))
94+
benchmark(lambda: _parse_advertisement_data_miss_via_bytes(joined_advs))
9595

9696

9797
def test_parse_advertisement_data_tuple_bytes_cache_fallthrough(benchmark):

src/bluetooth_data_tools/gap.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ cpdef parse_advertisement_data(object data)
5959
)
6060
cpdef _uncached_parse_advertisement_bytes(bytes gap_bytes)
6161

62-
cpdef _uncached_parse_advertisement_data(bytes data)
62+
cpdef _parse_advertisement_data_miss_via_bytes(bytes data)
6363

64-
cpdef _uncached_parse_advertisement_tuple(tuple data)
64+
cpdef _parse_advertisement_tuple_miss_via_bytes(tuple data)

src/bluetooth_data_tools/gap.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def _parse_advertisement_data(
150150
data: bytes,
151151
) -> BLEGAPAdvertisement:
152152
"""Parse advertisement data and return a BLEGAPAdvertisement."""
153-
return _uncached_parse_advertisement_data(data)
153+
return _parse_advertisement_data_miss_via_bytes(data)
154154

155155

156156
_cached_parse_advertisement_data = _parse_advertisement_data
@@ -183,17 +183,17 @@ def parse_advertisement_data(
183183
return _cached_parse_advertisement_data(b"".join(data))
184184

185185

186-
def _uncached_parse_advertisement_data(data: bytes) -> BLEGAPAdvertisement:
186+
def _parse_advertisement_data_miss_via_bytes(data: bytes) -> BLEGAPAdvertisement:
187187
# Route BLEGAPAdvertisement-cache misses through the bytes-keyed cache
188-
# (symmetric with _uncached_parse_advertisement_tuple, see #261). Identical
189-
# payloads reaching this miss path skip the full parse when the bytes-tuple
190-
# cache already holds the result, and a true miss populates that cache so
191-
# subsequent parse_advertisement_data_bytes / parse_advertisement_data_tuple
192-
# calls on the same payload also win.
188+
# (symmetric with _parse_advertisement_tuple_miss_via_bytes, see #261).
189+
# Identical payloads reaching this miss path skip the full parse when the
190+
# bytes-tuple cache already holds the result, and a true miss populates
191+
# that cache so subsequent parse_advertisement_data_bytes /
192+
# parse_advertisement_data_tuple calls on the same payload also win.
193193
return BLEGAPAdvertisement(*parse_advertisement_data_bytes(data))
194194

195195

196-
def _uncached_parse_advertisement_tuple(
196+
def _parse_advertisement_tuple_miss_via_bytes(
197197
data: tuple[bytes, ...],
198198
) -> BLEGAPAdvertisementTupleType:
199199
# Route tuple-cache misses through the bytes-keyed cache so identical
@@ -386,11 +386,11 @@ def parse_advertisement_data_tuple(
386386
manufacturer_data: dict[int, bytes]
387387
tx_power: int | None
388388
"""
389-
return _uncached_parse_advertisement_tuple(data)
389+
return _parse_advertisement_tuple_miss_via_bytes(data)
390390
else:
391391
parse_advertisement_data_bytes = lru_cache(maxsize=1024)(
392392
_uncached_parse_advertisement_bytes
393393
)
394394
parse_advertisement_data_tuple = lru_cache(maxsize=256)(
395-
_uncached_parse_advertisement_tuple
395+
_parse_advertisement_tuple_miss_via_bytes
396396
)

tests/benchmarks/test_parse_gap_tuple.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
parse_advertisement_data_bytes,
66
parse_advertisement_data_tuple,
77
)
8-
from bluetooth_data_tools.gap import _uncached_parse_advertisement_data
8+
from bluetooth_data_tools.gap import _parse_advertisement_data_miss_via_bytes
99

1010
advs = (
1111
b"\x02\x01\x06\x03\x03\x12\x18\x10\tLOOKin_98F33163\x03\x19\xc1\x03",
@@ -92,7 +92,7 @@ def test_parse_advertisement_data_tuple(benchmark: BenchmarkFixture) -> None:
9292

9393
def test_parse_advertisement_data_tuple_uncached(benchmark: BenchmarkFixture) -> None:
9494
joined_advs = b"".join(advs)
95-
benchmark(lambda: _uncached_parse_advertisement_data(joined_advs))
95+
benchmark(lambda: _parse_advertisement_data_miss_via_bytes(joined_advs))
9696

9797

9898
def test_parse_advertisement_data_tuple_bytes_cache_fallthrough(

tests/test_gap_fuzzer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import random
1616

1717
from bluetooth_data_tools.gap import (
18-
_uncached_parse_advertisement_data,
18+
_parse_advertisement_data_miss_via_bytes,
1919
parse_advertisement_data,
2020
)
2121

@@ -32,7 +32,7 @@ def test_gap_fuzzer_random_bytes_do_not_crash() -> None:
3232
bytes(rng.randint(0, 255) for _ in range(rng.randint(1, 31))),
3333
bytes(rng.randint(0, 255) for _ in range(rng.randint(1, 31))),
3434
)
35-
_uncached_parse_advertisement_data(b"".join(adv))
35+
_parse_advertisement_data_miss_via_bytes(b"".join(adv))
3636

3737

3838
def test_gap_fuzzer_truncated_length_does_not_crash() -> None:

0 commit comments

Comments
 (0)