From e5d355ff407baf58a8e5b03c3e9ca25213a95e05 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 3 May 2023 17:20:50 -0500
Subject: [PATCH] feat: improve performance of reading from the socket during
 unmarshall (#200)

---
 .github/workflows/ci.yml                |  2 +-
 src/dbus_fast/_private/unmarshaller.pxd |  1 +
 src/dbus_fast/_private/unmarshaller.py  | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d0db3e..e61b8c3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
           if [ "${{ matrix.extension }}" = "skip_cython" ]; then
             SKIP_CYTHON=1 poetry install --only=main,dev
           else
-            poetry install --only=main,dev
+            REQUIRE_CYTHON=1 poetry install --only=main,dev
           fi
       - name: Test with Pytest
         run: export $(dbus-launch); poetry run pytest --cov-report=xml --timeout=5
diff --git a/src/dbus_fast/_private/unmarshaller.pxd b/src/dbus_fast/_private/unmarshaller.pxd
index 120db91..a9e0f6c 100644
--- a/src/dbus_fast/_private/unmarshaller.pxd
+++ b/src/dbus_fast/_private/unmarshaller.pxd
@@ -123,6 +123,7 @@ cdef class Unmarshaller:
 
     @cython.locals(
         msg=cython.bytes,
+        recv=cython.tuple
     )
     cdef bytes _read_sock(self, object length)
 
diff --git a/src/dbus_fast/_private/unmarshaller.py b/src/dbus_fast/_private/unmarshaller.py
index ab33090..f6fec1b 100644
--- a/src/dbus_fast/_private/unmarshaller.py
+++ b/src/dbus_fast/_private/unmarshaller.py
@@ -250,13 +250,16 @@ class Unmarshaller:
         from the read itself"""
         # This will raise BlockingIOError if there is no data to read
         # which we store in the MARSHALL_STREAM_END_ERROR object
-        msg, ancdata, _flags, _addr = self._sock.recvmsg(length, UNIX_FDS_CMSG_LENGTH)  # type: ignore[union-attr]
-        for level, type_, data in ancdata:
-            if not (level == SOL_SOCKET and type_ == SCM_RIGHTS):
-                continue
-            self._unix_fds.extend(
-                ARRAY("i", data[: len(data) - (len(data) % MAX_UNIX_FDS_SIZE)])
-            )
+        recv = self._sock.recvmsg(length, UNIX_FDS_CMSG_LENGTH)  # type: ignore[union-attr]
+        msg = recv[0]
+        ancdata = recv[1]
+        if ancdata:
+            for level, type_, data in ancdata:
+                if not (level == SOL_SOCKET and type_ == SCM_RIGHTS):
+                    continue
+                self._unix_fds.extend(
+                    ARRAY("i", data[: len(data) - (len(data) % MAX_UNIX_FDS_SIZE)])
+                )
 
         return msg