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

Adds tracking of outstanding bytes in SendTimeHistory.

Browse Source 
This saves having to iterate trough all packets in flight to compute the
number of outstanding bytes.

Bug: webrtc:8415
Change-Id: I35b135f37649a38b44a36d300af42a815f85192d
Reviewed-on: https://webrtc-review.googlesource.com/77727
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23398}
This commit is contained in:
Sebastian Jansson 2018-05-24 16:33:02 +02:00 committed by Commit Bot
parent 51e23aed9e
commit 1388b30661
2 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
modules/congestion_controller/rtp/send_time_history.cc
View File

@ -32,6 +32,7 @@ void SendTimeHistory::AddAndRemoveOld(const PacketFeedback& packet) {
now_ms - history_.begin()->second.creation_time_ms >
packet_age_limit_ms_) {
// TODO(sprang): Warn if erasing (too many) old items?
RemovePacketBytes(history_.begin()->second);
history_.erase(history_.begin());
}
@ -40,6 +41,8 @@ void SendTimeHistory::AddAndRemoveOld(const PacketFeedback& packet) {
PacketFeedback packet_copy = packet;
packet_copy.long_sequence_number = unwrapped_seq_num;
history_.insert(std::make_pair(unwrapped_seq_num, packet_copy));
if (packet.send_time_ms >= 0)
AddPacketBytes(packet_copy);
}
bool SendTimeHistory::OnSentPacket(uint16_t sequence_number,
@ -48,7 +51,10 @@ bool SendTimeHistory::OnSentPacket(uint16_t sequence_number,
auto it = history_.find(unwrapped_seq_num);
if (it == history_.end())
return false;
bool packet_retransmit = it->second.send_time_ms >= 0;
it->second.send_time_ms = send_time_ms;
if (!packet_retransmit)
AddPacketBytes(it->second);
return true;
}
@ -68,9 +74,8 @@ bool SendTimeHistory::GetFeedback(PacketFeedback* packet_feedback,
RTC_DCHECK(packet_feedback);
int64_t unwrapped_seq_num =
seq_num_unwrapper_.Unwrap(packet_feedback->sequence_number);
latest_acked_seq_num_.emplace(
std::max(unwrapped_seq_num, latest_acked_seq_num_.value_or(0)));
RTC_DCHECK_GE(*latest_acked_seq_num_, 0);
UpdateAckedSeqNum(unwrapped_seq_num);
RTC_DCHECK_GE(*last_ack_seq_num_, 0);
auto it = history_.find(unwrapped_seq_num);
if (it == history_.end())
return false;
@ -87,19 +92,51 @@ bool SendTimeHistory::GetFeedback(PacketFeedback* packet_feedback,
size_t SendTimeHistory::GetOutstandingBytes(uint16_t local_net_id,
uint16_t remote_net_id) const {
size_t outstanding_bytes = 0;
auto unacked_it = history_.begin();
if (latest_acked_seq_num_) {
unacked_it = history_.lower_bound(*latest_acked_seq_num_);
auto it = in_flight_bytes_.find({local_net_id, remote_net_id});
if (it != in_flight_bytes_.end()) {
return it->second;
} else {
return 0;
}
for (; unacked_it != history_.end(); ++unacked_it) {
if (unacked_it->second.local_net_id == local_net_id &&
unacked_it->second.remote_net_id == remote_net_id &&
unacked_it->second.send_time_ms >= 0) {
outstanding_bytes += unacked_it->second.payload_size;
}
}
return outstanding_bytes;
}
void SendTimeHistory::AddPacketBytes(const PacketFeedback& packet) {
if (packet.send_time_ms < 0 || packet.payload_size == 0 ||
(last_ack_seq_num_ && *last_ack_seq_num_ >= packet.long_sequence_number))
return;
auto it = in_flight_bytes_.find({packet.local_net_id, packet.remote_net_id});
if (it != in_flight_bytes_.end()) {
it->second += packet.payload_size;
} else {
in_flight_bytes_[{packet.local_net_id, packet.remote_net_id}] =
packet.payload_size;
}
}
void SendTimeHistory::RemovePacketBytes(const PacketFeedback& packet) {
if (packet.send_time_ms < 0 || packet.payload_size == 0 ||
(last_ack_seq_num_ && *last_ack_seq_num_ >= packet.long_sequence_number))
return;
auto it = in_flight_bytes_.find({packet.local_net_id, packet.remote_net_id});
if (it != in_flight_bytes_.end()) {
it->second -= packet.payload_size;
if (it->second == 0)
in_flight_bytes_.erase(it);
}
}
void SendTimeHistory::UpdateAckedSeqNum(int64_t acked_seq_num) {
if (last_ack_seq_num_ && *last_ack_seq_num_ >= acked_seq_num)
return;
auto unacked_it = history_.begin();
if (last_ack_seq_num_)
unacked_it = history_.lower_bound(*last_ack_seq_num_);
auto newly_acked_end = history_.upper_bound(acked_seq_num);
for (; unacked_it != newly_acked_end; ++unacked_it) {
RemovePacketBytes(unacked_it->second);
}
last_ack_seq_num_.emplace(acked_seq_num);
}
} // namespace webrtc

9
modules/congestion_controller/rtp/send_time_history.h
View File

@ -12,6 +12,7 @@
#define MODULES_CONGESTION_CONTROLLER_RTP_SEND_TIME_HISTORY_H_
#include <map>
#include <utility>
#include "modules/include/module_common_types.h"
#include "rtc_base/constructormagic.h"
@ -44,11 +45,17 @@ class SendTimeHistory {
uint16_t remote_net_id) const;
private:
using RemoteAndLocalNetworkId = std::pair<uint16_t, uint16_t>;
void AddPacketBytes(const PacketFeedback& packet);
void RemovePacketBytes(const PacketFeedback& packet);
void UpdateAckedSeqNum(int64_t acked_seq_num);
const Clock* const clock_;
const int64_t packet_age_limit_ms_;
SequenceNumberUnwrapper seq_num_unwrapper_;
std::map<int64_t, PacketFeedback> history_;
rtc::Optional<int64_t> latest_acked_seq_num_;
rtc::Optional<int64_t> last_ack_seq_num_;
std::map<RemoteAndLocalNetworkId, size_t> in_flight_bytes_;
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SendTimeHistory);
};