From a9600b0de822b24ef0e77022718c1e6bce03204d Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonygarnockjones@gmail.com>
Date: Sat, 5 Dec 2015 06:23:28 +1300
Subject: [PATCH] Use newly-refactored mux in endpoint implementation

---
 prospect/endpoint.rkt | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/prospect/endpoint.rkt b/prospect/endpoint.rkt
index ba9f23c..c655c8d 100644
--- a/prospect/endpoint.rkt
+++ b/prospect/endpoint.rkt
@@ -25,9 +25,7 @@
 ;; An EID is a Nat.
 
 ;; Endpoint-group private states
-(struct endpoint-group (next-eid ;; EID
-                        routing-table ;; (Matcherof (Setof EID))
-                        interests ;; (HashTable EID Matcher)
+(struct endpoint-group (mux ;; Mux
                         endpoints ;; (HashTable EID Endpoint)
                         state ;; Any
                         )
@@ -47,9 +45,7 @@
 (struct as-endpoint (eid action) #:prefab)
 
 (define (make-endpoint-group initial-state)
-  (endpoint-group 0
-                  (matcher-empty)
-                  (hash)
+  (endpoint-group (mux)
                   (hash)
                   initial-state))
 
@@ -76,16 +72,15 @@
 (define (inert-endpoint e state) #f)
 
 (define (endpoint-group-handle-event e g)
-  (match-define (endpoint-group _ routing-table interests endpoints state) g)
+  (match-define (endpoint-group m endpoints state) g)
   (define affected-eids
     (match e
       [#f (hash-keys endpoints)]
-      [(? patch?) (compute-affected-pids routing-table e)]
-      [(message body)
-       (tset->list (matcher-match-value routing-table (observe body) (datum-tset)))]))
+      [(? patch?) (compute-affected-pids (mux-routing-table m) e)]
+      [(message body) (mux-route-message m body)]))
   (sequence-handlers g (for/list [(eid (sort affected-eids <))]
                          (list (if (patch? e)
-                                   (view-patch e (hash-ref interests eid matcher-empty))
+                                   (view-patch e (mux-interests-of m eid))
                                    e)
                                eid
                                (hash-ref endpoints eid (lambda () inert-endpoint))))))
@@ -120,21 +115,11 @@
       (cons actions cumulative-patch)))
 
 (define (interpret-endpoint-patch cumulative-patch actions g eid p0)
-  (define old-interests (hash-ref (endpoint-group-interests g) eid matcher-empty))
-  (define old-routing-table (endpoint-group-routing-table g))
-  (define p (limit-patch (label-patch p0 (datum-tset eid)) old-interests))
-  (define p-aggregate (compute-aggregate-patch p eid old-routing-table))
-  (define new-interests (apply-patch old-interests p))
-  (define new-routing-table (apply-patch old-routing-table p))
+  (define-values (new-mux _eid p p-aggregate)
+    (mux-update-stream (endpoint-group-mux g) eid p0))
   (values (patch-seq cumulative-patch p-aggregate)
           actions
-          (struct-copy endpoint-group g
-                       [routing-table new-routing-table]
-                       [interests (if (matcher-empty? new-interests)
-                                      (hash-remove (endpoint-group-interests g) eid)
-                                      (hash-set (endpoint-group-interests g)
-                                                eid
-                                                new-interests))])))
+          (struct-copy endpoint-group g [mux new-mux])))
 
 (define (interpret-endpoint-action cumulative-patch actions g eid endpoint-action)
   (match endpoint-action
@@ -146,12 +131,13 @@
     [(? patch? p0)
      (interpret-endpoint-patch cumulative-patch actions g eid p0)]
     [(add-endpoint function)
-     (define new-eid (endpoint-group-next-eid g))
+     (define-values (new-mux new-eid _p _p-aggregate)
+       (mux-add-stream (endpoint-group-mux g) empty-patch))
      (define-values (new-ep initial-transition) (function new-eid (endpoint-group-state g)))
      (interpret-endpoint-actions cumulative-patch
                                  actions
                                  (struct-copy endpoint-group g
-                                              [next-eid (+ new-eid 1)]
+                                              [mux new-mux]
                                               [endpoints
                                                (hash-set (endpoint-group-endpoints g)
                                                          new-eid
@@ -183,11 +169,12 @@
                                endpoint-action)))
 
 (define (pretty-print-endpoint-group g [p (current-output-port)])
-  (match-define (endpoint-group _ routing-table interests endpoints state) g)
+  (match-define (endpoint-group m endpoints state) g)
   (fprintf p "ENDPOINT GROUP:\n")
   (fprintf p " ---- STATE:\n")
   (display (indented-port-output 6 (lambda (p) (prospect-pretty-print state p))) p)
   (newline p)
   (fprintf p " - ~a endpoints\n" (hash-count endpoints))
+  (fprintf p " - next eid: ~a\n" (mux-next-pid mux))
   (fprintf p " - routing table:\n")
-  (pretty-print-matcher routing-table p))
+  (pretty-print-matcher (mux-routing-table mux) p))