added more asyncio freindly exception processing

Author: charleseidsness

adbus/sdbus.c

@@ -10,12 +10,12 @@ cdef void _method_message_handler(Method method, Message message):
     try:
         value = method.callback(*args)
     except Exception as e:
-        method.exceptions.append(e)
+        method.loop.call_exception_handler({'message': str(e), 'exception': e})
         error = Error()
         try:
             error.reply_from_exception(message, e)
         except SdbusError as e:
-            method.exceptions.append(e)
+            method.loop.call_exception_handler({'message': str(e), 'exception': e})
         return
 
     message.new_method_return()
@@ -24,7 +24,7 @@ cdef void _method_message_handler(Method method, Message message):
     try:
         message.send()
     except SdbusError as e:
-        method.exceptions.append(e)
+        method.loop.call_exception_handler({'message': str(e), 'exception': e})
 
 cdef int method_message_handler(sdbus_h.sd_bus_message *m,
         void *userdata, sdbus_h.sd_bus_error *err):
@@ -47,7 +47,6 @@ cdef class Method:
     cdef bytes name
     cdef bytes arg_signature
     cdef bytes return_signature
-    cdef list exceptions
     cdef Object object
     cdef object loop
 
@@ -58,7 +57,6 @@ cdef class Method:
         self.arg_signature = arg_signature.encode()
         self.return_signature = return_signature.encode()
         self.callback = callback
-        self.exceptions = []
         self.object = None
 
         self.type = sdbus_h._SD_BUS_VTABLE_METHOD

adbus/sdbus/method.pyx

@@ -8,15 +8,13 @@ cdef class Object:
     cdef bytes path
     cdef bytes interface
     cdef list vtable
-    cdef list exceptions
     cdef object loop
 
     def __cinit__(self, service, path, interface, vtable,
             depreciated=False, hidden=False):
         self.vtable = vtable
         self.path = path.encode()
         self.interface = interface.encode()
-        self.exceptions = (<Service>service).exceptions
         self.bus = (<Service>service).bus
         self.loop = (<Service>service).loop
 
@@ -63,14 +61,12 @@ cdef class Object:
             if type(v) == Method:
                 (<Method>v).set_object(self)
                 (<Method>v).populate_vtable(&self._vtable[i+1])
-                (<Method>v).exceptions = self.exceptions
                 self._vtable[i+1].x.method.offset = i*sizeof(self._userdata[0])
                 self._userdata[i] = (<Method>v).userdata
 
             elif type(v) == Property:
                 (<Property>v).set_object(self)
                 (<Property>v).populate_vtable(&self._vtable[i+1])
-                (<Property>v).exceptions = self.exceptions
                 self._vtable[i+1].x.method.offset = i*sizeof(self._userdata[0])
                 self._userdata[i] = (<Property>v).userdata
 

adbus/sdbus/object.pyx

