From efe3df614b1808a686a91d07dfc46690b94ad126 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 3 May 2016 18:05:31 -0500 Subject: [PATCH] actors: Catch all errors in the actor model. Not doing so results in a SIGABRT. * 8sync/systems/actors.scm (hive-process-message): Catch all errors and call print-error-and-continue. Leave comment for thoughts on using maybe-catch-all. --- 8sync/systems/actors.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/8sync/systems/actors.scm b/8sync/systems/actors.scm index c75a25a..0659eb5 100644 --- a/8sync/systems/actors.scm +++ b/8sync/systems/actors.scm @@ -538,13 +538,23 @@ more compact following syntax: (define (call-catching-coroutine thunk) (define (call-catching-errors) - (with-throw-handler - #t thunk - (lambda (key . args) - (if (message-needs-reply message) - ;; If the message is waiting on a reply, let them know - ;; something went wrong. - (hive-reply-with-error hive message key args))))) + ;; TODO: maybe parameterize and use maybe-catch-all from agenda.scm + ;; @@: Why not just use with-throw-handler and let the catch + ;; happen at the agenda? That's what we used to do, but + ;; it ended up with a SIGABRT. See: + ;; http://lists.gnu.org/archive/html/bug-guile/2016-05/msg00003.html + (catch #t + thunk + ;; In the actor model, we don't totally crash on errors. + (lambda _ #f) + ;; If an error happens, we raise it + (lambda (key . args) + (if (message-needs-reply message) + ;; If the message is waiting on a reply, let them know + ;; something went wrong. + (hive-reply-with-error hive message key args)) + ;; print error message + (apply print-error-and-continue key args)))) (call-with-prompt (hive-prompt hive) call-catching-errors (lambda (kont actor message) -- 2.31.1