Clean up state loop

This commit is contained in:
Nicholas Kariniemi 2014-10-15 11:07:55 +03:00
parent f496fb51e5
commit dd5bf7a53a

View file

@ -59,15 +59,11 @@
(go (loop [shadow initial-shadow (go (loop [shadow initial-shadow
states (sync/new-state @state)] states (sync/new-state @state)]
(let [[v c] (a/alts! [new-states events] :priority true)] (let [[v c] (a/alts! [new-states events] :priority true)]
(when v (cond (nil? v) nil ;; drop out of loop
(cond (= c new-states) (= c new-states)
(let [current (sync/get-current-state states)] (do (when-not (= shadow v)
(when-not (= shadow v)
(>! >remote (diff-msg shadow v))) (>! >remote (diff-msg shadow v)))
(recur shadow (recur shadow (sync/add-history-state states v)))
(if (= v current)
states
(sync/add-history-state states v))))
(= c events) (= c events)
(let [event (assoc v (let [event (assoc v
:states states :states states
@ -79,7 +75,7 @@
(reset! state new-state))) (reset! state new-state)))
(when out-event (a/put! >remote out-event)) (when out-event (a/put! >remote out-event))
(recur (if new-shadow new-shadow shadow) (recur (if new-shadow new-shadow shadow)
(if new-states new-states states)))))))))) (if new-states new-states states)))))))))
(def make-server-agent (partial make-agent false)) (def make-server-agent (partial make-agent false))
(def make-client-agent (partial make-agent true)) (def make-client-agent (partial make-agent true))