From bbb73c8a90d33f48ae8a03cab5e5e577e09c34f1 Mon Sep 17 00:00:00 2001 From: espen Date: Fri, 15 Jun 2007 12:03:26 +0000 Subject: [PATCH] Improved error recovery from source (timeout/idle) functions --- glib/gcallback.lisp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp index 79d3413..1b2e54f 100644 --- a/glib/gcallback.lisp +++ b/glib/gcallback.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gcallback.lisp,v 1.42 2007-05-10 20:25:09 espen Exp $ +;; $Id: gcallback.lisp,v 1.43 2007-06-15 12:03:26 espen Exp $ (in-package "GLIB") @@ -87,7 +87,7 @@ (signal-handler-block instance handler-id) (unwind-protect (restart-case (apply #'invoke-callback callback-id nil args) - (abort () :report "Disconnect and exit signal handler" + (disconnect () :report "Disconnect and exit signal handler" (when (signal-handler-is-connected-p instance handler-id) (signal-handler-disconnect instance handler-id)) (values nil t)))) @@ -118,8 +118,18 @@ (defbinding source-remove () boolean (tag unsigned-int)) -(define-callback source-callback-marshal nil ((callback-id unsigned-int)) - (callback-trampoline #'invoke-callback callback-id 0 nil)) +(define-callback source-callback-marshal boolean ((callback-id unsigned-int)) + (invoke-source-callback callback-id)) + +(defun invoke-source-callback (callback-id) + (restart-case (funcall (find-user-data callback-id)) + (remove () :report "Exit and remove source callback" + nil) + (continue () :report "Return from source callback" + t) + (re-invoke nil :report "Re-invoke source callback" + (invoke-source-callback callback-id)))) + (defbinding (timeout-add "g_timeout_add_full") (interval function &optional (priority +priority-default+)) unsigned-int -- 2.11.0