summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_received_packet_manager.cc
diff options
context:
space:
mode:
authorrtenneti <rtenneti@chromium.org>2015-02-07 04:35:12 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-07 12:35:56 +0000
commitca5ac274170dd281e90a4d9a42aed11dfb60962d (patch)
treeb1e3335e6bb743d9b7deb6eaaa36f0b30d00c271 /net/quic/quic_received_packet_manager.cc
parent3cfec3142d8b6dbb1cecb03125aa81bbbcda6500 (diff)
downloadchromium_src-ca5ac274170dd281e90a4d9a42aed11dfb60962d.zip
chromium_src-ca5ac274170dd281e90a4d9a42aed11dfb60962d.tar.gz
chromium_src-ca5ac274170dd281e90a4d9a42aed11dfb60962d.tar.bz2
Landing Recent QUIC Changes.
Track the number of "early" frames received in a QUIC stream. This will help measure the amount of head of line blocking of the headers stream that QUIC sees. Merge internal change: 85643187 https://codereview.chromium.org/893323004/ Remove QUIC's ReceiveAlgorithmInterface now that it does nothing. No functionality change. Merge internal change: 85621906 https://codereview.chromium.org/908673002/ Fixing a bug where 0-round-trip connection establishment was conflated with zero-second-round-trip-time in faster. Chromium side change is only a comment change. Merge internal change: 85554888 https://codereview.chromium.org/904993004/ Remove FLAGS_quic_allow_silent_close. Merge internal change: 85387940 https://codereview.chromium.org/902243003/ Keep an instance of QuicAckFrame in QuicConnection in order to reduce memory allocations. Saves 1.5% of the CPU according to profiles. May be slightly more on clients. Merge internal change: 85351635 https://codereview.chromium.org/876313009/ Fix compile errors introduced when editing QuicFramerTest during the presubmit. Merge internal change: 85182632 https://codereview.chromium.org/905033002/ Move is_fec_packet from QuicPacket to SerializedPacket in order to allow QuicSerializedPacket to contain a QuicEncryptedPacket instead in a future CL. Merge internal change: 85181879 https://codereview.chromium.org/887243005/ R=rch@chromium.org Review URL: https://codereview.chromium.org/908493004 Cr-Commit-Position: refs/heads/master@{#315200}
Diffstat (limited to 'net/quic/quic_received_packet_manager.cc')
-rw-r--r--net/quic/quic_received_packet_manager.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/quic/quic_received_packet_manager.cc b/net/quic/quic_received_packet_manager.cc
index 38ceec6..f5e2c36 100644
--- a/net/quic/quic_received_packet_manager.cc
+++ b/net/quic/quic_received_packet_manager.cc
@@ -135,7 +135,6 @@ AdvanceFirstGapAndGarbageCollectEntropyMap() {
QuicReceivedPacketManager::QuicReceivedPacketManager(QuicConnectionStats* stats)
: peer_least_packet_awaiting_ack_(0),
time_largest_observed_(QuicTime::Zero()),
- receive_algorithm_(ReceiveAlgorithmInterface::Create()),
stats_(stats) {
ack_frame_.largest_observed = 0;
ack_frame_.entropy_hash = 0;
@@ -178,9 +177,6 @@ void QuicReceivedPacketManager::RecordPacketReceived(
entropy_tracker_.RecordPacketEntropyHash(sequence_number,
header.entropy_hash);
- receive_algorithm_->RecordIncomingPacket(
- bytes, sequence_number, receipt_time);
-
received_packet_times_.push_back(
std::make_pair(sequence_number, receipt_time));
@@ -237,8 +233,8 @@ void QuicReceivedPacketManager::UpdateReceivedPacketInfo(
// Remove all packets that are too far from largest_observed to express.
received_packet_times_.remove_if(isTooLarge(ack_frame_.largest_observed));
- ack_frame->received_packet_times = received_packet_times_;
- received_packet_times_.clear();
+ ack_frame->received_packet_times.clear();
+ ack_frame->received_packet_times.swap(received_packet_times_);
}
QuicPacketEntropyHash QuicReceivedPacketManager::EntropyHash(