From f979fa5f089a1294bb49b1250d41a20248dbd8b9 Mon Sep 17 00:00:00 2001
From: Sam Anthony <sam@samanthony.xyz>
Date: Fri, 15 Nov 2024 11:48:12 -0500
Subject: reliable multicast: receive()

---
 src/main/java/derms/net/rmulticast/Receive.java           | 5 ++++-
 src/main/java/derms/net/rmulticast/ReliableMulticast.java | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/main/java/derms/net')

diff --git a/src/main/java/derms/net/rmulticast/Receive.java b/src/main/java/derms/net/rmulticast/Receive.java
index c8467c2..c1965ed 100644
--- a/src/main/java/derms/net/rmulticast/Receive.java
+++ b/src/main/java/derms/net/rmulticast/Receive.java
@@ -18,14 +18,16 @@ class Receive<T extends Serializable & Hashable> implements Runnable {
     private final Set<MessageID> negativeAcks;
     private final ReceivedSet<T> received;
     private final BlockingQueue<Message<T>> retransmissions;
+    private final BlockingQueue<Message<T>> delivered;
     private final Logger log;
 
-    Receive(ConcurrentMulticastSocket inSock, Set<MessageID> positiveAcks, Set<MessageID> negativeAcks, ReceivedSet<T> received, BlockingQueue<Message<T>> retransmissions) {
+    Receive(ConcurrentMulticastSocket inSock, Set<MessageID> positiveAcks, Set<MessageID> negativeAcks, ReceivedSet<T> received, BlockingQueue<Message<T>> retransmissions, BlockingQueue<Message<T>> delivered) {
         this.inSock = inSock;
         this.positiveAcks = positiveAcks;
         this.negativeAcks = negativeAcks;
         this.received = received;
         this.retransmissions = retransmissions;
+        this.delivered = delivered;
         this.log = Logger.getLogger(this.getClass().getName());
     }
 
@@ -47,6 +49,7 @@ class Receive<T extends Serializable & Hashable> implements Runnable {
     private void receive(Message<T> msg) {
         positiveAcks.add(msg.id());
         received.add(msg);
+        delivered.add(msg);
 
         negativeAcks.remove(msg.id());
         retransmissions.remove(msg);
diff --git a/src/main/java/derms/net/rmulticast/ReliableMulticast.java b/src/main/java/derms/net/rmulticast/ReliableMulticast.java
index 44fc10c..600b536 100644
--- a/src/main/java/derms/net/rmulticast/ReliableMulticast.java
+++ b/src/main/java/derms/net/rmulticast/ReliableMulticast.java
@@ -48,7 +48,7 @@ public class ReliableMulticast<T extends Serializable & Hashable> {
 
         this.log = Logger.getLogger(this.getClass().getName());
 
-        (new Thread(new Receive<T>(inSock, positiveAcks, negativeAcks, received, retransmissions))).start();
+        (new Thread(new Receive<T>(inSock, positiveAcks, negativeAcks, received, retransmissions, delivered))).start();
         (new Thread(new Retransmit<T>(retransmissions, outSock, group))).start();
     }
 
@@ -64,4 +64,9 @@ public class ReliableMulticast<T extends Serializable & Hashable> {
         (new Thread(new Timeout<T>(msg, positiveAcks, retransmissions))).start();
         lastSend.set(Instant.now());
     }
+
+    public T receive() throws InterruptedException {
+        Message<T> msg = delivered.take();
+        return msg.payload;
+    }
 }
-- 
cgit v1.2.3