Use DiscardableMemoryManager on Android.

base/memory/discardable_memory_allocation_ashmem_factory_unittest.cc

Index: base/memory/discardable_memory_allocation_ashmem_factory_unittest.cc
diff --git a/base/memory/discardable_memory_allocator_android_unittest.cc b/base/memory/discardable_memory_allocation_ashmem_factory_unittest.cc
similarity index 54%
copy from base/memory/discardable_memory_allocator_android_unittest.cc
copy to base/memory/discardable_memory_allocation_ashmem_factory_unittest.cc
index b2e8d558608fb03c6f5a5142e63f1d30ef30009b..6d0f191d1996b9c229679f9d5ffcceb3e885878e 100644
--- a/base/memory/discardable_memory_allocator_android_unittest.cc
+++ b/base/memory/discardable_memory_allocation_ashmem_factory_unittest.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/memory/discardable_memory_allocator_android.h"
+#include "base/memory/discardable_memory_allocation_ashmem_factory.h"
 
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "base/memory/discardable_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ -18,7 +17,7 @@
 namespace base {
 namespace internal {
 
-const char kAllocatorName[] = "allocator-for-testing";
+const char kAllocationAshmemFactoryName[] = "allocator-for-testing";
 
 const size_t kAshmemRegionSizeForTesting = 32 * 1024 * 1024;
 const size_t kPageSize = 4096;
@@ -26,43 +25,47 @@ const size_t kPageSize = 4096;
 const size_t kMaxAllowedAllocationSize =
     std::numeric_limits<size_t>::max() - kPageSize + 1;
 
-class DiscardableMemoryAllocatorTest : public testing::Test {
+class DiscardableMemoryAllocationAshmemFactoryTest : public testing::Test {
  protected:
-  DiscardableMemoryAllocatorTest()
-      : allocator_(kAllocatorName, kAshmemRegionSizeForTesting) {
+  DiscardableMemoryAllocationAshmemFactoryTest()
+      : factory_(kAllocationAshmemFactoryName, kAshmemRegionSizeForTesting) {
   }
 
-  DiscardableMemoryAllocator allocator_;
+  DiscardableMemoryAllocationAshmemFactory factory_;
 };
 
-void WriteToDiscardableMemory(DiscardableMemory* memory, size_t size) {
+void WriteToDiscardableMemory(DiscardableMemoryAllocation* memory,
+                              size_t size) {
   // Write to the first and the last pages only to avoid paging in up to 64
   // MBytes.
   static_cast<char*>(memory->Memory())[0] = 'a';
   static_cast<char*>(memory->Memory())[size - 1] = 'a';
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, Basic) {
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, Basic) {
   const size_t size = 128;
-  scoped_ptr<DiscardableMemory> memory(allocator_.Allocate(size));
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      factory_.CreateLockedAllocation(size));
   ASSERT_TRUE(memory);
   WriteToDiscardableMemory(memory.get(), size);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, ZeroAllocationIsNotSupported) {
-  scoped_ptr<DiscardableMemory> memory(allocator_.Allocate(0));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest,
+       ZeroAllocationIsNotSupported) {
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      factory_.CreateLockedAllocation(0));
   ASSERT_FALSE(memory);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, TooLargeAllocationFails) {
-  scoped_ptr<DiscardableMemory> memory(
-      allocator_.Allocate(kMaxAllowedAllocationSize + 1));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, TooLargeAllocationFails) {
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      factory_.CreateLockedAllocation(kMaxAllowedAllocationSize + 1));
   // Page-alignment would have caused an overflow resulting in a small
   // allocation if the input size wasn't checked correctly.
   ASSERT_FALSE(memory);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest,
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest,
        AshmemRegionsAreNotSmallerThanRequestedSize) {
   // The creation of the underlying ashmem region is expected to fail since
   // there should not be enough room in the address space. When ashmem creation
@@ -70,93 +73,109 @@ TEST_F(DiscardableMemoryAllocatorTest,
   // size should not be smaller than the size the user requested so the
   // allocation here should just fail (and not succeed with the minimum ashmem
   // region size).
-  scoped_ptr<DiscardableMemory> memory(
-      allocator_.Allocate(kMaxAllowedAllocationSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      factory_.CreateLockedAllocation(kMaxAllowedAllocationSize));
   ASSERT_FALSE(memory);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, AshmemRegionsAreAlwaysPageAligned) {
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest,
+       AshmemRegionsAreAlwaysPageAligned) {
   // Use a separate allocator here so that we can override the ashmem region
   // size.
-  DiscardableMemoryAllocator allocator(
-      kAllocatorName, kMaxAllowedAllocationSize);
-  scoped_ptr<DiscardableMemory> memory(allocator.Allocate(kPageSize));
+  DiscardableMemoryAllocationAshmemFactory allocator(
+      kAllocationAshmemFactoryName, kMaxAllowedAllocationSize);
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      allocator.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory);
   EXPECT_GT(kMaxAllowedAllocationSize, allocator.last_ashmem_region_size());
   ASSERT_TRUE(allocator.last_ashmem_region_size() % kPageSize == 0);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, LargeAllocation) {
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, LargeAllocation) {
   // Note that large allocations should just use DiscardableMemoryAndroidSimple
   // instead.
   const size_t size = 64 * 1024 * 1024;
-  scoped_ptr<DiscardableMemory> memory(allocator_.Allocate(size));
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      factory_.CreateLockedAllocation(size));
   ASSERT_TRUE(memory);
   WriteToDiscardableMemory(memory.get(), size);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, ChunksArePageAligned) {
-  scoped_ptr<DiscardableMemory> memory(allocator_.Allocate(kPageSize));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, ChunksArePageAligned) {
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory);
   EXPECT_EQ(0U, reinterpret_cast<uint64_t>(memory->Memory()) % kPageSize);
   WriteToDiscardableMemory(memory.get(), kPageSize);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, AllocateFreeAllocate) {
-  scoped_ptr<DiscardableMemory> memory(allocator_.Allocate(kPageSize));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, AllocateFreeAllocate) {
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      factory_.CreateLockedAllocation(kPageSize));
   // Extra allocation that prevents the region from being deleted when |memory|
   // gets deleted.
-  scoped_ptr<DiscardableMemory> memory_lock(allocator_.Allocate(kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory_lock(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory);
   void* const address = memory->Memory();
   memory->Unlock();  // Tests that the reused chunk is being locked correctly.
   memory.reset();
-  memory = allocator_.Allocate(kPageSize);
+  memory = factory_.CreateLockedAllocation(kPageSize);
   ASSERT_TRUE(memory);
   // The previously freed chunk should be reused.
   EXPECT_EQ(address, memory->Memory());
   WriteToDiscardableMemory(memory.get(), kPageSize);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, FreeingWholeAshmemRegionClosesAshmem) {
-  scoped_ptr<DiscardableMemory> memory(allocator_.Allocate(kPageSize));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest,
+       FreeingWholeAshmemRegionClosesAshmem) {
+  scoped_ptr<DiscardableMemoryAllocation> memory(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory);
   const int kMagic = 0xdeadbeef;
   *static_cast<int*>(memory->Memory()) = kMagic;
   memory.reset();
   // The previous ashmem region should have been closed thus it should not be
   // reused.
-  memory = allocator_.Allocate(kPageSize);
+  memory = factory_.CreateLockedAllocation(kPageSize);
   ASSERT_TRUE(memory);
   EXPECT_NE(kMagic, *static_cast<const int*>(memory->Memory()));
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, AllocateUsesBestFitAlgorithm) {
-  scoped_ptr<DiscardableMemory> memory1(allocator_.Allocate(3 * kPageSize));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest,
+       AllocateUsesBestFitAlgorithm) {
+  scoped_ptr<DiscardableMemoryAllocation> memory1(
+      factory_.CreateLockedAllocation(3 * kPageSize));
   ASSERT_TRUE(memory1);
-  scoped_ptr<DiscardableMemory> memory2(allocator_.Allocate(2 * kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory2(
+      factory_.CreateLockedAllocation(2 * kPageSize));
   ASSERT_TRUE(memory2);
-  scoped_ptr<DiscardableMemory> memory3(allocator_.Allocate(1 * kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory3(
+      factory_.CreateLockedAllocation(1 * kPageSize));
   ASSERT_TRUE(memory3);
   void* const address_3 = memory3->Memory();
   memory1.reset();
   // Don't free |memory2| to avoid merging the 3 blocks together.
   memory3.reset();
-  memory1 = allocator_.Allocate(1 * kPageSize);
+  memory1 = factory_.CreateLockedAllocation(1 * kPageSize);
   ASSERT_TRUE(memory1);
   // The chunk whose size is closest to the requested size should be reused.
   EXPECT_EQ(address_3, memory1->Memory());
   WriteToDiscardableMemory(memory1.get(), kPageSize);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, MergeFreeChunks) {
-  scoped_ptr<DiscardableMemory> memory1(allocator_.Allocate(kPageSize));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, MergeFreeChunks) {
+  scoped_ptr<DiscardableMemoryAllocation> memory1(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory1);
-  scoped_ptr<DiscardableMemory> memory2(allocator_.Allocate(kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory2(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory2);
-  scoped_ptr<DiscardableMemory> memory3(allocator_.Allocate(kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory3(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory3);
-  scoped_ptr<DiscardableMemory> memory4(allocator_.Allocate(kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory4(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory4);
   void* const memory1_address = memory1->Memory();
   memory1.reset();
@@ -164,56 +183,65 @@ TEST_F(DiscardableMemoryAllocatorTest, MergeFreeChunks) {
   // Freeing |memory2| (located between memory1 and memory3) should merge the
   // three free blocks together.
   memory2.reset();
-  memory1 = allocator_.Allocate(3 * kPageSize);
+  memory1 = factory_.CreateLockedAllocation(3 * kPageSize);
   EXPECT_EQ(memory1_address, memory1->Memory());
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, MergeFreeChunksAdvanced) {
-  scoped_ptr<DiscardableMemory> memory1(allocator_.Allocate(4 * kPageSize));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, MergeFreeChunksAdvanced) {
+  scoped_ptr<DiscardableMemoryAllocation> memory1(
+      factory_.CreateLockedAllocation(4 * kPageSize));
   ASSERT_TRUE(memory1);
-  scoped_ptr<DiscardableMemory> memory2(allocator_.Allocate(4 * kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory2(
+      factory_.CreateLockedAllocation(4 * kPageSize));
   ASSERT_TRUE(memory2);
   void* const memory1_address = memory1->Memory();
   memory1.reset();
-  memory1 = allocator_.Allocate(2 * kPageSize);
+  memory1 = factory_.CreateLockedAllocation(2 * kPageSize);
   memory2.reset();
   // At this point, the region should be in this state:
   // 8 KBytes (used), 24 KBytes (free).
-  memory2 = allocator_.Allocate(6 * kPageSize);
+  memory2 = factory_.CreateLockedAllocation(6 * kPageSize);
   EXPECT_EQ(
       static_cast<const char*>(memory2->Memory()),
       static_cast<const char*>(memory1_address) + 2 * kPageSize);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, MergeFreeChunksAdvanced2) {
-  scoped_ptr<DiscardableMemory> memory1(allocator_.Allocate(4 * kPageSize));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, MergeFreeChunksAdvanced2) {
+  scoped_ptr<DiscardableMemoryAllocation> memory1(
+      factory_.CreateLockedAllocation(4 * kPageSize));
   ASSERT_TRUE(memory1);
-  scoped_ptr<DiscardableMemory> memory2(allocator_.Allocate(4 * kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory2(
+      factory_.CreateLockedAllocation(4 * kPageSize));
   ASSERT_TRUE(memory2);
   void* const memory1_address = memory1->Memory();
   memory1.reset();
-  memory1 = allocator_.Allocate(2 * kPageSize);
-  scoped_ptr<DiscardableMemory> memory3(allocator_.Allocate(2 * kPageSize));
+  memory1 = factory_.CreateLockedAllocation(2 * kPageSize);
+  scoped_ptr<DiscardableMemoryAllocation> memory3(
+      factory_.CreateLockedAllocation(2 * kPageSize));
   // At this point, the region should be in this state:
   // 8 KBytes (used), 8 KBytes (used), 16 KBytes (used).
   memory3.reset();
   memory2.reset();
   // At this point, the region should be in this state:
   // 8 KBytes (used), 24 KBytes (free).
-  memory2 = allocator_.Allocate(6 * kPageSize);
+  memory2 = factory_.CreateLockedAllocation(6 * kPageSize);
   EXPECT_EQ(
       static_cast<const char*>(memory2->Memory()),
       static_cast<const char*>(memory1_address) + 2 * kPageSize);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, MergeFreeChunksAndDeleteAshmemRegion) {
-  scoped_ptr<DiscardableMemory> memory1(allocator_.Allocate(4 * kPageSize));
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest,
+       MergeFreeChunksAndDeleteAshmemRegion) {
+  scoped_ptr<DiscardableMemoryAllocation> memory1(
+      factory_.CreateLockedAllocation(4 * kPageSize));
   ASSERT_TRUE(memory1);
-  scoped_ptr<DiscardableMemory> memory2(allocator_.Allocate(4 * kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory2(
+      factory_.CreateLockedAllocation(4 * kPageSize));
   ASSERT_TRUE(memory2);
   memory1.reset();
-  memory1 = allocator_.Allocate(2 * kPageSize);
-  scoped_ptr<DiscardableMemory> memory3(allocator_.Allocate(2 * kPageSize));
+  memory1 = factory_.CreateLockedAllocation(2 * kPageSize);
+  scoped_ptr<DiscardableMemoryAllocation> memory3(
+      factory_.CreateLockedAllocation(2 * kPageSize));
   // At this point, the region should be in this state:
   // 8 KBytes (used), 8 KBytes (used), 16 KBytes (used).
   memory1.reset();
@@ -224,62 +252,69 @@ TEST_F(DiscardableMemoryAllocatorTest, MergeFreeChunksAndDeleteAshmemRegion) {
   *static_cast<int*>(memory2->Memory()) = kMagic;
   memory2.reset();
   // The whole region should have been deleted.
-  memory2 = allocator_.Allocate(2 * kPageSize);
+  memory2 = factory_.CreateLockedAllocation(2 * kPageSize);
   EXPECT_NE(kMagic, *static_cast<int*>(memory2->Memory()));
 }
 
-TEST_F(DiscardableMemoryAllocatorTest,
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest,
      TooLargeFreeChunksDontCauseTooMuchFragmentationWhenRecycled) {
   // Keep |memory_1| below allocated so that the ashmem region doesn't get
   // closed when |memory_2| is deleted.
-  scoped_ptr<DiscardableMemory> memory_1(allocator_.Allocate(64 * 1024));
+  scoped_ptr<DiscardableMemoryAllocation> memory_1(
+      factory_.CreateLockedAllocation(64 * 1024));
   ASSERT_TRUE(memory_1);
-  scoped_ptr<DiscardableMemory> memory_2(allocator_.Allocate(32 * 1024));
+  scoped_ptr<DiscardableMemoryAllocation> memory_2(
+      factory_.CreateLockedAllocation(32 * 1024));
   ASSERT_TRUE(memory_2);
   void* const address = memory_2->Memory();
   memory_2.reset();
   const size_t size = 16 * 1024;
-  memory_2 = allocator_.Allocate(size);
+  memory_2 = factory_.CreateLockedAllocation(size);
   ASSERT_TRUE(memory_2);
   EXPECT_EQ(address, memory_2->Memory());
   WriteToDiscardableMemory(memory_2.get(), size);
-  scoped_ptr<DiscardableMemory> memory_3(allocator_.Allocate(size));
+  scoped_ptr<DiscardableMemoryAllocation> memory_3(
+      factory_.CreateLockedAllocation(size));
   // The unused tail (16 KBytes large) of the previously freed chunk should be
   // reused.
   EXPECT_EQ(static_cast<char*>(address) + size, memory_3->Memory());
   WriteToDiscardableMemory(memory_3.get(), size);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest, UseMultipleAshmemRegions) {
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest, UseMultipleAshmemRegions) {
   // Leave one page untouched at the end of the ashmem region.
   const size_t size = kAshmemRegionSizeForTesting - kPageSize;
-  scoped_ptr<DiscardableMemory> memory1(allocator_.Allocate(size));
+  scoped_ptr<DiscardableMemoryAllocation> memory1(
+      factory_.CreateLockedAllocation(size));
   ASSERT_TRUE(memory1);
   WriteToDiscardableMemory(memory1.get(), size);
 
-  scoped_ptr<DiscardableMemory> memory2(
-      allocator_.Allocate(kAshmemRegionSizeForTesting));
+  scoped_ptr<DiscardableMemoryAllocation> memory2(
+      factory_.CreateLockedAllocation(kAshmemRegionSizeForTesting));
   ASSERT_TRUE(memory2);
   WriteToDiscardableMemory(memory2.get(), kAshmemRegionSizeForTesting);
   // The last page of the first ashmem region should be used for this
   // allocation.
-  scoped_ptr<DiscardableMemory> memory3(allocator_.Allocate(kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory3(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory3);
   WriteToDiscardableMemory(memory3.get(), kPageSize);
   EXPECT_EQ(memory3->Memory(), static_cast<char*>(memory1->Memory()) + size);
 }
 
-TEST_F(DiscardableMemoryAllocatorTest,
+TEST_F(DiscardableMemoryAllocationAshmemFactoryTest,
        HighestAllocatedChunkPointerIsUpdatedWhenHighestChunkGetsSplit) {
   // Prevents the ashmem region from getting closed when |memory2| gets freed.
-  scoped_ptr<DiscardableMemory> memory1(allocator_.Allocate(kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory1(
+      factory_.CreateLockedAllocation(kPageSize));
   ASSERT_TRUE(memory1);
 
-  scoped_ptr<DiscardableMemory> memory2(allocator_.Allocate(4 * kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory2(
+      factory_.CreateLockedAllocation(4 * kPageSize));
   ASSERT_TRUE(memory2);
 
   memory2.reset();
-  memory2 = allocator_.Allocate(kPageSize);
+  memory2 = factory_.CreateLockedAllocation(kPageSize);
   // There should now be a free chunk of size 3 * |kPageSize| starting at offset
   // 2 * |kPageSize| and the pointer to the highest allocated chunk should have
   // also been updated to |base_| + 2 * |kPageSize|. This pointer is used to
@@ -288,13 +323,14 @@ TEST_F(DiscardableMemoryAllocatorTest,
 
   // Allocate more than 3 * |kPageSize| so that the free chunk of size 3 *
   // |kPageSize| is not reused and |highest_allocated_chunk_| gets used instead.
-  scoped_ptr<DiscardableMemory> memory3(allocator_.Allocate(4 * kPageSize));
+  scoped_ptr<DiscardableMemoryAllocation> memory3(
+      factory_.CreateLockedAllocation(4 * kPageSize));
   ASSERT_TRUE(memory3);
 
   // Deleting |memory3| (whose size is 4 * |kPageSize|) should result in a merge
   // with its previous chunk which is the free chunk of size |3 * kPageSize|.
   memory3.reset();
-  memory3 = allocator_.Allocate((3 + 4) * kPageSize);
+  memory3 = factory_.CreateLockedAllocation((3 + 4) * kPageSize);
   EXPECT_EQ(memory3->Memory(),
             static_cast<const char*>(memory2->Memory()) + kPageSize);
 }