Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/cpp/rtps/writer/ReaderProxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ void ReaderProxy::start(
is_active_ = true;
reader_attributes_ = reader_attributes;

acked_changes_set(SequenceNumber_t()); // Simulate initial acknack to set low mark

timers_enabled_.store(is_remote_and_reliable());
initial_heartbeat_event_->restart_timer();

Expand Down Expand Up @@ -262,7 +264,8 @@ void ReaderProxy::acked_changes_set(
if (seq_num == SequenceNumber_t())
{
// Special case. Currently only used on Builtin StatefulWriters
// after losing lease duration.
// after losing lease duration, and on late joiners to set
// changes_low_mark_ to match that of the writer.
SequenceNumber_t min_sequence = writer_->get_seq_num_min();

if (min_sequence != SequenceNumber_t::unknown())
Expand Down Expand Up @@ -307,6 +310,10 @@ void ReaderProxy::acked_changes_set(
}
}
}
else if (!is_local_reader())
{
future_low_mark = writer_->next_sequence_number();
}
}

changes_low_mark_ = future_low_mark - 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ class StatefulWriter : public RTPSWriter
return SequenceNumber_t(0, 0);
}

SequenceNumber_t next_sequence_number() const
{
return mp_history->next_sequence_number();
}

private:

friend class ReaderProxy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ class WriterHistory
}
}

SequenceNumber_t next_sequence_number() const
{
return last_sequence_number_ + 1;
}

HistoryAttributes m_att;

private:
Expand Down