X-Git-Url: https://jxself.org/git/?p=8sync.git;a=blobdiff_plain;f=8sync%2Factors.scm;h=1b120ba77916e1e3f9bd08029cfa4398218a5e66;hp=2c9870ce26aef93a51655e4206772dd632fce4f3;hb=d23b593a5810b38d2517a44c09d49b2835c59e16;hpb=47de7ccf21d3a2a615271d0ab007ce3d15ffa23d diff --git a/8sync/actors.scm b/8sync/actors.scm index 2c9870c..1b120ba 100644 --- a/8sync/actors.scm +++ b/8sync/actors.scm @@ -1,5 +1,5 @@ ;;; 8sync --- Asynchronous programming for Guile -;;; Copyright (C) 2016 Christopher Allan Webber +;;; Copyright © 2016, 2017 Christopher Allan Webber ;;; ;;; This file is part of 8sync. ;;; @@ -51,14 +51,14 @@ build-actions - define-simple-actor + define-actor make-hive ;; There are more methods for the hive, but there's ;; no reason for the outside world to look at them maybe? hive-id - hive-create-actor hive-create-actor* + bootstrap-actor bootstrap-actor* create-actor create-actor* self-destruct @@ -71,9 +71,9 @@ message-auto-reply? - <- <-wait <-wait* <-reply <-reply-wait <-reply-wait* + <- <-* <-wait <-wait* <-reply <-reply* <-reply-wait <-reply-wait* - call-with-message msg-receive msg-val + call-with-message mbody-receive mbody-val run-hive bootstrap-message @@ -196,51 +196,83 @@ ;; confusing. (8sync (hive-process-message hive new-message))))) - -(define (<- from-actor to-id action . message-body-args) +(define (<- to-id action . message-body-args) "Send a message from an actor to another actor" - (send-message '() from-actor to-id action + (send-message '() (%current-actor) to-id action #f #f message-body-args)) -(define (<-wait* send-options from-actor to-id action . message-body-args) - "Like <-wait, but allows extra parameters, for example whether to -#:accept-errors" - (apply wait-maybe-handle-errors - (send-message send-options from-actor to-id action - #f #t message-body-args) - send-options)) +(define (<-* send-options to-id action . message-body-args) + "Like <-*, but allows extra parameters via send-options" + (define* (really-send #:key (actor (%current-actor)) + #:allow-other-keys) + (send-message send-options actor to-id action + #f #f message-body-args)) + (apply really-send send-options)) -(define (<-wait from-actor to-id action . message-body-args) +(define (<-wait to-id action . message-body-args) "Send a message from an actor to another, but wait until we get a response" - (apply <-wait* '() from-actor to-id action message-body-args)) + (wait-maybe-handle-errors + (send-message '() (%current-actor) to-id action + #f #t message-body-args))) + +(define (<-wait* send-options to-id action . message-body-args) + "Like <-wait, but allows extra parameters, for example whether to +#:accept-errors" + (define* (really-send #:key (actor (%current-actor)) + #:allow-other-keys) + (apply wait-maybe-handle-errors + (send-message send-options actor to-id action + #f #t message-body-args) + send-options)) + (apply really-send send-options)) ;; TODO: Intelligently ~propagate(ish) errors on -wait functions. ;; We might have `send-message-wait-brazen' to allow callers to ;; not have an exception thrown and instead just have a message with ;; the appropriate '*error* message returned. -(define (<-reply from-actor original-message . message-body-args) +(define (<-reply original-message . message-body-args) "Reply to a message" - (send-message '() from-actor (message-from original-message) '*reply* - original-message #f message-body-args)) - -(define (<-auto-reply from-actor original-message) + (when (message-needs-reply? original-message) + (send-message '() (%current-actor) (message-from original-message) '*reply* + original-message #f message-body-args))) + +(define (<-reply* send-options original-message . message-body-args) + "Like <-reply, but allows extra parameters via send-options" + (define* (really-send #:key (actor (%current-actor)) + #:allow-other-keys) + (send-message send-options actor + (message-from original-message) '*reply* + original-message #f message-body-args)) + (when (message-needs-reply? original-message) + (apply really-send send-options))) + +(define (<-auto-reply actor original-message) "Auto-reply to a message. Internal use only!" - (send-message '() from-actor (message-from original-message) '*auto-reply* + (send-message '() actor (message-from original-message) '*auto-reply* original-message #f '())) -(define (<-reply-wait* send-options from-actor original-message - . message-body-args) - "Reply to a messsage, but wait until we get a response" - (apply wait-maybe-handle-errors - (send-message send-options from-actor - (message-from original-message) '*reply* - original-message #t message-body-args) - send-options)) - -(define (<-reply-wait from-actor original-message . message-body-args) +(define (<-reply-wait original-message . message-body-args) "Reply to a messsage, but wait until we get a response" - (apply <-reply-wait* '() from-actor original-message message-body-args)) + (if (message-needs-reply? original-message) + (wait-maybe-handle-errors + (send-message '() (%current-actor) + (message-from original-message) '*reply* + original-message #t message-body-args)) + #f)) + +(define (<-reply-wait* send-options original-message + . message-body-args) + "Like <-reply-wait, but allows extra parameters via send-options" + (define* (really-send #:key (actor (%current-actor)) + #:allow-other-keys) + (apply wait-maybe-handle-errors + (send-message send-options actor + (message-from original-message) '*reply* + original-message #t message-body-args) + send-options)) + (when (message-needs-reply? original-message) + (apply really-send send-options))) (define* (wait-maybe-handle-errors message #:key accept-errors @@ -307,28 +339,24 @@ to come after class definition." #:allocation #:each-subclass #:getter actor-message-handler) + ;; valid values are: + ;; - #t as in, send the init message, but don't wait (default) + ;; - 'wait, as in wait on the init message + ;; - #f as in don't bother to init + (should-init #:init-value #t + #:allocation #:each-subclass) + ;; This is the default, "simple" way to inherit and process messages. (actions #:init-value (build-actions - ;; Default clean-up method is to do nothing. - (*clean-up* (const #f))) + ;; Default init method is to do nothing. + (*init* (const #f)) + ;; Default cleanup method is to do nothing. + (*cleanup* (const #f))) #:allocation #:each-subclass)) -;;; So these are the nicer representations of addresses. -;;; However, they don't serialize so easily with scheme read/write, so we're -;;; using the simpler cons cell version below for now. - -;; (define-record-type
-;; (make-address actor-id hive-id) ; @@: Do we want the trailing -id? -;; address? -;; (actor-id address-actor-id) -;; (hive-id address-hive-id)) -;; -;; (set-record-type-printer! -;;
-;; (lambda (record port) -;; (format port "" -;; (address-actor-id record) (address-hive-id record)))) -;; +;;; Addresses are vectors where the first part is the actor-id and +;;; the second part is the hive-id. This works well enough... they +;;; look decent being pretty-printed. (define (make-address actor-id hive-id) (vector actor-id hive-id)) @@ -366,10 +394,13 @@ to come after class definition." ;;; Actor utilities ;;; =============== -(define-syntax-rule (define-simple-actor class action ...) - (define-class class () +(define-syntax-rule (define-actor class inherits + (action ...) + slots ...) + (define-class class inherits (actions #:init-value (build-actions action ...) - #:allocation #:each-subclass))) + #:allocation #:each-subclass) + slots ...)) ;;; The Hive @@ -406,22 +437,45 @@ to come after class definition." ;; This is in the case of an ambassador failing to forward a ;; message... it reports it back to the hive (*failed-forward* hive-handle-failed-forward) - (*clean-up-all* hive-handle-clean-up-all)))) + ;; These are called at start and end of run-hive + (*init-all* hive-handle-init-all) + (*cleanup-all* hive-handle-cleanup-all)))) + +(define-method (hive-handle-init-all (hive ) message) + "Run *init* method on all actors in registry" + ;; We have to do this hack and run over the list + ;; twice, because hash-for-each would result in an unrewindable + ;; continuation, and to avoid the hash-map changing during the + ;; middle of this. + (define actor-ids + (hash-map->list (lambda (actor-id actor) actor-id) + (hive-actor-registry hive))) + (for-each (lambda (actor-id) + (let* ((actor (hash-ref (hive-actor-registry hive) + actor-id))) + (match (slot-ref actor 'should-init) + (#f #f) + ('wait + (<-wait actor-id '*init*)) + (_ + (<- actor-id '*init*))))) + actor-ids)) (define-method (hive-handle-failed-forward (hive ) message) "Handle an ambassador failing to forward a message" 'TODO) -(define-method (hive-handle-clean-up-all (hive ) message) +(define-method (hive-handle-cleanup-all (hive ) message) "Send a message to all actors in our registry to clean themselves up." - ;; Unfortunately we have to do this hack and run over the list + ;; We have to do this hack and run over the list ;; twice, because hash-for-each would result in an unrewindable - ;; continuation. + ;; continuation, and to avoid the hash-map changing during the + ;; middle of this. (define actor-ids (hash-map->list (lambda (actor-id actor) actor-id) (hive-actor-registry hive))) (for-each (lambda (actor-id) - (<- hive actor-id '*clean-up*)) + (<- actor-id '*cleanup*)) actor-ids)) (define* (make-hive #:key hive-id) @@ -631,52 +685,61 @@ to come after class definition." (hash-set! (hive-actor-registry hive) (actor-id actor) actor)) (define-method (%hive-create-actor (hive ) actor-class - init id-cookie) - "Actual method called by hive-create-actor. + init-args id-cookie send-init?) + "Actual method called by bootstrap-actor / create-actor. Since this is a define-method it can't accept fancy define* arguments, -so this gets called from the nicer hive-create-actor interface. See +so this gets called from the nicer bootstrap-actor interface. See that method for documentation." (let* ((actor-id (hive-gen-actor-id hive id-cookie)) (actor (apply make actor-class #:hive hive #:id actor-id - init))) + init-args)) + (actor-should-init (slot-ref actor 'should-init))) (hive-register-actor! hive actor) + ;; Maybe run actor init method + (when (and send-init? actor-should-init) + (let ((send-method + (if (eq? actor-should-init 'wait) + <-wait <-))) + (send-method actor-id '*init*))) ;; return the actor id actor-id)) -(define* (hive-create-actor hive actor-class #:rest init) - "Create an actor on HIVE using ACTOR-CLASS passing in INIT args" +(define* (bootstrap-actor hive actor-class #:rest init-args) + "Create an actor on HIVE using ACTOR-CLASS passing in INIT-ARGS args" (%hive-create-actor hive actor-class - init (symbol->string (class-name actor-class)))) + init-args (symbol->string (class-name actor-class)) + #f)) -(define* (hive-create-actor* hive actor-class id-cookie #:rest init) +(define* (bootstrap-actor* hive actor-class id-cookie #:rest init-args) "Create an actor, but also allow customizing a 'cookie' added to the id for debugging" (%hive-create-actor hive actor-class - init id-cookie)) + init-args id-cookie + #f)) (define (call-with-message message proc) "Applies message body arguments into procedure, with message as first argument. Similar to call-with-values in concept." (apply proc message (message-body message))) -;; (msg-receive (<- bar baz) +;; (mbody-receive (<- bar baz) ;; (baz) ;; basil) -;; Emacs: (put 'msg-receive 'scheme-indent-function 2) +;; Emacs: (put 'mbody-receive 'scheme-indent-function 2) ;; @@: Or receive-msg or receieve-message or?? -(define-syntax-rule (msg-receive arglist message body ...) +(define-syntax-rule (mbody-receive arglist message body ...) "Call body with arglist (which can accept arguments like lambda*) applied from the message-body of message." (call-with-message message (lambda* arglist body ...))) -(define (msg-val message) +(define (mbody-val message) "Retrieve the first value from the message-body of message. Like single value return from a procedure call. Probably the most common case when waiting on a reply from some action invocation." @@ -689,31 +752,31 @@ common case when waiting on a reply from some action invocation." ;; TODO: move send-message and friends here...? -(define* (create-actor from-actor actor-class #:rest init) +(define* (create-actor from-actor actor-class #:rest init-args) "Create an instance of actor-class. Return the new actor's id. This is the method actors should call directly (unless they want to supply an id-cookie, in which case they should use create-actor*)." (%hive-create-actor (actor-hive from-actor) actor-class - init #f)) + init-args #f #t)) -(define* (create-actor* from-actor actor-class id-cookie #:rest init) +(define* (create-actor* from-actor actor-class id-cookie #:rest init-args) "Create an instance of actor-class. Return the new actor's id. Like create-actor, but permits supplying an id-cookie." (%hive-create-actor (actor-hive from-actor) actor-class - init id-cookie)) + init-args id-cookie #t)) -(define* (self-destruct actor #:key (clean-up #t)) +(define* (self-destruct actor #:key (cleanup #t)) "Remove an actor from the hive. -Unless #:clean-up is set to #f, this will first have the actor handle -its '*clean-up* action handler." - (when clean-up - (<-wait actor (actor-id actor) '*clean-up*)) +Unless #:cleanup is set to #f, this will first have the actor handle +its '*cleanup* action handler." + (when cleanup + (<-wait (actor-id actor) '*cleanup*)) (hash-remove! (hive-actor-registry (actor-hive actor)) (actor-id actor))) @@ -723,29 +786,46 @@ its '*clean-up* action handler." ;;; ========================= (define* (run-hive hive initial-tasks - #:key (clean-up #t)) - "Start up an agenda and run HIVE in it with INITIAL-TASKS." + #:key (cleanup #t) + (handle-signals (list SIGINT SIGTERM))) + "Start up an agenda and run HIVE in it with INITIAL-TASKS. + +Keyword arguments: + - #:cleanup: Whether to run *cleanup* on all actors. + - #:handle-sigactions: a list of signals to set up interrupt + handlers for, so cleanup sill still happen as expected. + Defaults to a list of SIGINT and SIGTERM." (dynamic-wind (const #f) (lambda () - (let* ((queue (list->q initial-tasks)) - (agenda (make-agenda #:pre-unwind-handler print-error-and-continue - #:queue queue))) - (start-agenda agenda))) - ;; Run clean-up + (define (run-it escape) + (define (handle-signal signum) + (restore-signals) + (escape signum)) + (for-each (lambda (signum) + (sigaction signum handle-signal)) + handle-signals) + (let* ((queue (list->q + (cons (bootstrap-message hive (actor-id hive) '*init-all*) + initial-tasks))) + (agenda (make-agenda #:pre-unwind-handler print-error-and-continue + #:queue queue))) + (run-agenda agenda))) + (call/ec run-it)) + ;; Run cleanup (lambda () - (when clean-up - (run-hive-clean-up hive))))) + (when cleanup + (run-hive-cleanup hive))))) -(define (run-hive-clean-up hive) +(define (run-hive-cleanup hive) (let ((queue (list->q (list (bootstrap-message hive (actor-id hive) - '*clean-up-all*))))) - (start-agenda + '*cleanup-all*))))) + (run-agenda (make-agenda #:queue queue)))) (define (bootstrap-message hive to-id action . message-body-args) (wrap - (apply <- hive to-id action message-body-args))) + (apply <-* `(#:actor ,hive) to-id action message-body-args)))