feat: improve performance of unmarshalling variants (#354)
This commit is contained in:
@@ -203,6 +203,7 @@ cdef class Unmarshaller:
|
|||||||
@cython.locals(
|
@cython.locals(
|
||||||
tree=SignatureTree,
|
tree=SignatureTree,
|
||||||
token_as_int=cython.uint,
|
token_as_int=cython.uint,
|
||||||
|
var=Variant,
|
||||||
)
|
)
|
||||||
cdef Variant _read_variant(self)
|
cdef Variant _read_variant(self)
|
||||||
|
|
||||||
|
|||||||
@@ -457,53 +457,66 @@ class Unmarshaller:
|
|||||||
def _read_variant(self) -> Variant:
|
def _read_variant(self) -> Variant:
|
||||||
signature = self._read_signature()
|
signature = self._read_signature()
|
||||||
token_as_int = ord(signature[0])
|
token_as_int = ord(signature[0])
|
||||||
|
var = Variant.__new__(Variant)
|
||||||
# verify in Variant is only useful on construction not unmarshalling
|
# verify in Variant is only useful on construction not unmarshalling
|
||||||
if len(signature) == 1:
|
if len(signature) == 1:
|
||||||
if token_as_int == TOKEN_N_AS_INT:
|
if token_as_int == TOKEN_N_AS_INT:
|
||||||
return Variant(SIGNATURE_TREE_N, self._read_int16_unpack(), False)
|
var._init_variant(SIGNATURE_TREE_N, self._read_int16_unpack(), False)
|
||||||
|
return var
|
||||||
if token_as_int == TOKEN_S_AS_INT:
|
if token_as_int == TOKEN_S_AS_INT:
|
||||||
return Variant(SIGNATURE_TREE_S, self._read_string_unpack(), False)
|
var._init_variant(SIGNATURE_TREE_S, self._read_string_unpack(), False)
|
||||||
|
return var
|
||||||
if token_as_int == TOKEN_B_AS_INT:
|
if token_as_int == TOKEN_B_AS_INT:
|
||||||
return Variant(SIGNATURE_TREE_B, self._read_boolean(), False)
|
var._init_variant(SIGNATURE_TREE_B, self._read_boolean(), False)
|
||||||
|
return var
|
||||||
if token_as_int == TOKEN_O_AS_INT:
|
if token_as_int == TOKEN_O_AS_INT:
|
||||||
return Variant(SIGNATURE_TREE_O, self._read_string_unpack(), False)
|
var._init_variant(SIGNATURE_TREE_O, self._read_string_unpack(), False)
|
||||||
|
return var
|
||||||
if token_as_int == TOKEN_U_AS_INT:
|
if token_as_int == TOKEN_U_AS_INT:
|
||||||
return Variant(SIGNATURE_TREE_U, self._read_uint32_unpack(), False)
|
var._init_variant(SIGNATURE_TREE_U, self._read_uint32_unpack(), False)
|
||||||
|
return var
|
||||||
if token_as_int == TOKEN_Y_AS_INT:
|
if token_as_int == TOKEN_Y_AS_INT:
|
||||||
self._pos += 1
|
self._pos += 1
|
||||||
return Variant(SIGNATURE_TREE_Y, self._buf[self._pos - 1], False)
|
var._init_variant(SIGNATURE_TREE_Y, self._buf[self._pos - 1], False)
|
||||||
|
return var
|
||||||
elif token_as_int == TOKEN_A_AS_INT:
|
elif token_as_int == TOKEN_A_AS_INT:
|
||||||
if signature == "ay":
|
if signature == "ay":
|
||||||
return Variant(
|
var._init_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
|
||||||
)
|
)
|
||||||
|
return var
|
||||||
if signature == "a{qv}":
|
if signature == "a{qv}":
|
||||||
return Variant(
|
var._init_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,
|
||||||
)
|
)
|
||||||
|
return var
|
||||||
if signature == "as":
|
if signature == "as":
|
||||||
return Variant(
|
var._init_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
|
||||||
)
|
)
|
||||||
|
return var
|
||||||
if signature == "a{sv}":
|
if signature == "a{sv}":
|
||||||
return Variant(
|
var._init_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,
|
||||||
)
|
)
|
||||||
|
return var
|
||||||
if signature == "ao":
|
if signature == "ao":
|
||||||
return Variant(
|
var._init_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
|
||||||
)
|
)
|
||||||
|
return var
|
||||||
tree = get_signature_tree(signature)
|
tree = get_signature_tree(signature)
|
||||||
signature_type = tree.types[0]
|
signature_type = tree.types[0]
|
||||||
return Variant(
|
var._init_variant(
|
||||||
tree,
|
tree,
|
||||||
self._readers[signature_type.token](self, signature_type),
|
self._readers[signature_type.token](self, signature_type),
|
||||||
False,
|
False,
|
||||||
)
|
)
|
||||||
|
return var
|
||||||
|
|
||||||
def read_struct(self, type_: _SignatureType) -> list[Any]:
|
def read_struct(self, type_: _SignatureType) -> list[Any]:
|
||||||
self._pos += -self._pos & 7 # align 8
|
self._pos += -self._pos & 7 # align 8
|
||||||
|
|||||||
Reference in New Issue
Block a user