some more speretation of method memory so can run in parellel

Author: charleseidsness

adbus/sdbus.c

@@ -3,8 +3,7 @@
 cdef class Error:
     cdef sdbus_h.sd_bus_error _e
 
-    cdef reply_from_exception(self, sdbus_h.sd_bus_message *call,
-            Exception exception):
+    cdef reply_from_exception(self, Message call, Exception exception):
         cdef int errno
         cdef int ret
 
@@ -15,6 +14,6 @@ cdef class Error:
         cdef bytes err_message = str(exception).encode('utf-8')
 
         sdbus_h.sd_bus_error_set(&self._e, err_name, err_message)
-        ret = sdbus_h.sd_bus_reply_method_error(call, &self._e)
+        ret = sdbus_h.sd_bus_reply_method_error(call._m, &self._e)
         if ret < 0:
             raise SdbusError(f"Failed to send error reply: {errorcode[-ret]}", -ret)

adbus/sdbus/error.pyx

@@ -29,8 +29,9 @@ cdef class Message:
         self._m = sdbus_h.sd_bus_message_unref(self._m)
         self._m = sdbus_h.sd_bus_message_ref(message)
 
-    cdef new_method_return(self, sdbus_h.sd_bus_message *call):
+    cdef new_method_return(self):
         cdef int ret
+        cdef sdbus_h.sd_bus_message *call = self._m
         self._m = sdbus_h.sd_bus_message_unref(self._m)
         ret = sdbus_h.sd_bus_message_new_method_return(call, &self._m)
         if ret < 0:

adbus/sdbus/message.pyx

@@ -1,40 +1,41 @@
 # == Copyright: 2017, CCX Technologies
 
-cdef int method_message_handler(sdbus_h.sd_bus_message *m,
-        void *userdata, sdbus_h.sd_bus_error *err):
-
-    cdef PyObject *method_ptr = (((<PyObject**>userdata)[0]))
-    cdef Method method = <Method>method_ptr
-    cdef Message message = Message()
+cdef void _method_message_handler(Method method, Message message):
     cdef Error error
     cdef list args
     cdef object value
 
-    message.import_sd_bus_message(m)
     args = message.read(method.arg_signature)
 
     try:
         value = method.callback(*args)
     except Exception as e:
+        method.exceptions.append(e)
         error = Error()
         try:
-            error.reply_from_exception(m, e)
+            error.reply_from_exception(message, e)
         except SdbusError as e:
-            return -e.errno
-        else:
-            return 1
-        finally:
             method.exceptions.append(e)
+        return
 
-    message.new_method_return(m)
+    message.new_method_return()
     message.append(method.return_signature, value)
 
     try:
         message.send()
     except SdbusError as e:
-        return -e.errno
-    else:
-        return 1
+        method.exceptions.append(e)
+
+cdef int method_message_handler(sdbus_h.sd_bus_message *m,
+        void *userdata, sdbus_h.sd_bus_error *err):
+
+    cdef PyObject *method_ptr = (((<PyObject**>userdata)[0]))
+    cdef Method method = <Method>method_ptr
+    cdef Message message = Message()
+
+    message.import_sd_bus_message(m)
+    _method_message_handler(method, message)
+    return 1
 
 cdef class Method:
 

adbus/sdbus/method.pyx

@@ -17,7 +17,7 @@ cdef int property_get_handler(sdbus_h.sd_bus *bus,
     except Exception as e:
         error = Error()
         try:
-            error.reply_from_exception(m, e)
+            error.reply_from_exception(message, e)
         except SdbusError as e:
             return -e.errno
         else:
@@ -44,7 +44,7 @@ cdef int property_set_handler(sdbus_h.sd_bus *bus,
     except Exception as e:
         error = Error()
         try:
-            error.reply_from_exception(m, e)
+            error.reply_from_exception(message, e)
         except SdbusError as e:
             return -e.errno
         else:

adbus/sdbus/property.pyx

@@ -37,10 +37,13 @@ def test_method2(self, r: int, gg: str) -> int:
 
     @adbus.server.method()
     def slow_method(self) -> str:
-        raise RuntimeError("Test")
         time.sleep(10)
         return "Done"
 
+    @adbus.server.method()
+    def error_method(self) -> str:
+        raise RuntimeError("Test")
+
     @adbus.server.method()
     def var_method1(self, arg5: int, arg2: str, arg3, arg4, arg1: float):
         print(type(arg3))