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

Unified Diff: net/quic/quic_write_blocked_list_test.cc

Issue 2193073003: Move shared files in net/quic/ into net/quic/core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: io_thread_unittest.cc Created 4 years, 5 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/quic_write_blocked_list.cc ('k') | net/quic/reliable_quic_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_write_blocked_list_test.cc
diff --git a/net/quic/quic_write_blocked_list_test.cc b/net/quic/quic_write_blocked_list_test.cc
deleted file mode 100644
index 23009c0685351e28fe0d4c395961beca3896a43b..0000000000000000000000000000000000000000
--- a/net/quic/quic_write_blocked_list_test.cc
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2014 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/quic_write_blocked_list.h"
-
-#include "net/quic/test_tools/quic_test_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using net::kV3LowestPriority;
-using net::kV3HighestPriority;
-
-namespace net {
-namespace test {
-namespace {
-
-TEST(QuicWriteBlockedListTest, PriorityOrder) {
- QuicWriteBlockedList write_blocked_list;
-
- // Mark streams blocked in roughly reverse priority order, and
- // verify that streams are sorted.
- write_blocked_list.RegisterStream(40, kV3LowestPriority);
- write_blocked_list.RegisterStream(23, kV3HighestPriority);
- write_blocked_list.RegisterStream(17, kV3HighestPriority);
- write_blocked_list.RegisterStream(kHeadersStreamId, kV3HighestPriority);
- write_blocked_list.RegisterStream(kCryptoStreamId, kV3HighestPriority);
-
- write_blocked_list.AddStream(40);
- write_blocked_list.AddStream(23);
- write_blocked_list.AddStream(17);
- write_blocked_list.AddStream(kHeadersStreamId);
- write_blocked_list.AddStream(kCryptoStreamId);
-
- EXPECT_EQ(5u, write_blocked_list.NumBlockedStreams());
- EXPECT_TRUE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
- EXPECT_TRUE(write_blocked_list.HasWriteBlockedDataStreams());
- // The Crypto stream is highest priority.
- EXPECT_EQ(kCryptoStreamId, write_blocked_list.PopFront());
- // Followed by the Headers stream.
- EXPECT_EQ(kHeadersStreamId, write_blocked_list.PopFront());
- // Streams with same priority are popped in the order they were inserted.
- EXPECT_EQ(23u, write_blocked_list.PopFront());
- EXPECT_EQ(17u, write_blocked_list.PopFront());
- // Low priority stream appears last.
- EXPECT_EQ(40u, write_blocked_list.PopFront());
-
- EXPECT_EQ(0u, write_blocked_list.NumBlockedStreams());
- EXPECT_FALSE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
- EXPECT_FALSE(write_blocked_list.HasWriteBlockedDataStreams());
-}
-
-TEST(QuicWriteBlockedListTest, CryptoStream) {
- QuicWriteBlockedList write_blocked_list;
- write_blocked_list.RegisterStream(kCryptoStreamId, kV3HighestPriority);
- write_blocked_list.AddStream(kCryptoStreamId);
-
- EXPECT_EQ(1u, write_blocked_list.NumBlockedStreams());
- EXPECT_TRUE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
- EXPECT_EQ(kCryptoStreamId, write_blocked_list.PopFront());
- EXPECT_EQ(0u, write_blocked_list.NumBlockedStreams());
- EXPECT_FALSE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
-}
-
-TEST(QuicWriteBlockedListTest, HeadersStream) {
- QuicWriteBlockedList write_blocked_list;
- write_blocked_list.RegisterStream(kHeadersStreamId, kV3HighestPriority);
- write_blocked_list.AddStream(kHeadersStreamId);
-
- EXPECT_EQ(1u, write_blocked_list.NumBlockedStreams());
- EXPECT_TRUE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
- EXPECT_EQ(kHeadersStreamId, write_blocked_list.PopFront());
- EXPECT_EQ(0u, write_blocked_list.NumBlockedStreams());
- EXPECT_FALSE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
-}
-
-TEST(QuicWriteBlockedListTest, VerifyHeadersStream) {
- QuicWriteBlockedList write_blocked_list;
- write_blocked_list.RegisterStream(5, kV3HighestPriority);
- write_blocked_list.RegisterStream(kHeadersStreamId, kV3HighestPriority);
- write_blocked_list.AddStream(5);
- write_blocked_list.AddStream(kHeadersStreamId);
-
- EXPECT_EQ(2u, write_blocked_list.NumBlockedStreams());
- EXPECT_TRUE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
- EXPECT_TRUE(write_blocked_list.HasWriteBlockedDataStreams());
- // In newer QUIC versions, there is a headers stream which is
- // higher priority than data streams.
- EXPECT_EQ(kHeadersStreamId, write_blocked_list.PopFront());
- EXPECT_EQ(5u, write_blocked_list.PopFront());
- EXPECT_EQ(0u, write_blocked_list.NumBlockedStreams());
- EXPECT_FALSE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
- EXPECT_FALSE(write_blocked_list.HasWriteBlockedDataStreams());
-}
-
-TEST(QuicWriteBlockedListTest, NoDuplicateEntries) {
- // Test that QuicWriteBlockedList doesn't allow duplicate entries.
- QuicWriteBlockedList write_blocked_list;
-
- // Try to add a stream to the write blocked list multiple times at the same
- // priority.
- const QuicStreamId kBlockedId = kClientDataStreamId1;
- write_blocked_list.RegisterStream(kBlockedId, kV3HighestPriority);
- write_blocked_list.AddStream(kBlockedId);
- write_blocked_list.AddStream(kBlockedId);
- write_blocked_list.AddStream(kBlockedId);
-
- // This should only result in one blocked stream being added.
- EXPECT_EQ(1u, write_blocked_list.NumBlockedStreams());
- EXPECT_TRUE(write_blocked_list.HasWriteBlockedDataStreams());
-
- // There should only be one stream to pop off the front.
- EXPECT_EQ(kBlockedId, write_blocked_list.PopFront());
- EXPECT_EQ(0u, write_blocked_list.NumBlockedStreams());
- EXPECT_FALSE(write_blocked_list.HasWriteBlockedDataStreams());
-}
-
-TEST(QuicWriteBlockedListTest, BatchingWrites) {
- QuicWriteBlockedList write_blocked_list;
-
- const QuicStreamId id1 = kClientDataStreamId1;
- const QuicStreamId id2 = kClientDataStreamId2;
- const QuicStreamId id3 = kClientDataStreamId2 + 2;
- write_blocked_list.RegisterStream(id1, kV3LowestPriority);
- write_blocked_list.RegisterStream(id2, kV3LowestPriority);
- write_blocked_list.RegisterStream(id3, kV3HighestPriority);
-
- write_blocked_list.AddStream(id1);
- write_blocked_list.AddStream(id2);
- EXPECT_EQ(2u, write_blocked_list.NumBlockedStreams());
-
- // The first stream we push back should stay at the front until 16k is
- // written.
- EXPECT_EQ(id1, write_blocked_list.PopFront());
- write_blocked_list.UpdateBytesForStream(id1, 15999);
- write_blocked_list.AddStream(id1);
- EXPECT_EQ(2u, write_blocked_list.NumBlockedStreams());
- EXPECT_EQ(id1, write_blocked_list.PopFront());
-
- // Once 16k is written the first stream will yield to the next.
- write_blocked_list.UpdateBytesForStream(id1, 1);
- write_blocked_list.AddStream(id1);
- EXPECT_EQ(2u, write_blocked_list.NumBlockedStreams());
- EXPECT_EQ(id2, write_blocked_list.PopFront());
-
- // Set the new stream to have written all but one byte.
- write_blocked_list.UpdateBytesForStream(id2, 15999);
- write_blocked_list.AddStream(id2);
- EXPECT_EQ(2u, write_blocked_list.NumBlockedStreams());
-
- // Ensure higher priority streams are popped first.
- write_blocked_list.AddStream(id3);
- EXPECT_EQ(id3, write_blocked_list.PopFront());
-
- // Higher priority streams will always be popped first, even if using their
- // byte quota
- write_blocked_list.UpdateBytesForStream(id3, 20000);
- write_blocked_list.AddStream(id3);
- EXPECT_EQ(id3, write_blocked_list.PopFront());
-
- // Once the higher priority stream is out of the way, id2 will resume its 16k
- // write, with only 1 byte remaining of its guaranteed write allocation.
- EXPECT_EQ(id2, write_blocked_list.PopFront());
- write_blocked_list.AddStream(id2);
- write_blocked_list.UpdateBytesForStream(id2, 1);
- write_blocked_list.AddStream(id2);
- EXPECT_EQ(2u, write_blocked_list.NumBlockedStreams());
- EXPECT_EQ(id1, write_blocked_list.PopFront());
-}
-
-TEST(QuicWriteBlockedListTest, Ceding) {
- QuicWriteBlockedList write_blocked_list;
-
- write_blocked_list.RegisterStream(15, kV3HighestPriority);
- write_blocked_list.RegisterStream(16, kV3HighestPriority);
- write_blocked_list.RegisterStream(5, 5);
- write_blocked_list.RegisterStream(4, 5);
- write_blocked_list.RegisterStream(7, 7);
- write_blocked_list.RegisterStream(kHeadersStreamId, kV3HighestPriority);
- write_blocked_list.RegisterStream(kCryptoStreamId, kV3HighestPriority);
-
- // When nothing is on the list, nothing yields.
- EXPECT_FALSE(write_blocked_list.ShouldYield(5));
-
- write_blocked_list.AddStream(5);
- // 5 should not yield to itself.
- EXPECT_FALSE(write_blocked_list.ShouldYield(5));
- // 4 and 7 are equal or lower priority and should yield to 5.
- EXPECT_TRUE(write_blocked_list.ShouldYield(4));
- EXPECT_TRUE(write_blocked_list.ShouldYield(7));
- // 15, headers and crypto should preempt 5.
- EXPECT_FALSE(write_blocked_list.ShouldYield(15));
- EXPECT_FALSE(write_blocked_list.ShouldYield(kHeadersStreamId));
- EXPECT_FALSE(write_blocked_list.ShouldYield(kCryptoStreamId));
-
- // Block a high priority stream.
- write_blocked_list.AddStream(15);
- // 16 should yield (same priority) but headers and crypto will still not.
- EXPECT_TRUE(write_blocked_list.ShouldYield(16));
- EXPECT_FALSE(write_blocked_list.ShouldYield(kHeadersStreamId));
- EXPECT_FALSE(write_blocked_list.ShouldYield(kCryptoStreamId));
-
- // Block the headers stream. All streams but crypto and headers should yield.
- write_blocked_list.AddStream(kHeadersStreamId);
- EXPECT_TRUE(write_blocked_list.ShouldYield(16));
- EXPECT_TRUE(write_blocked_list.ShouldYield(15));
- EXPECT_FALSE(write_blocked_list.ShouldYield(kHeadersStreamId));
- EXPECT_FALSE(write_blocked_list.ShouldYield(kCryptoStreamId));
-
- // Block the crypto stream. All streams but crypto should yield.
- write_blocked_list.AddStream(kCryptoStreamId);
- EXPECT_TRUE(write_blocked_list.ShouldYield(16));
- EXPECT_TRUE(write_blocked_list.ShouldYield(15));
- EXPECT_TRUE(write_blocked_list.ShouldYield(kHeadersStreamId));
- EXPECT_FALSE(write_blocked_list.ShouldYield(kCryptoStreamId));
-}
-
-} // namespace
-} // namespace test
-} // namespace net
« no previous file with comments | « net/quic/quic_write_blocked_list.cc ('k') | net/quic/reliable_quic_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698