Update to use sequence-actions instead of extend-transition.

This commit is contained in:
Tony Garnock-Jones 2012-07-04 16:28:44 -04:00
parent 81cce62cf0
commit 43d5fb9231
2 changed files with 12 additions and 12 deletions

View File

@ -253,7 +253,7 @@
[(answered-question (== subq) ans) [(answered-question (== subq) ans)
(define ips (define ips
(map make-dns-address (set->list (extract-addresses current-name ans)))) (map make-dns-address (set->list (extract-addresses current-name ans))))
(extend-transition (sequence-actions
(try-next-server (struct-copy network-query-state w (try-next-server (struct-copy network-query-state w
[known-addresses (hash-set known-addresses [known-addresses (hash-set known-addresses
current-name current-name
@ -267,11 +267,11 @@
(role rpc-id (topic-subscriber `(reply ,rpc-id ,(wild))) (role rpc-id (topic-subscriber `(reply ,rpc-id ,(wild)))
#:state w #:state w
[`(reply ,(== rpc-id) ,id) [`(reply ,(== rpc-id) ,id)
(extend-transition (send-request (struct-copy network-query-state w (sequence-actions (send-request (struct-copy network-query-state w
[remaining-addresses remaining-ips]) [remaining-addresses remaining-ips])
id id
timeout timeout
current-ip) current-ip)
(delete-role rpc-id))]))])) (delete-role rpc-id))]))]))
(define (on-answer w ans server-ip) (define (on-answer w ans server-ip)
@ -318,7 +318,7 @@
q query-id q query-id
zone-origin server-ip zone-origin server-ip
timeout)) timeout))
(extend-transition (try-next-server w) (sequence-actions (try-next-server w)
(delete-role subscription-id) (delete-role subscription-id)
(send-message (list 'release-query-id query-id)))] (send-message (list 'release-query-id query-id)))]
[(dns-reply reply-message source (== s)) [(dns-reply reply-message source (== s))
@ -333,8 +333,8 @@
(dns-message-additional reply-message))) (dns-message-additional reply-message)))
(if (not (= (dns-message-id reply-message) (dns-message-id query))) (if (not (= (dns-message-id reply-message) (dns-message-id query)))
w w
(extend-transition (on-answer w (sequence-actions (on-answer w
(filter-dns-reply q reply-message zone-origin) (filter-dns-reply q reply-message zone-origin)
server-ip) server-ip)
(delete-role subscription-id) (delete-role subscription-id)
(send-message (list 'release-query-id query-id))))]))) (send-message (list 'release-query-id query-id))))])))

View File

@ -162,7 +162,7 @@
(match-define (cons name ttl) timerspec) (match-define (cons name ttl) timerspec)
(send-message (set-timer (list 'check-dns-expiry name) (* ttl 1000) 'relative))))) (send-message (set-timer (list 'check-dns-expiry name) (* ttl 1000) 'relative)))))
(define-values (cleaned-seed-zone initial-timers) (zone-expire seed-zone)) (define-values (cleaned-seed-zone initial-timers) (zone-expire seed-zone))
(extend-transition (transition-and-set-timers cleaned-seed-zone initial-timers) (sequence-actions (transition-and-set-timers cleaned-seed-zone initial-timers)
;; TODO: consider deduping questions here too? ;; TODO: consider deduping questions here too?
(role 'debug-dumper (topic-subscriber `(debug-dump)) (role 'debug-dumper (topic-subscriber `(debug-dump))
#:state zone #:state zone
@ -271,7 +271,7 @@
k (hash-ref new-zone k 'missing)))) k (hash-ref new-zone k 'missing))))
(log-debug "=-=-=-=-=-=")) (log-debug "=-=-=-=-=-="))
(define nameserver-names (for/set ([rr nameserver-rrs]) (rr-rdata rr))) (define nameserver-names (for/set ([rr nameserver-rrs]) (rr-rdata rr)))
(extend-transition (sequence-actions
(retry-question (struct-copy question-state w (retry-question (struct-copy question-state w
[nameservers-tried (set-union nameservers-tried [nameservers-tried (set-union nameservers-tried
nameserver-names)] nameserver-names)]