feat: speed up unmarshalling Variants (#254)

Bluetooth-Devices · Sep 20, 2023 · dd74a84 · dd74a84
1 parent 24dbe61
commit dd74a84
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/dbus_fast/_private/unmarshaller.pxd b/src/dbus_fast/_private/unmarshaller.pxd
@@ -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_S_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 DEFAULT_BUFFER_SIZE
@@ -177,6 +182,7 @@ cdef class Unmarshaller:
 
     @cython.locals(
         tree=SignatureTree,
+        token_as_int=cython.uint,
     )
     cdef Variant _read_variant(self)
 

diff --git a/src/dbus_fast/_private/unmarshaller.py b/src/dbus_fast/_private/unmarshaller.py
@@ -97,9 +97,14 @@
 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]
 
+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_S_AS_INT = ord("s")
 TOKEN_G_AS_INT = ord("g")
+TOKEN_N_AS_INT = ord("n")
 
 ARRAY = array.array
 SOL_SOCKET = socket.SOL_SOCKET
@@ -432,42 +437,43 @@ def read_variant(self, type_: _SignatureType) -> Variant:
 
     def _read_variant(self) -> Variant:
         signature = self._read_signature()
+        token_as_int = signature[0]
         # 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)
-        elif signature == "ay":
+        elif token_as_int == TOKEN_A_AS_INT and signature == "ay":
             return Variant(
                 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(
                 SIGNATURE_TREE_A_QV,
                 self.read_array(SIGNATURE_TREE_A_QV_TYPES_0),
                 False,
             )
-        elif signature == "s":
+        elif token_as_int == TOKEN_S_AS_INT:
             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)
-        elif signature == "o":
+        elif token_as_int == TOKEN_O_AS_INT:
             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(
                 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(
                 SIGNATURE_TREE_A_SV,
                 self.read_array(SIGNATURE_TREE_A_SV_TYPES_0),
                 False,
             )
-        elif signature == "ao":
+        elif token_as_int == TOKEN_A_AS_INT and signature == "ao":
             return Variant(
                 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)
-        elif signature == "y":
+        elif token_as_int == TOKEN_Y_AS_INT:
             self._pos += 1
             return Variant(SIGNATURE_TREE_Y, self._buf[self._pos - 1], False)
         tree = get_signature_tree(signature)