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

feat: improve unmarshall performance (#199)

Browse Source
This commit is contained in:
J. Nick Koston
2023-04-20 14:31:51 -10:00
committed by GitHub
parent 5d5502283d
commit 3dc98be7e9
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ cdef object UINT16_UNPACK_BIG_ENDIAN
cdef cython.dict MESSAGE_TYPE_MAP cdef cython.dict MESSAGE_TYPE_MAP
cdef cython.dict MESSAGE_FLAG_MAP cdef cython.dict MESSAGE_FLAG_MAP
cdef object HEADER_MESSAGE_ARG_NAME cdef dict HEADER_MESSAGE_ARG_NAME
cdef SignatureTree SIGNATURE_TREE_EMPTY cdef SignatureTree SIGNATURE_TREE_EMPTY
cdef SignatureTree SIGNATURE_TREE_B cdef SignatureTree SIGNATURE_TREE_B
@@ -108,8 +108,8 @@ cdef class Unmarshaller:
cdef unsigned int _body_len cdef unsigned int _body_len
cdef unsigned int _serial cdef unsigned int _serial
cdef unsigned int _header_len cdef unsigned int _header_len
cdef unsigned int _message_type cdef object _message_type
cdef unsigned int _flag cdef object _flag
cdef unsigned int _msg_len cdef unsigned int _msg_len
cdef unsigned int _is_native cdef unsigned int _is_native
cdef object _uint32_unpack cdef object _uint32_unpack
@@ -154,9 +154,12 @@ cdef class Unmarshaller:
@cython.locals( @cython.locals(
str_start=cython.uint, str_start=cython.uint,
) )
cdef _read_string_unpack(self) cdef str _read_string_unpack(self)
cdef _read_variant(self) @cython.locals(
tree=SignatureTree,
)
cdef Variant _read_variant(self)
cpdef read_array(self, SignatureType type_) cpdef read_array(self, SignatureType type_)
@@ -165,7 +168,7 @@ cdef class Unmarshaller:
array_length=cython.uint, array_length=cython.uint,
child_type=SignatureType, child_type=SignatureType,
) )
cdef _read_array(self, SignatureType type_) cdef object _read_array(self, SignatureType type_)
cpdef read_signature(self, SignatureType type_) cpdef read_signature(self, SignatureType type_)
@@ -173,17 +176,18 @@ cdef class Unmarshaller:
o=cython.ulong, o=cython.ulong,
signature_len=cython.uint, signature_len=cython.uint,
) )
cdef _read_signature(self) cdef str _read_signature(self)
@cython.locals( @cython.locals(
endian=cython.uint, endian=cython.uint,
protocol_version=cython.uint, protocol_version=cython.uint,
key=cython.str key=cython.str,
) )
cdef _read_header(self) cdef _read_header(self)
@cython.locals( @cython.locals(
body=cython.list body=cython.list,
header_fields=cython.dict
) )
cdef _read_body(self) cdef _read_body(self)
@@ -194,8 +198,7 @@ cdef class Unmarshaller:
@cython.locals( @cython.locals(
beginning_pos=cython.ulong, beginning_pos=cython.ulong,
o=cython.ulong, o=cython.ulong,
field_0=cython.uint,
token_as_int=cython.uint, token_as_int=cython.uint,
signature_len=cython.uint, signature_len=cython.uint,
) )
cdef header_fields(self, unsigned int header_length) cdef cython.dict _header_fields(self, unsigned int header_length)

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

@@ -494,7 +494,7 @@ class Unmarshaller:
result_list.append(reader(self, child_type)) result_list.append(reader(self, child_type))
return result_list return result_list
def header_fields(self, header_length: int) -> Dict[str, Any]: def _header_fields(self, header_length: int) -> Dict[str, Any]:
"""Header fields are always a(yv).""" """Header fields are always a(yv)."""
beginning_pos = self._pos beginning_pos = self._pos
headers = {} headers = {}
@@ -586,7 +586,7 @@ class Unmarshaller:
"""Read the body of the message.""" """Read the body of the message."""
self._read_to_pos(HEADER_SIGNATURE_SIZE + self._msg_len) self._read_to_pos(HEADER_SIGNATURE_SIZE + self._msg_len)
self._pos = HEADER_ARRAY_OF_STRUCT_SIGNATURE_POSITION self._pos = HEADER_ARRAY_OF_STRUCT_SIGNATURE_POSITION
header_fields = self.header_fields(self._header_len) header_fields = self._header_fields(self._header_len)
self._pos += -self._pos & 7 # align 8 self._pos += -self._pos & 7 # align 8
header_fields.pop("unix_fds", None) # defined by self._unix_fds header_fields.pop("unix_fds", None) # defined by self._unix_fds
signature = header_fields.pop("signature", "") signature = header_fields.pop("signature", "")