niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always send HEARTBEAT following retransmit

Browse source 
The writer may well block at some point while retransmitting (and
certainly when retransmits are prioritised), and so there are two
reasons for sending a HEARTBEAT: one is that the reader needs it before
it can request more missing samples, the other is that the writer may
require a acknowledgement.

The change only affects the cases where the most recently transmitted
sample (there may be later ones currently being packed into a message)
had to be retransmitted.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-07-03 12:46:52 +02:00 • committed by eboasson
parent 5a4193ca37
commit 0ee65ecab0
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/ddsi/src/q_receive.c
View file

@ -724,7 +724,6 @@ static int handle_AckNack (struct receiver_state *rst, ddsrt_etime_t tnow, const
ddsi_guid_t src, dst; ddsi_guid_t src, dst;
seqno_t seqbase; seqno_t seqbase;
seqno_t seq_xmit; seqno_t seq_xmit;
seqno_t max_seq_available;
nn_count_t *countp; nn_count_t *countp;
struct nn_gap_info gi; struct nn_gap_info gi;
int accelerate_rexmit = 0; int accelerate_rexmit = 0;
@ -1054,13 +1053,7 @@ static int handle_AckNack (struct receiver_state *rst, ddsrt_etime_t tnow, const
wr->rexmit_count += msgs_sent; wr->rexmit_count += msgs_sent;
wr->rexmit_lost_count += msgs_lost; wr->rexmit_lost_count += msgs_lost;
/* If rexmits and/or a gap message were sent, and if the last if (msgs_sent)
sequence number that we're informing the NACK'ing peer about is
less than the last sequence number transmitted by the writer,
tell the peer to acknowledge quickly. Not sure if that helps, but
it might ... [NB writer->seq is the last msg sent so far] */
max_seq_available = (prd->filter ? rn->last_seq : seq_xmit);
if (msgs_sent && max_seq_in_reply < max_seq_available)
{ {
RSTTRACE (" rexmit#%"PRIu32" maxseq:%"PRId64"<%"PRId64"<=%"PRId64"", msgs_sent, max_seq_in_reply, seq_xmit, wr->seq); RSTTRACE (" rexmit#%"PRIu32" maxseq:%"PRId64"<%"PRId64"<=%"PRId64"", msgs_sent, max_seq_in_reply, seq_xmit, wr->seq);