@@ -15,15 +15,14 @@ cdef int property_get_handler(sdbus_h.sd_bus *bus,
         value = getattr(property.py_object, property.attr_name)
         message.append(property.signature, value)
     except Exception as e:
+        property.loop.call_exception_handler({'message': str(e), 'exception': e})
         error = Error()
         try:
             error.reply_from_exception(message, e)
         except SdbusError as e:
             return -e.errno
         else:
             return 1
-        finally:
-            property.exceptions.append(e)
 
     return 1
 
@@ -42,15 +41,14 @@ cdef int property_set_handler(sdbus_h.sd_bus *bus,
     try:
         setattr(property.py_object, property.attr_name, values[0])
     except Exception as e:
+        property.loop.call_exception_handler({'message': str(e), 'exception': e})
         error = Error()
         try:
             error.reply_from_exception(message, e)
         except SdbusError as e:
             return -e.errno
         else:
             return 1
-        finally:
-            property.exceptions.append(e)
 
     return 1
 
@@ -63,8 +61,8 @@ cdef class Property:
     cdef str attr_name
     cdef bytes name
     cdef bytes signature
-    cdef list exceptions
     cdef Object object
+    cdef object loop
 
     def __cinit__(self, name, py_object, attr_name, signature='', read_only=False,
             depreciated=False, hidden=False, unprivileged=False,
@@ -74,7 +72,6 @@ cdef class Property:
         self.py_object = py_object
         self.attr_name = attr_name
         self.signature = signature.encode()
-        self.exceptions = []
         self.object = None
 
         if read_only:
@@ -120,6 +117,7 @@ cdef class Property:
         if self.object:
             raise SdbusError("Property already associated")
         self.object = object
+        self.loop = (<Object>object).loop
 
     def emit_changed(self):
         if not self.object:

adbus/sdbus/property.pyx

@@ -4,15 +4,13 @@ cdef class Service:
     cdef sdbus_h.sd_bus *bus
     cdef bytes name
     cdef bool connected
-    cdef list exceptions
     cdef stdint.uint64_t flags
     cdef object loop
 
     def __cinit__(self, name, loop=None, bus='system',
             replace_existing=False, allow_replacement=False, queue=False):
 
         self.name = name.encode()
-        self.exceptions = []
         self.flags = 0
         self.connected = False
         self.loop = loop
@@ -55,6 +53,10 @@ cdef class Service:
         """Service is running."""
         return self.loop.is_running()
 
+    def get_loop(self):
+        """Get the service's asyncio loop."""
+        return self.loop
+
     def __dealloc__(self):
         self.bus = sdbus_h.sd_bus_unref(self.bus)
 
@@ -77,11 +79,6 @@ cdef class Service:
                 if r < 0:
                     raise BusError(f"D-Bus Process Error: {errorcode[-r]}")
 
-                if self.exceptions:
-                    for callback_exception in self.exceptions[:]:
-                        self.exceptions.remove(callback_exception)
-                        raise callback_exception
-
                 if r == 0:
                     break
         finally:

adbus/sdbus/service.pyx

@@ -85,7 +85,9 @@ def emit_property_changed(self, py_name, dbus_name):
                 self.sdbus.emit_properties_changed([dbus_name.encode()])
 
             if self.changed_callback:
-                self.changed_callback([py_name])
+                self.service.get_loop().run_in_executor(
+                    None, self.changed_callback, [py_name]
+                )
 
     def defer_signals(self, enable):
         if enable:
@@ -101,7 +103,10 @@ def defer_signals(self, enable):
                     )
 
             if self.changed_callback:
-                self.changed_callback(list(self._deferred_properties.values()))
+                self.service.get_loop().run_in_executor(
+                    None, self.changed_callback,
+                    list(self._deferred_properties.values())
+                )
 
             self._deferred_properties = {}
 

adbus/server/object.py

@@ -51,3 +51,6 @@ def __init__(
 
     def is_running(self):
         return self.sdbus.is_running()
+
+    def get_loop(self):
+        return self.sdbus.get_loop()

adbus/server/service.py

@@ -25,7 +25,8 @@ class TestObject(adbus.server.Object):
     signal1: int = adbus.server.Signal()
 
     def __init__(self, service):
-        super().__init__(service, object_path, object_interface)
+        super().__init__(service, object_path, object_interface,
+                changed_callback=self.dummy_cb)
 
     @adbus.server.method()
     def test_method(self, r: int, gg: str) -> int:
@@ -37,9 +38,18 @@ def test_method2(self, r: int, gg: str) -> int:
 
     @adbus.server.method()
     def slow_method(self) -> str:
-        time.sleep(10)
+        for _ in range(0, 5):
+            time.sleep(1)
+            print('-', end='', flush=True)
         return "Done"
 
+    @adbus.server.method()
+    def slow_error(self) -> str:
+        for _ in range(0, 5):
+            time.sleep(1)
+            print('-', end='', flush=True)
+        raise RuntimeError("Slow Test")
+
     @adbus.server.method()
     def error_method(self) -> str:
         raise RuntimeError("Test")
@@ -49,6 +59,11 @@ def var_method1(self, arg5: int, arg2: str, arg3, arg4, arg1: float):
         print(type(arg3))
         return str(arg3)
 
+    def dummy_cb(self, names):
+        if len(names) > 1:
+            print(f"{names} where updated")
+        else:
+            print(f"{names[0]} was updated")
 
 class Test(unittest.TestCase):
     """adbus method test cases."""