From 5a7cc1873ade99634726042d97a9d91d382867ad Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Fri, 15 Nov 2024 13:36:31 -0500 Subject: reliable multicast: rename positiveAcks to acks, negativeAcks to nacks --- src/main/java/derms/net/rmulticast/Receive.java | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/main/java/derms/net/rmulticast/Receive.java') diff --git a/src/main/java/derms/net/rmulticast/Receive.java b/src/main/java/derms/net/rmulticast/Receive.java index 93a56a8..f20f833 100644 --- a/src/main/java/derms/net/rmulticast/Receive.java +++ b/src/main/java/derms/net/rmulticast/Receive.java @@ -15,18 +15,18 @@ class Receive implements Runnable { private static final int bufSize = 8192; private final ConcurrentMulticastSocket inSock; - private final Set positiveAcks; - private final Set negativeAcks; - private final ReceivedSet received; + private final Set acks; + private final Set nacks; // Positively acknowledged messages. + private final ReceivedSet received; // Negatively acknowledged messages. private final BlockingQueue> retransmissions; private final Set groupMembers; private final BlockingQueue> delivered; private final Logger log; - Receive(ConcurrentMulticastSocket inSock, Set positiveAcks, Set negativeAcks, ReceivedSet received, BlockingQueue> retransmissions, Set groupMembers, BlockingQueue> delivered) { + Receive(ConcurrentMulticastSocket inSock, Set acks, Set nacks, ReceivedSet received, BlockingQueue> retransmissions, Set groupMembers, BlockingQueue> delivered) { this.inSock = inSock; - this.positiveAcks = positiveAcks; - this.negativeAcks = negativeAcks; + this.acks = acks; + this.nacks = nacks; this.received = received; this.retransmissions = retransmissions; this.groupMembers = groupMembers; @@ -50,26 +50,26 @@ class Receive implements Runnable { } private void receive(Message msg) { - positiveAcks.add(msg.id()); + acks.add(msg.id()); received.add(msg); delivered.add(msg); groupMembers.add(msg.sender); - negativeAcks.remove(msg.id()); + nacks.remove(msg.id()); retransmissions.remove(msg); - for (MessageID mid : msg.positiveAcks) { - positiveAcks.remove(mid); + for (MessageID mid : msg.acks) { + acks.remove(mid); if (!received.contains(mid)) - negativeAcks.add(mid); + nacks.add(mid); } - for (MessageID mid : msg.negativeAcks) { + for (MessageID mid : msg.nacks) { if (received.contains(mid)) { retransmissions.add(msg); } else { - negativeAcks.add(mid); + nacks.add(mid); } } } -- cgit v1.2.3