reliable multicast: prune received list

1 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/derms/net/rmulticast/ReliableMulticast.java b/src/main/java/derms/net/rmulticast/ReliableMulticast.java
index de07f39..0798e68 100644
--- a/src/main/java/derms/net/rmulticast/ReliableMulticast.java
+++ b/src/main/java/derms/net/rmulticast/ReliableMulticast.java
@@ -20,10 +20,11 @@ public class ReliableMulticast<T extends Serializable & Hashable> {
     private final InetAddress laddr; // Local address.
     private final Set<MessageID> positiveAcks; // Positively acknowledged messages.
     private final Set<MessageID> negativeAcks; // Negatively acknowledged messages.
+    private final ReceivedSet<T> received;
     private final BlockingQueue<Message<T>> retransmissions; // Messages pending retransmission.
-    private final AtomicReference<Instant> lastSend;
-    private final ConcurrentMulticastSocket outSock;
     private final Set<InetAddress> groupMembers;
+    private final ConcurrentMulticastSocket outSock;
+    private final AtomicReference<Instant> lastSend;
     private final BlockingQueue<Message<T>> delivered;
     private final Logger log;
 
@@ -33,23 +34,25 @@ public class ReliableMulticast<T extends Serializable & Hashable> {
 
         this.positiveAcks = new ConcurrentHashMap<MessageID, Void>().keySet();
         this.negativeAcks = new ConcurrentHashMap<MessageID, Void>().keySet();
+        this.received = new ReceivedSet<T>();
         this.retransmissions = new LinkedBlockingQueue<Message<T>>();
+        this.groupMembers = new ConcurrentHashMap<InetAddress, Void>().keySet();
         this.lastSend = new AtomicReference<Instant>(Instant.now());
 
         this.outSock = new ConcurrentMulticastSocket(group.getPort());
         this.outSock.joinGroup(group.getAddress());
 
-        this.groupMembers = new ConcurrentHashMap<InetAddress, Void>().keySet();
-
         this.delivered = new LinkedBlockingQueue<Message<T>>();
 
         this.log = Logger.getLogger(this.getClass().getName());
 
         ConcurrentMulticastSocket inSock = new ConcurrentMulticastSocket();
         inSock.joinGroup(group.getAddress());
-        (new Thread(new Receive<T>(inSock, positiveAcks, negativeAcks, retransmissions, groupMembers, delivered))).start();
+        (new Thread(new Receive<T>(inSock, positiveAcks, negativeAcks, received, retransmissions, groupMembers, delivered))).start();
 
         (new Thread(new Retransmit<T>(retransmissions, outSock, group))).start();
+
+        (new Thread(new Prune<T>(received, groupMembers))).start();
     }
 
     public void send(T payload) throws IOException {