projects
/
8sync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dispatching to websocket handlers
[8sync.git]
/
8sync
/
actors.scm
diff --git
a/8sync/actors.scm
b/8sync/actors.scm
index 869d4ad699a52f7b70ce5319352760dcd925c2b4..1b120ba77916e1e3f9bd08029cfa4398218a5e66 100644
(file)
--- a/
8sync/actors.scm
+++ b/
8sync/actors.scm
@@
-1,5
+1,5
@@
;;; 8sync --- Asynchronous programming for Guile
;;; 8sync --- Asynchronous programming for Guile
-;;; Copyright
(C) 2016
Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright
© 2016, 2017
Christopher Allan Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of 8sync.
;;;
;;;
;;; This file is part of 8sync.
;;;
@@
-233,8
+233,9
@@
(define (<-reply original-message . message-body-args)
"Reply to a message"
(define (<-reply original-message . message-body-args)
"Reply to a message"
- (send-message '() (%current-actor) (message-from original-message) '*reply*
- original-message #f message-body-args))
+ (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 (<-reply* send-options original-message . message-body-args)
"Like <-reply, but allows extra parameters via send-options"
@@
-243,7
+244,8
@@
(send-message send-options actor
(message-from original-message) '*reply*
original-message #f message-body-args))
(send-message send-options actor
(message-from original-message) '*reply*
original-message #f message-body-args))
- (apply really-send send-options))
+ (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!"
(define (<-auto-reply actor original-message)
"Auto-reply to a message. Internal use only!"
@@
-252,10
+254,12
@@
(define (<-reply-wait original-message . message-body-args)
"Reply to a messsage, but wait until we get a response"
(define (<-reply-wait original-message . message-body-args)
"Reply to a messsage, but wait until we get a response"
- (wait-maybe-handle-errors
- (send-message '() (%current-actor)
- (message-from original-message) '*reply*
- original-message #t 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)
(define (<-reply-wait* send-options original-message
. message-body-args)
@@
-267,7
+271,8
@@
(message-from original-message) '*reply*
original-message #t message-body-args)
send-options))
(message-from original-message) '*reply*
original-message #t message-body-args)
send-options))
- (apply really-send send-options))
+ (when (message-needs-reply? original-message)
+ (apply really-send send-options)))
(define* (wait-maybe-handle-errors message
#:key accept-errors
(define* (wait-maybe-handle-errors message
#:key accept-errors
@@
-334,6
+339,13
@@
to come after class definition."
#:allocation #:each-subclass
#:getter actor-message-handler)
#: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 init method is to do nothing.
;; This is the default, "simple" way to inherit and process messages.
(actions #:init-value (build-actions
;; Default init method is to do nothing.
@@
-439,10
+451,14
@@
to come after class definition."
(hash-map->list (lambda (actor-id actor) actor-id)
(hive-actor-registry hive)))
(for-each (lambda (actor-id)
(hash-map->list (lambda (actor-id actor) actor-id)
(hive-actor-registry hive)))
(for-each (lambda (actor-id)
- ;; @@: This could maybe just be <-, but we want actors
- ;; to be used to the expectation in all circumstances
- ;; that their init method is "waited on".
- (<-wait actor-id '*init*))
+ (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 <hive>) message)
actor-ids))
(define-method (hive-handle-failed-forward (hive <hive>) message)
@@
-679,11
+695,15
@@
that method for documentation."
(actor (apply make actor-class
#:hive hive
#:id actor-id
(actor (apply make actor-class
#:hive hive
#:id actor-id
- init-args)))
+ init-args))
+ (actor-should-init (slot-ref actor 'should-init)))
(hive-register-actor! hive actor)
(hive-register-actor! hive actor)
- ;; Wait on actor to init
- (when send-init?
- (<-wait actor-id '*init*))
+ ;; 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))
;; return the actor id
actor-id))