ezri/dbus-fast
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: speed up unmarshalling Variants (#254)

Browse Source
This commit is contained in:
J. Nick Koston
2023-09-20 10:27:13 +02:00
committed by GitHub
parent 24dbe61160
commit dd74a8409d
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbus_fast/_private/unmarshaller.pxd
View File

@@ -79,6 +79,11 @@ cdef SignatureType SIGNATURE_TREE_A_OA_SA_SV_TYPES_0
cdef unsigned int TOKEN_O_AS_INT cdef unsigned int TOKEN_O_AS_INT
cdef unsigned int TOKEN_S_AS_INT cdef unsigned int TOKEN_S_AS_INT
cdef unsigned int TOKEN_G_AS_INT cdef unsigned int TOKEN_G_AS_INT
cdef unsigned int TOKEN_N_AS_INT
cdef unsigned int TOKEN_A_AS_INT
cdef unsigned int TOKEN_B_AS_INT
cdef unsigned int TOKEN_U_AS_INT
cdef unsigned int TOKEN_Y_AS_INT
cdef object MARSHALL_STREAM_END_ERROR cdef object MARSHALL_STREAM_END_ERROR
cdef object DEFAULT_BUFFER_SIZE cdef object DEFAULT_BUFFER_SIZE
@@ -177,6 +182,7 @@ cdef class Unmarshaller:
@cython.locals( @cython.locals(
tree=SignatureTree, tree=SignatureTree,
token_as_int=cython.uint,
) )
cdef Variant _read_variant(self) cdef Variant _read_variant(self)

28
src/dbus_fast/_private/unmarshaller.py
View File

@@ -97,9 +97,14 @@ SIGNATURE_TREE_OA_SA_SV_TYPES_1 = SIGNATURE_TREE_OA_SA_SV.types[1]
SIGNATURE_TREE_A_OA_SA_SV = get_signature_tree("a{oa{sa{sv}}}") SIGNATURE_TREE_A_OA_SA_SV = get_signature_tree("a{oa{sa{sv}}}")
SIGNATURE_TREE_A_OA_SA_SV_TYPES_0 = SIGNATURE_TREE_A_OA_SA_SV.types[0] SIGNATURE_TREE_A_OA_SA_SV_TYPES_0 = SIGNATURE_TREE_A_OA_SA_SV.types[0]
TOKEN_B_AS_INT = ord("b")
TOKEN_U_AS_INT = ord("u")
TOKEN_Y_AS_INT = ord("y")
TOKEN_A_AS_INT = ord("o")
TOKEN_O_AS_INT = ord("o") TOKEN_O_AS_INT = ord("o")
TOKEN_S_AS_INT = ord("s") TOKEN_S_AS_INT = ord("s")
TOKEN_G_AS_INT = ord("g") TOKEN_G_AS_INT = ord("g")
TOKEN_N_AS_INT = ord("n")
ARRAY = array.array ARRAY = array.array
SOL_SOCKET = socket.SOL_SOCKET SOL_SOCKET = socket.SOL_SOCKET
@@ -432,42 +437,43 @@ class Unmarshaller:
def _read_variant(self) -> Variant: def _read_variant(self) -> Variant:
signature = self._read_signature() signature = self._read_signature()
token_as_int = signature[0]
# verify in Variant is only useful on construction not unmarshalling # verify in Variant is only useful on construction not unmarshalling
if signature == "n": if token_as_int == TOKEN_N_AS_INT:
return Variant(SIGNATURE_TREE_N, self._read_int16_unpack(), False) return Variant(SIGNATURE_TREE_N, self._read_int16_unpack(), False)
elif signature == "ay": elif token_as_int == TOKEN_A_AS_INT and signature == "ay":
return Variant( return Variant(
SIGNATURE_TREE_AY, self.read_array(SIGNATURE_TREE_AY_TYPES_0), False SIGNATURE_TREE_AY, self.read_array(SIGNATURE_TREE_AY_TYPES_0), False
) )
elif signature == "a{qv}": elif token_as_int == TOKEN_A_AS_INT and signature == "a{qv}":
return Variant( return Variant(
SIGNATURE_TREE_A_QV, SIGNATURE_TREE_A_QV,
self.read_array(SIGNATURE_TREE_A_QV_TYPES_0), self.read_array(SIGNATURE_TREE_A_QV_TYPES_0),
False, False,
) )
elif signature == "s": elif token_as_int == TOKEN_S_AS_INT:
return Variant(SIGNATURE_TREE_S, self._read_string_unpack(), False) return Variant(SIGNATURE_TREE_S, self._read_string_unpack(), False)
elif signature == "b": elif token_as_int == TOKEN_B_AS_INT:
return Variant(SIGNATURE_TREE_B, self._read_boolean(), False) return Variant(SIGNATURE_TREE_B, self._read_boolean(), False)
elif signature == "o": elif token_as_int == TOKEN_O_AS_INT:
return Variant(SIGNATURE_TREE_O, self._read_string_unpack(), False) return Variant(SIGNATURE_TREE_O, self._read_string_unpack(), False)
elif signature == "as": elif token_as_int == TOKEN_A_AS_INT and signature == "as":
return Variant( return Variant(
SIGNATURE_TREE_AS, self.read_array(SIGNATURE_TREE_AS_TYPES_0), False SIGNATURE_TREE_AS, self.read_array(SIGNATURE_TREE_AS_TYPES_0), False
) )
elif signature == "a{sv}": elif token_as_int == TOKEN_A_AS_INT and signature == "a{sv}":
return Variant( return Variant(
SIGNATURE_TREE_A_SV, SIGNATURE_TREE_A_SV,
self.read_array(SIGNATURE_TREE_A_SV_TYPES_0), self.read_array(SIGNATURE_TREE_A_SV_TYPES_0),
False, False,
) )
elif signature == "ao": elif token_as_int == TOKEN_A_AS_INT and signature == "ao":
return Variant( return Variant(
SIGNATURE_TREE_AO, self.read_array(SIGNATURE_TREE_AO_TYPES_0), False SIGNATURE_TREE_AO, self.read_array(SIGNATURE_TREE_AO_TYPES_0), False
) )
elif signature == "u": elif token_as_int == TOKEN_U_AS_INT:
return Variant(SIGNATURE_TREE_U, self._read_uint32_unpack(), False) return Variant(SIGNATURE_TREE_U, self._read_uint32_unpack(), False)
elif signature == "y": elif token_as_int == TOKEN_Y_AS_INT:
self._pos += 1 self._pos += 1
return Variant(SIGNATURE_TREE_Y, self._buf[self._pos - 1], False) return Variant(SIGNATURE_TREE_Y, self._buf[self._pos - 1], False)
tree = get_signature_tree(signature) tree = get_signature_tree(signature)