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

Prepend webrtc ns to StrJoin calls in dcsctp ns

Browse Source 
Bug: webrtc:365299886
Change-Id: I4eb87a2b116c3e18b1a84865fab0a22a6084912c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361980
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Dor Hen <dorhen@meta.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42980}
This commit is contained in:
Dor Hen 2024-09-08 18:02:37 +03:00 committed by WebRTC LUCI CQ
parent 26146bbce0
commit 65b59a9c2d
6 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/dcsctp/packet/chunk/sack_chunk.cc
View File

@ -145,8 +145,8 @@ std::string SackChunk::ToString() const {
} }
if (!duplicate_tsns_.empty()) { if (!duplicate_tsns_.empty()) {
sb << ", dup_tsns=" sb << ", dup_tsns="
<< StrJoin(duplicate_tsns(), ",", << webrtc::StrJoin(duplicate_tsns(), ",",
[](rtc::StringBuilder& sb, TSN tsn) { sb << *tsn; }); [](rtc::StringBuilder& sb, TSN tsn) { sb << *tsn; });
} }
return sb.Release(); return sb.Release();

16
net/dcsctp/rx/reassembly_queue.cc
View File

@ -115,10 +115,9 @@ void ReassemblyQueue::Add(TSN tsn, Data data) {
void ReassemblyQueue::ResetStreamsAndLeaveDeferredReset( void ReassemblyQueue::ResetStreamsAndLeaveDeferredReset(
rtc::ArrayView<const StreamID> stream_ids) { rtc::ArrayView<const StreamID> stream_ids) {
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Resetting streams: [" RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Resetting streams: ["
<< StrJoin(stream_ids, ",", << webrtc::StrJoin(stream_ids, ",",
[](rtc::StringBuilder& sb, StreamID sid) { [](rtc::StringBuilder& sb,
sb << *sid; StreamID sid) { sb << *sid; })
})
<< "]"; << "]";
// https://tools.ietf.org/html/rfc6525#section-5.2.2 // https://tools.ietf.org/html/rfc6525#section-5.2.2
@ -169,10 +168,11 @@ void ReassemblyQueue::AddReassembledMessage(
rtc::ArrayView<const UnwrappedTSN> tsns, rtc::ArrayView<const UnwrappedTSN> tsns,
DcSctpMessage message) { DcSctpMessage message) {
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Assembled message from TSN=[" RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Assembled message from TSN=["
<< StrJoin(tsns, ",", << webrtc::StrJoin(
[](rtc::StringBuilder& sb, UnwrappedTSN tsn) { tsns, ",",
sb << *tsn.Wrap(); [](rtc::StringBuilder& sb, UnwrappedTSN tsn) {
}) sb << *tsn.Wrap();
})
<< "], message; stream_id=" << *message.stream_id() << "], message; stream_id=" << *message.stream_id()
<< ", ppid=" << *message.ppid() << ", ppid=" << *message.ppid()
<< ", payload=" << message.payload().size() << " bytes"; << ", payload=" << message.payload().size() << " bytes";

24
net/dcsctp/socket/stream_reset_handler.cc
View File

@ -261,10 +261,10 @@ void StreamResetHandler::HandleResponse(const ParameterDescriptor& descriptor) {
RTC_DLOG(LS_VERBOSE) RTC_DLOG(LS_VERBOSE)
<< log_prefix_ << "Reset stream success, req_seq_nbr=" << log_prefix_ << "Reset stream success, req_seq_nbr="
<< *current_request_->req_seq_nbr() << ", streams=" << *current_request_->req_seq_nbr() << ", streams="
<< StrJoin(current_request_->streams(), ",", << webrtc::StrJoin(current_request_->streams(), ",",
[](rtc::StringBuilder& sb, StreamID stream_id) { [](rtc::StringBuilder& sb, StreamID stream_id) {
sb << *stream_id; sb << *stream_id;
}); });
ctx_->callbacks().OnStreamsResetPerformed(current_request_->streams()); ctx_->callbacks().OnStreamsResetPerformed(current_request_->streams());
current_request_ = std::nullopt; current_request_ = std::nullopt;
retransmission_queue_->CommitResetStreams(); retransmission_queue_->CommitResetStreams();
@ -273,10 +273,10 @@ void StreamResetHandler::HandleResponse(const ParameterDescriptor& descriptor) {
RTC_DLOG(LS_VERBOSE) RTC_DLOG(LS_VERBOSE)
<< log_prefix_ << "Reset stream still pending, req_seq_nbr=" << log_prefix_ << "Reset stream still pending, req_seq_nbr="
<< *current_request_->req_seq_nbr() << ", streams=" << *current_request_->req_seq_nbr() << ", streams="
<< StrJoin(current_request_->streams(), ",", << webrtc::StrJoin(current_request_->streams(), ",",
[](rtc::StringBuilder& sb, StreamID stream_id) { [](rtc::StringBuilder& sb, StreamID stream_id) {
sb << *stream_id; sb << *stream_id;
}); });
// Force this request to be sent again, but with new req_seq_nbr. // Force this request to be sent again, but with new req_seq_nbr.
current_request_->PrepareRetransmission(); current_request_->PrepareRetransmission();
reconfig_timer_->set_duration(ctx_->current_rto()); reconfig_timer_->set_duration(ctx_->current_rto());
@ -290,10 +290,10 @@ void StreamResetHandler::HandleResponse(const ParameterDescriptor& descriptor) {
<< log_prefix_ << "Reset stream error=" << ToString(resp->result()) << log_prefix_ << "Reset stream error=" << ToString(resp->result())
<< ", req_seq_nbr=" << *current_request_->req_seq_nbr() << ", req_seq_nbr=" << *current_request_->req_seq_nbr()
<< ", streams=" << ", streams="
<< StrJoin(current_request_->streams(), ",", << webrtc::StrJoin(current_request_->streams(), ",",
[](rtc::StringBuilder& sb, StreamID stream_id) { [](rtc::StringBuilder& sb, StreamID stream_id) {
sb << *stream_id; sb << *stream_id;
}); });
ctx_->callbacks().OnStreamsResetFailed(current_request_->streams(), ctx_->callbacks().OnStreamsResetFailed(current_request_->streams(),
ToString(resp->result())); ToString(resp->result()));
current_request_ = std::nullopt; current_request_ = std::nullopt;

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

@ -430,11 +430,11 @@ RetransmissionQueue::GetChunksForFastRetransmit(size_t bytes_in_packet) {
rtx_bytes_count_ += bytes_retransmitted; rtx_bytes_count_ += bytes_retransmitted;
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Fast-retransmitting TSN " RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Fast-retransmitting TSN "
<< StrJoin(to_be_sent, ",", << webrtc::StrJoin(to_be_sent, ",",
[&](rtc::StringBuilder& sb, [&](rtc::StringBuilder& sb,
const std::pair<TSN, Data>& c) { const std::pair<TSN, Data>& c) {
sb << *c.first; sb << *c.first;
}) })
<< " - " << bytes_retransmitted << " - " << bytes_retransmitted
<< " bytes. unacked_bytes=" << unacked_bytes() << " (" << " bytes. unacked_bytes=" << unacked_bytes() << " ("
<< old_unacked_bytes << ")"; << old_unacked_bytes << ")";
@ -511,11 +511,11 @@ std::vector<std::pair<TSN, Data>> RetransmissionQueue::GetChunksToSend(
t3_rtx_.Start(); t3_rtx_.Start();
} }
RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Sending TSN " RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Sending TSN "
<< StrJoin(to_be_sent, ",", << webrtc::StrJoin(to_be_sent, ",",
[&](rtc::StringBuilder& sb, [&](rtc::StringBuilder& sb,
const std::pair<TSN, Data>& c) { const std::pair<TSN, Data>& c) {
sb << *c.first; sb << *c.first;
}) })
<< " - " << " - "
<< absl::c_accumulate( << absl::c_accumulate(
to_be_sent, 0, to_be_sent, 0,

5
net/dcsctp/tx/rr_send_queue.cc
View File

@ -84,9 +84,10 @@ bool RRSendQueue::IsConsistent() const {
if (expected_active_streams != actual_active_streams) { if (expected_active_streams != actual_active_streams) {
auto fn = [&](rtc::StringBuilder& sb, const auto& p) { sb << *p; }; auto fn = [&](rtc::StringBuilder& sb, const auto& p) { sb << *p; };
RTC_DLOG(LS_ERROR) << "Active streams mismatch, is=[" RTC_DLOG(LS_ERROR) << "Active streams mismatch, is=["
<< StrJoin(actual_active_streams, ",", fn) << webrtc::StrJoin(actual_active_streams, ",", fn)
<< "], expected=[" << "], expected=["
<< StrJoin(expected_active_streams, ",", fn) << "]"; << webrtc::StrJoin(expected_active_streams, ",", fn)
<< "]";
return false; return false;
} }

11
net/dcsctp/tx/stream_scheduler.cc
View File

@ -42,11 +42,12 @@ std::optional<SendQueue::DataToSend> StreamScheduler::Produce(
RTC_DLOG(LS_VERBOSE) << log_prefix_ RTC_DLOG(LS_VERBOSE) << log_prefix_
<< "Producing data, rescheduling=" << rescheduling << "Producing data, rescheduling=" << rescheduling
<< ", active=" << ", active="
<< StrJoin(active_streams_, ", ", << webrtc::StrJoin(
[&](rtc::StringBuilder& sb, const auto& p) { active_streams_, ", ",
sb << *p->stream_id() << "@" [&](rtc::StringBuilder& sb, const auto& p) {
<< *p->next_finish_time(); sb << *p->stream_id() << "@"
}); << *p->next_finish_time();
});
RTC_DCHECK(rescheduling || current_stream_ != nullptr); RTC_DCHECK(rescheduling || current_stream_ != nullptr);