From 7bb853f54902bfecea82f510badac7171e9aaa58 Mon Sep 17 00:00:00 2001 From: Victor Boivie Date: Fri, 22 Oct 2021 23:31:15 +0200 Subject: [PATCH] dcsctp: Remove debug-log-only TSN collection A vector of which TSNs that were acked for each received SACK was created, but only used in debug logs, which aren't enabled by default. Removing them, as they don't add that much value and cost a bit of performance. Bug: webrtc:12943 Change-Id: Ice323cf46ca6e469fbbcf2a268ad67ca883bb2f5 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/235985 Commit-Queue: Victor Boivie Reviewed-by: Florent Castelli Cr-Commit-Position: refs/heads/main@{#35265} --- net/dcsctp/tx/retransmission_queue.cc | 9 ++------- net/dcsctp/tx/retransmission_queue.h | 3 --- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/net/dcsctp/tx/retransmission_queue.cc b/net/dcsctp/tx/retransmission_queue.cc index 00dfd562a0..8e25ec80a2 100644 --- a/net/dcsctp/tx/retransmission_queue.cc +++ b/net/dcsctp/tx/retransmission_queue.cc @@ -160,7 +160,6 @@ void RetransmissionQueue::AckChunk( if (!iter->second.is_acked()) { size_t serialized_size = GetSerializedChunkSize(iter->second.data()); ack_info.bytes_acked += serialized_size; - ack_info.acked_tsns.push_back(iter->first.Wrap()); if (iter->second.is_outstanding()) { outstanding_bytes_ -= serialized_size; --outstanding_items_; @@ -410,12 +409,8 @@ bool RetransmissionQueue::HandleSack(TimeMs now, const SackChunk& sack) { // Update of outstanding_data_ is now done. Congestion control remains. UpdateReceiverWindow(sack.a_rwnd()); - RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Received SACK. Acked TSN: " - << StrJoin(ack_info.acked_tsns, ",", - [](rtc::StringBuilder& sb, TSN tsn) { - sb << *tsn; - }) - << ", cum_tsn_ack=" << *cumulative_tsn_ack.Wrap() << " (" + RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Received SACK. cum_tsn_ack=" + << *cumulative_tsn_ack.Wrap() << " (" << *last_cumulative_tsn_ack_.Wrap() << "), outstanding_bytes=" << outstanding_bytes_ << " (" << old_outstanding_bytes << "), rwnd=" << rwnd_ << " (" diff --git a/net/dcsctp/tx/retransmission_queue.h b/net/dcsctp/tx/retransmission_queue.h index 943df48283..90b6430643 100644 --- a/net/dcsctp/tx/retransmission_queue.h +++ b/net/dcsctp/tx/retransmission_queue.h @@ -241,9 +241,6 @@ class RetransmissionQueue { explicit AckInfo(UnwrappedTSN cumulative_tsn_ack) : highest_tsn_acked(cumulative_tsn_ack) {} - // All TSNs that have been acked (for the first time) in this SACK. - std::vector acked_tsns; - // Bytes acked by increasing cumulative_tsn_ack and gap_ack_blocks. size_t bytes_acked = 0;