Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(735)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/congestion_control/pacing_sender_test.cc

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/congestion_control/pacing_sender.cc ('k') | net/quic/congestion_control/prr_sender.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/congestion_control/pacing_sender_test.cc
diff --git a/net/quic/congestion_control/pacing_sender_test.cc b/net/quic/congestion_control/pacing_sender_test.cc
deleted file mode 100644
index 3c240e277bbb16aca29f74191912c301008172ec..0000000000000000000000000000000000000000
--- a/net/quic/congestion_control/pacing_sender_test.cc
+++ /dev/null
@@ -1,367 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/quic/congestion_control/pacing_sender.h"
-
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "net/quic/quic_protocol.h"
-#include "net/quic/test_tools/mock_clock.h"
-#include "net/quic/test_tools/quic_test_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using testing::Return;
-using testing::StrictMock;
-using testing::_;
-
-namespace net {
-namespace test {
-
-const QuicByteCount kBytesInFlight = 1024;
-const int kInitialBurstPackets = 10;
-
-class PacingSenderTest : public ::testing::Test {
- protected:
- PacingSenderTest()
- : zero_time_(QuicTime::Delta::Zero()),
- infinite_time_(QuicTime::Delta::Infinite()),
- sequence_number_(1),
- mock_sender_(new StrictMock<MockSendAlgorithm>()),
- pacing_sender_(new PacingSender(mock_sender_,
- QuicTime::Delta::FromMilliseconds(1),
- 0)) {
- // Pick arbitrary time.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(9));
- }
-
- ~PacingSenderTest() override {}
-
- void InitPacingRate(QuicPacketCount burst_size, QuicBandwidth bandwidth) {
- pacing_sender_.reset();
- mock_sender_ = new StrictMock<MockSendAlgorithm>();
- pacing_sender_.reset(new PacingSender(
- mock_sender_, QuicTime::Delta::FromMilliseconds(1), burst_size));
- EXPECT_CALL(*mock_sender_, PacingRate()).WillRepeatedly(Return(bandwidth));
- }
-
- void CheckPacketIsSentImmediately(HasRetransmittableData retransmittable_data,
- QuicByteCount bytes_in_flight) {
- // In order for the packet to be sendable, the underlying sender must
- // permit it to be sent immediately.
- for (int i = 0; i < 2; ++i) {
- EXPECT_CALL(*mock_sender_, TimeUntilSend(clock_.Now(), bytes_in_flight,
- retransmittable_data))
- .WillOnce(Return(zero_time_));
- // Verify that the packet can be sent immediately.
- EXPECT_EQ(zero_time_,
- pacing_sender_->TimeUntilSend(clock_.Now(), bytes_in_flight,
- retransmittable_data));
- }
-
- // Actually send the packet.
- EXPECT_CALL(*mock_sender_,
- OnPacketSent(clock_.Now(), bytes_in_flight, sequence_number_,
- kMaxPacketSize, retransmittable_data));
- pacing_sender_->OnPacketSent(clock_.Now(), bytes_in_flight,
- sequence_number_++, kMaxPacketSize,
- retransmittable_data);
- }
-
- void CheckPacketIsSentImmediately() {
- CheckPacketIsSentImmediately(HAS_RETRANSMITTABLE_DATA, kBytesInFlight);
- }
-
- void CheckAckIsSentImmediately() {
- CheckPacketIsSentImmediately(NO_RETRANSMITTABLE_DATA, kBytesInFlight);
- }
-
- void CheckPacketIsDelayed(QuicTime::Delta delay) {
- // In order for the packet to be sendable, the underlying sender must
- // permit it to be sent immediately.
- for (int i = 0; i < 2; ++i) {
- EXPECT_CALL(*mock_sender_, TimeUntilSend(clock_.Now(),
- kBytesInFlight,
- HAS_RETRANSMITTABLE_DATA))
- .WillOnce(Return(zero_time_));
- // Verify that the packet is delayed.
- EXPECT_EQ(delay.ToMicroseconds(),
- pacing_sender_->TimeUntilSend(
- clock_.Now(), kBytesInFlight,
- HAS_RETRANSMITTABLE_DATA).ToMicroseconds());
- }
- }
-
- void UpdateRtt() {
- EXPECT_CALL(*mock_sender_, OnCongestionEvent(true, kBytesInFlight, _, _));
- SendAlgorithmInterface::CongestionVector empty_map;
- pacing_sender_->OnCongestionEvent(true, kBytesInFlight, empty_map,
- empty_map);
- }
-
- const QuicTime::Delta zero_time_;
- const QuicTime::Delta infinite_time_;
- MockClock clock_;
- QuicPacketSequenceNumber sequence_number_;
- StrictMock<MockSendAlgorithm>* mock_sender_;
- scoped_ptr<PacingSender> pacing_sender_;
-};
-
-TEST_F(PacingSenderTest, NoSend) {
- for (int i = 0; i < 2; ++i) {
- EXPECT_CALL(*mock_sender_, TimeUntilSend(clock_.Now(),
- kBytesInFlight,
- HAS_RETRANSMITTABLE_DATA))
- .WillOnce(Return(infinite_time_));
- EXPECT_EQ(infinite_time_,
- pacing_sender_->TimeUntilSend(clock_.Now(),
- kBytesInFlight,
- HAS_RETRANSMITTABLE_DATA));
- }
-}
-
-TEST_F(PacingSenderTest, SendNow) {
- for (int i = 0; i < 2; ++i) {
- EXPECT_CALL(*mock_sender_, TimeUntilSend(clock_.Now(),
- kBytesInFlight,
- HAS_RETRANSMITTABLE_DATA))
- .WillOnce(Return(zero_time_));
- EXPECT_EQ(zero_time_,
- pacing_sender_->TimeUntilSend(clock_.Now(),
- kBytesInFlight,
- HAS_RETRANSMITTABLE_DATA));
- }
-}
-
-TEST_F(PacingSenderTest, VariousSending) {
- // Configure pacing rate of 1 packet per 1 ms, no initial burst.
- InitPacingRate(0, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
-
- // Now update the RTT and verify that packets are actually paced.
- UpdateRtt();
-
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
-
- // The first packet was a "make up", then we sent two packets "into the
- // future", so the delay should be 2.
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-
- // Wake up on time.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(2));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
- CheckAckIsSentImmediately();
-
- // Wake up late.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(4));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-
- // Wake up really late.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(8));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-
- // Wake up really late again, but application pause partway through.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(8));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(100));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-
- // Wake up too early.
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-
- // Wake up early, but after enough time has passed to permit a send.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(1));
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-}
-
-// TODO(ianswett): Remove this test.
-TEST_F(PacingSenderTest, DISABLED_CongestionAvoidanceSending) {
- // Configure pacing rate of 1 packet per 1 ms.
- EXPECT_CALL(*mock_sender_, PacingRate())
- .WillRepeatedly(Return(QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize * 1.25, QuicTime::Delta::FromMilliseconds(2))));
-
- // Now update the RTT and verify that packets are actually paced.
- UpdateRtt();
-
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
-
- // The first packet was a "make up", then we sent two packets "into the
- // future", so the delay should be 2200us.
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(2200));
-
- // Wake up on time.
- clock_.AdvanceTime(QuicTime::Delta::FromMicroseconds(2200));
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(1600));
- CheckAckIsSentImmediately();
-
- // Wake up late.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(4));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(2400));
-
- // Wake up really late.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(8));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(2400));
-
- // Wake up really late again, but application pause partway through.
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(8));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(100));
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(2200));
-
- // Wake up too early.
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(2200));
-
- // Wake up early, but after enough time has passed to permit a send.
- clock_.AdvanceTime(QuicTime::Delta::FromMicroseconds(1200));
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(2600));
-}
-
-TEST_F(PacingSenderTest, InitialBurst) {
- // Configure pacing rate of 1 packet per 1 ms.
- InitPacingRate(10, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
-
- // Update the RTT and verify that the first 10 packets aren't paced.
- UpdateRtt();
-
- // Send 10 packets, and verify that they are not paced.
- for (int i = 0 ; i < kInitialBurstPackets; ++i) {
- CheckPacketIsSentImmediately();
- }
-
- // The first packet was a "make up", then we sent two packets "into the
- // future", so the delay should be 2ms.
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(5));
- CheckPacketIsSentImmediately();
-
- // Next time TimeUntilSend is called with no bytes in flight, pacing should
- // allow a packet to be sent, and when it's sent, the tokens are refilled.
- CheckPacketIsSentImmediately(HAS_RETRANSMITTABLE_DATA, 0);
- for (int i = 0; i < kInitialBurstPackets - 1; ++i) {
- CheckPacketIsSentImmediately();
- }
-
- // The first packet was a "make up", then we sent two packets "into the
- // future", so the delay should be 2ms.
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-}
-
-TEST_F(PacingSenderTest, InitialBurstNoRttMeasurement) {
- // Configure pacing rate of 1 packet per 1 ms.
- InitPacingRate(10, QuicBandwidth::FromBytesAndTimeDelta(
- kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
-
- // Send 10 packets, and verify that they are not paced.
- for (int i = 0 ; i < kInitialBurstPackets; ++i) {
- CheckPacketIsSentImmediately();
- }
-
- // The first packet was a "make up", then we sent two packets "into the
- // future", so the delay should be 2ms.
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-
-
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(5));
- CheckPacketIsSentImmediately();
-
- // Next time TimeUntilSend is called with no bytes in flight, the tokens
- // should be refilled and there should be no delay.
- CheckPacketIsSentImmediately(HAS_RETRANSMITTABLE_DATA, 0);
- // Send 10 packets, and verify that they are not paced.
- for (int i = 0; i < kInitialBurstPackets - 1; ++i) {
- CheckPacketIsSentImmediately();
- }
-
- // The first packet was a "make up", then we sent two packets "into the
- // future", so the delay should be 2ms.
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
-}
-
-TEST_F(PacingSenderTest, FastSending) {
- // Ensure the pacing sender paces, even when the inter-packet spacing is less
- // than the pacing granularity.
- InitPacingRate(10,
- QuicBandwidth::FromBytesAndTimeDelta(
- 2 * kMaxPacketSize, QuicTime::Delta::FromMilliseconds(1)));
-
- // Update the RTT and verify that the first 10 packets aren't paced.
- UpdateRtt();
-
- // Send 10 packets, and verify that they are not paced.
- for (int i = 0; i < kInitialBurstPackets; ++i) {
- CheckPacketIsSentImmediately();
- }
-
- // The first packet was a "make up", then we sent two packets "into the
- // future", since it's 2 packets/ms, so the delay should be 1.5ms.
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(1500));
-
- clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(5));
- CheckPacketIsSentImmediately();
-
- // Next time TimeUntilSend is called with no bytes in flight, the tokens
- // should be refilled and there should be no delay.
- CheckPacketIsSentImmediately(HAS_RETRANSMITTABLE_DATA, 0);
- for (int i = 0; i < kInitialBurstPackets - 1; ++i) {
- CheckPacketIsSentImmediately();
- }
-
- // The first packet was a "make up", then we sent two packets "into the
- // future", so the delay should be 1.5ms.
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsSentImmediately();
- CheckPacketIsDelayed(QuicTime::Delta::FromMicroseconds(1500));
-}
-
-} // namespace test
-} // namespace net
« no previous file with comments | « net/quic/congestion_control/pacing_sender.cc ('k') | net/quic/congestion_control/prr_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698