summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_sent_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_sent_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_sent_packet_manager.cc')
-rw-r--r--net/quic/quic_sent_packet_manager.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/quic/quic_sent_packet_manager.cc b/net/quic/quic_sent_packet_manager.cc
index 34bb972..c1811cf 100644
--- a/net/quic/quic_sent_packet_manager.cc
+++ b/net/quic/quic_sent_packet_manager.cc
@@ -598,8 +598,8 @@ bool QuicSentPacketManager::OnPacketSent(
// Since FEC packets should also be counted towards the congestion window,
// consider them as retransmittable for the purposes of congestion control.
HasRetransmittableData has_congestion_controlled_data =
- serialized_packet->packet->is_fec_packet() ?
- HAS_RETRANSMITTABLE_DATA : has_retransmittable_data;
+ serialized_packet->is_fec_packet ? HAS_RETRANSMITTABLE_DATA
+ : has_retransmittable_data;
const bool in_flight =
send_algorithm_->OnPacketSent(sent_time,
unacked_packets_.bytes_in_flight(),