commit 2542cb728f1119cfbabd91105cc5a3cc44e784a3
author fayang <fayang@google.com> Thu Mar 26 11:27:21 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 26 11:27:58 2020 -0700
tree bb144713358aab4d95bfd5bfd215dadde2f2a6ff
parent 60ba193a9aeb737600439987857058689004388b

Internal QUICHE change

PiperOrigin-RevId: 303156564
Change-Id: I0f97adc849d240c5c31e8ed120f78c84356a47d3

quic/core/quic_arena_scoped_ptr_test.cc

diff --git a/quic/core/quic_arena_scoped_ptr_test.cc b/quic/core/quic_arena_scoped_ptr_test.cc
index 5b7548a..cd0780f 100644
--- a/quic/core/quic_arena_scoped_ptr_test.cc
+++ b/quic/core/quic_arena_scoped_ptr_test.cc
@@ -13,7 +13,7 @@
 enum class TestParam { kFromHeap, kFromArena };
 
 struct TestObject {
-  explicit TestObject(uintptr_t value) : value(value) { buffer.resize(1024); }
+  explicit TestObject(uintptr_t value) : value(value) { buffer.resize(1200); }
   uintptr_t value;
 
   // Ensure that we have a non-trivial destructor that will leak memory if it's
@@ -51,7 +51,7 @@
   }
 
  private:
-  QuicOneBlockArena<1024> arena_;
+  QuicOneBlockArena<1200> arena_;
 };
 
 INSTANTIATE_TEST_SUITE_P(QuicArenaScopedPtrParamTest,
@@ -69,7 +69,7 @@
 }
 
 TEST_P(QuicArenaScopedPtrParamTest, FromArena) {
-  QuicOneBlockArena<1024> arena_;
+  QuicOneBlockArena<1200> arena_;
   EXPECT_TRUE(arena_.New<TestObject>(0).is_from_arena());
   EXPECT_FALSE(
       QuicArenaScopedPtr<TestObject>(new TestObject(0)).is_from_arena());

quic/core/quic_one_block_arena.h

diff --git a/quic/core/quic_one_block_arena.h b/quic/core/quic_one_block_arena.h
index 210892a..d6b7ee9 100644
--- a/quic/core/quic_one_block_arena.h
+++ b/quic/core/quic_one_block_arena.h
@@ -75,7 +75,8 @@
 
 // QuicConnections currently use around 1KB of polymorphic types which would
 // ordinarily be on the heap. Instead, store them inline in an arena.
-// TODO(fayang): Switch this back to 1024 when deprecating
+// TODO(fayang): Switch this and 1200 used in quic_arena_scoped_ptr_test and
+// quic_one_block_arena_test back to 1024 when deprecating
 // quic_use_blackhole_detector or quic_use_idle_network_detector.
 using QuicConnectionArena = QuicOneBlockArena<1200>;
 

quic/core/quic_one_block_arena_test.cc

diff --git a/quic/core/quic_one_block_arena_test.cc b/quic/core/quic_one_block_arena_test.cc
index 3175ac5..11b12de 100644
--- a/quic/core/quic_one_block_arena_test.cc
+++ b/quic/core/quic_one_block_arena_test.cc
@@ -23,14 +23,14 @@
 class QuicOneBlockArenaTest : public QuicTest {};
 
 TEST_F(QuicOneBlockArenaTest, AllocateSuccess) {
-  QuicOneBlockArena<1024> arena;
+  QuicOneBlockArena<1200> arena;
   QuicArenaScopedPtr<TestObject> ptr = arena.New<TestObject>();
   EXPECT_TRUE(ptr.is_from_arena());
 }
 
 TEST_F(QuicOneBlockArenaTest, Exhaust) {
-  QuicOneBlockArena<1024> arena;
-  for (size_t i = 0; i < 1024 / kMaxAlign; ++i) {
+  QuicOneBlockArena<1200> arena;
+  for (size_t i = 0; i < 1200 / kMaxAlign; ++i) {
     QuicArenaScopedPtr<TestObject> ptr = arena.New<TestObject>();
     EXPECT_TRUE(ptr.is_from_arena());
   }
@@ -41,10 +41,10 @@
 }
 
 TEST_F(QuicOneBlockArenaTest, NoOverlaps) {
-  QuicOneBlockArena<1024> arena;
+  QuicOneBlockArena<1200> arena;
   std::vector<QuicArenaScopedPtr<TestObject>> objects;
   QuicIntervalSet<uintptr_t> used;
-  for (size_t i = 0; i < 1024 / kMaxAlign; ++i) {
+  for (size_t i = 0; i < 1200 / kMaxAlign; ++i) {
     QuicArenaScopedPtr<TestObject> ptr = arena.New<TestObject>();
     EXPECT_TRUE(ptr.is_from_arena());