admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dcsctp: Refactor chunk acking

Browse Source 
The same code was done for both acking chunks due to moving the
cum-ack-tsn and when acking gap-ack-blocks. Unify them completely
to have a single code path.

Bug: webrtc:12943
Change-Id: I3b864e41cc2ec674460517660c23b72a70edf720
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/228521
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Victor Boivie <boivie@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34773}
This commit is contained in:
Victor Boivie 2021-08-11 23:02:23 +02:00 committed by WebRTC LUCI CQ
parent abf6188cba
commit d912446f52
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
net/dcsctp/tx/retransmission_queue.cc
View File

@ -113,15 +113,8 @@ void RetransmissionQueue::RemoveAcked(UnwrappedTSN cumulative_tsn_ack,
AckInfo& ack_info) {
auto first_unacked = outstanding_data_.upper_bound(cumulative_tsn_ack);
for (auto it = outstanding_data_.begin(); it != first_unacked; ++it) {
ack_info.bytes_acked_by_cumulative_tsn_ack += it->second.data().size();
ack_info.acked_tsns.push_back(it->first.Wrap());
if (it->second.is_outstanding()) {
outstanding_bytes_ -= GetSerializedChunkSize(it->second.data());
--outstanding_items_;
} else if (it->second.should_be_retransmitted()) {
to_be_retransmitted_.erase(it->first);
}
for (auto iter = outstanding_data_.begin(); iter != first_unacked; ++iter) {
AckChunk(ack_info, iter);
}
outstanding_data_.erase(outstanding_data_.begin(), first_unacked);
@ -142,25 +135,30 @@ void RetransmissionQueue::AckGapBlocks(
auto end = outstanding_data_.upper_bound(
UnwrappedTSN::AddTo(cumulative_tsn_ack, block.end));
for (auto iter = start; iter != end; ++iter) {
if (!iter->second.is_acked()) {
ack_info.bytes_acked_by_new_gap_ack_blocks +=
iter->second.data().size();
if (iter->second.is_outstanding()) {
outstanding_bytes_ -= GetSerializedChunkSize(iter->second.data());
--outstanding_items_;
}
if (iter->second.should_be_retransmitted()) {
to_be_retransmitted_.erase(iter->first);
}
iter->second.Ack();
ack_info.highest_tsn_acked =
std::max(ack_info.highest_tsn_acked, iter->first);
ack_info.acked_tsns.push_back(iter->first.Wrap());
}
AckChunk(ack_info, iter);
}
}
}
void RetransmissionQueue::AckChunk(
AckInfo& ack_info,
std::map<UnwrappedTSN, TxData>::iterator iter) {
if (!iter->second.is_acked()) {
ack_info.bytes_acked += iter->second.data().size();
ack_info.acked_tsns.push_back(iter->first.Wrap());
if (iter->second.is_outstanding()) {
outstanding_bytes_ -= GetSerializedChunkSize(iter->second.data());
--outstanding_items_;
}
if (iter->second.should_be_retransmitted()) {
to_be_retransmitted_.erase(iter->first);
}
iter->second.Ack();
ack_info.highest_tsn_acked =
std::max(ack_info.highest_tsn_acked, iter->first);
}
}
void RetransmissionQueue::NackBetweenAckBlocks(
UnwrappedTSN cumulative_tsn_ack,
rtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
@ -421,9 +419,8 @@ bool RetransmissionQueue::HandleSack(TimeMs now, const SackChunk& sack) {
// Note: It may be started again in a bit further down.
t3_rtx_.Stop();
HandleIncreasedCumulativeTsnAck(
old_outstanding_bytes, ack_info.bytes_acked_by_cumulative_tsn_ack +
ack_info.bytes_acked_by_new_gap_ack_blocks);
HandleIncreasedCumulativeTsnAck(old_outstanding_bytes,
ack_info.bytes_acked);
}
if (ack_info.has_packet_loss) {
@ -434,8 +431,7 @@ bool RetransmissionQueue::HandleSack(TimeMs now, const SackChunk& sack) {
// https://tools.ietf.org/html/rfc4960#section-8.2
// "When an outstanding TSN is acknowledged [...] the endpoint shall clear
// the error counter ..."
if (ack_info.bytes_acked_by_cumulative_tsn_ack > 0 ||
ack_info.bytes_acked_by_new_gap_ack_blocks > 0) {
if (ack_info.bytes_acked > 0) {
on_clear_retransmission_counter_();
}

12
net/dcsctp/tx/retransmission_queue.h
View File

@ -234,11 +234,8 @@ class RetransmissionQueue {
// All TSNs that have been acked (for the first time) in this SACK.
std::vector<TSN> acked_tsns;
// Bytes acked by increasing cumulative_tsn_ack in this SACK
size_t bytes_acked_by_cumulative_tsn_ack = 0;
// Bytes acked by gap blocks in this SACK.
size_t bytes_acked_by_new_gap_ack_blocks = 0;
// Bytes acked by increasing cumulative_tsn_ack and gap_ack_blocks.
size_t bytes_acked = 0;
// Indicates if this SACK indicates that packet loss has occurred. Just
// because a packet is missing in the SACK doesn't necessarily mean that
@ -289,6 +286,11 @@ class RetransmissionQueue {
rtc::ArrayView<const SackChunk::GapAckBlock> gap_ack_blocks,
AckInfo& ack_info);
// Acks the chunk referenced by `iter` and updates state in `ack_info` and the
// object's state.
void AckChunk(AckInfo& ack_info,
std::map<UnwrappedTSN, TxData>::iterator iter);
// Mark chunks reported as "missing", as "nacked" or "to be retransmitted"
// depending how many times this has happened. Only packets up until
// `ack_info.highest_tsn_acked` (highest TSN newly acknowledged) are