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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/wtf/PartitionAllocTest.cpp

Issue 1197753003: PartitionAlloc: implement discarding for partitionPurgeMemoryGeneric(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@rawsize
Patch Set: Add missing comment. Created 5 years, 6 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
« Source/wtf/PartitionAlloc.cpp ('K') | « Source/wtf/PartitionAlloc.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/PartitionAllocTest.cpp
diff --git a/Source/wtf/PartitionAllocTest.cpp b/Source/wtf/PartitionAllocTest.cpp
index cc0e96295d1e85b07128fdb265bfa8f0ab7ee154..9452278ff43f4a624094a8e341b12fc092fdb1e1 100644
--- a/Source/wtf/PartitionAllocTest.cpp
+++ b/Source/wtf/PartitionAllocTest.cpp
@@ -194,6 +194,15 @@ void CycleGenericFreeCache(size_t size)
}
}
+void CheckPageInCore(void* ptr, bool inCore)
+{
+#if OS(LINUX)
+ unsigned char ret;
+ EXPECT_EQ(0, mincore(ptr, kSystemPageSize, &ret));
+ EXPECT_EQ(inCore, ret);
+#endif
+}
+
class MockPartitionStatsDumper : public PartitionStatsDumper {
public:
MockPartitionStatsDumper()
@@ -1347,6 +1356,7 @@ TEST(PartitionAllocTest, DumpMemoryStats)
EXPECT_EQ(2048u, stats->activeBytes);
EXPECT_EQ(kSystemPageSize, stats->residentBytes);
EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(0u, stats->discardableBytes);
EXPECT_EQ(0u, stats->numFullPages);
EXPECT_EQ(1u, stats->numActivePages);
EXPECT_EQ(0u, stats->numEmptyPages);
@@ -1367,6 +1377,7 @@ TEST(PartitionAllocTest, DumpMemoryStats)
EXPECT_EQ(0u, stats->activeBytes);
EXPECT_EQ(kSystemPageSize, stats->residentBytes);
EXPECT_EQ(kSystemPageSize, stats->decommittableBytes);
+ EXPECT_EQ(0u, stats->discardableBytes);
EXPECT_EQ(0u, stats->numFullPages);
EXPECT_EQ(0u, stats->numActivePages);
EXPECT_EQ(1u, stats->numEmptyPages);
@@ -1387,6 +1398,7 @@ TEST(PartitionAllocTest, DumpMemoryStats)
EXPECT_EQ(0u, stats->activeBytes);
EXPECT_EQ(0u, stats->residentBytes);
EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(0u, stats->discardableBytes);
EXPECT_EQ(0u, stats->numFullPages);
EXPECT_EQ(0u, stats->numActivePages);
EXPECT_EQ(0u, stats->numEmptyPages);
@@ -1418,6 +1430,7 @@ TEST(PartitionAllocTest, DumpMemoryStats)
EXPECT_EQ(kPartitionPageSize, stats->activeBytes);
EXPECT_EQ(kPartitionPageSize, stats->residentBytes);
EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(0u, stats->discardableBytes);
EXPECT_EQ(1u, stats->numFullPages);
EXPECT_EQ(0u, stats->numActivePages);
EXPECT_EQ(0u, stats->numEmptyPages);
@@ -1448,6 +1461,7 @@ TEST(PartitionAllocTest, DumpMemoryStats)
EXPECT_EQ(realSizeSmaller, stats->activeBytes);
EXPECT_EQ(realSizeSmaller, stats->residentBytes);
EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(0u, stats->discardableBytes);
EXPECT_EQ(1u, stats->numFullPages);
EXPECT_EQ(0u, stats->numActivePages);
EXPECT_EQ(0u, stats->numEmptyPages);
@@ -1461,6 +1475,7 @@ TEST(PartitionAllocTest, DumpMemoryStats)
EXPECT_EQ(realSizeBigger, stats->activeBytes);
EXPECT_EQ(realSizeBigger, stats->residentBytes);
EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(0u, stats->discardableBytes);
EXPECT_EQ(1u, stats->numFullPages);
EXPECT_EQ(0u, stats->numActivePages);
EXPECT_EQ(0u, stats->numEmptyPages);
@@ -1496,6 +1511,7 @@ TEST(PartitionAllocTest, DumpMemoryStats)
EXPECT_EQ(65536 + kSystemPageSize, stats->activeBytes);
EXPECT_EQ(slotSize, stats->residentBytes);
EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(kSystemPageSize, stats->discardableBytes);
EXPECT_EQ(1u, stats->numFullPages);
EXPECT_EQ(0u, stats->numActivePages);
EXPECT_EQ(0u, stats->numEmptyPages);
@@ -1521,6 +1537,7 @@ TEST(PartitionAllocTest, DumpMemoryStats)
EXPECT_EQ(slotSize, stats->activeBytes);
EXPECT_EQ(slotSize, stats->residentBytes);
EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(0u, stats->discardableBytes);
EXPECT_EQ(1u, stats->numFullPages);
EXPECT_EQ(0u, stats->numActivePages);
EXPECT_EQ(0u, stats->numEmptyPages);
@@ -1569,6 +1586,105 @@ TEST(PartitionAllocTest, Purge)
TestShutdown();
}
+// Tests the API to purge discardable memory.
+TEST(PartitionAllocTest, PurgeDiscardable)
+{
+ TestSetup();
+
+ {
+ void* ptr1 = partitionAllocGeneric(genericAllocator.root(), kSystemPageSize - kExtraAllocSize);
+ char* ptr2 = reinterpret_cast<char*>(partitionAllocGeneric(genericAllocator.root(), kSystemPageSize - kExtraAllocSize));
+ partitionFreeGeneric(genericAllocator.root(), ptr2);
+ {
+ MockPartitionStatsDumper mockStatsDumperGeneric;
+ partitionDumpStatsGeneric(genericAllocator.root(), "mock_generic_allocator", &mockStatsDumperGeneric);
+ EXPECT_TRUE(mockStatsDumperGeneric.IsMemoryAllocationRecorded());
+
+ const PartitionBucketMemoryStats* stats = mockStatsDumperGeneric.GetBucketStats(kSystemPageSize);
+ EXPECT_TRUE(stats);
+ EXPECT_TRUE(stats->isValid);
+ EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(kSystemPageSize, stats->discardableBytes);
+ EXPECT_EQ(kSystemPageSize, stats->activeBytes);
+ EXPECT_EQ(2 * kSystemPageSize, stats->residentBytes);
+ }
+ CheckPageInCore(ptr2 - kPointerOffset, true);
+ partitionPurgeMemoryGeneric(genericAllocator.root(), PartitionPurgeDiscardUnusedSystemPages);
+ CheckPageInCore(ptr2 - kPointerOffset, false);
+
+ partitionFreeGeneric(genericAllocator.root(), ptr1);
+ }
+ {
+ char* ptr1 = reinterpret_cast<char*>(partitionAllocGeneric(genericAllocator.root(), 9216 - kExtraAllocSize));
+ void* ptr2 = partitionAllocGeneric(genericAllocator.root(), 9216 - kExtraAllocSize);
+ void* ptr3 = partitionAllocGeneric(genericAllocator.root(), 9216 - kExtraAllocSize);
+ void* ptr4 = partitionAllocGeneric(genericAllocator.root(), 9216 - kExtraAllocSize);
+ memset(ptr1, 'A', 9216 - kExtraAllocSize);
+ memset(ptr2, 'A', 9216 - kExtraAllocSize);
+ partitionFreeGeneric(genericAllocator.root(), ptr2);
+ partitionFreeGeneric(genericAllocator.root(), ptr1);
+ {
+ MockPartitionStatsDumper mockStatsDumperGeneric;
+ partitionDumpStatsGeneric(genericAllocator.root(), "mock_generic_allocator", &mockStatsDumperGeneric);
+ EXPECT_TRUE(mockStatsDumperGeneric.IsMemoryAllocationRecorded());
+
+ const PartitionBucketMemoryStats* stats = mockStatsDumperGeneric.GetBucketStats(9216);
+ EXPECT_TRUE(stats);
+ EXPECT_TRUE(stats->isValid);
+ EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(2 * kSystemPageSize, stats->discardableBytes);
+ EXPECT_EQ(9216u * 2, stats->activeBytes);
+ EXPECT_EQ(9 * kSystemPageSize, stats->residentBytes);
+ }
+ CheckPageInCore(ptr1 - kPointerOffset, true);
+ CheckPageInCore(ptr1 - kPointerOffset + kSystemPageSize, true);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 2), true);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 3), true);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 4), true);
+ partitionPurgeMemoryGeneric(genericAllocator.root(), PartitionPurgeDiscardUnusedSystemPages);
+ CheckPageInCore(ptr1 - kPointerOffset, true);
+ CheckPageInCore(ptr1 - kPointerOffset + kSystemPageSize, false);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 2), true);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 3), false);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 4), true);
+
+ partitionFreeGeneric(genericAllocator.root(), ptr3);
+ partitionFreeGeneric(genericAllocator.root(), ptr4);
+ }
+ {
+ char* ptr1 = reinterpret_cast<char*>(partitionAllocGeneric(genericAllocator.root(), (64 * kSystemPageSize) - kExtraAllocSize));
+ memset(ptr1, 'A', (64 * kSystemPageSize) - kExtraAllocSize);
+ partitionFreeGeneric(genericAllocator.root(), ptr1);
+ ptr1 = reinterpret_cast<char*>(partitionAllocGeneric(genericAllocator.root(), (61 * kSystemPageSize) - kExtraAllocSize));
+ {
+ MockPartitionStatsDumper mockStatsDumperGeneric;
+ partitionDumpStatsGeneric(genericAllocator.root(), "mock_generic_allocator", &mockStatsDumperGeneric);
+ EXPECT_TRUE(mockStatsDumperGeneric.IsMemoryAllocationRecorded());
+
+ const PartitionBucketMemoryStats* stats = mockStatsDumperGeneric.GetBucketStats(64 * kSystemPageSize);
+ EXPECT_TRUE(stats);
+ EXPECT_TRUE(stats->isValid);
+ EXPECT_EQ(0u, stats->decommittableBytes);
+ EXPECT_EQ(3 * kSystemPageSize, stats->discardableBytes);
+ EXPECT_EQ(61 * kSystemPageSize, stats->activeBytes);
+ EXPECT_EQ(64 * kSystemPageSize, stats->residentBytes);
+ }
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 60), true);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 61), true);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 62), true);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 63), true);
+ partitionPurgeMemoryGeneric(genericAllocator.root(), PartitionPurgeDiscardUnusedSystemPages);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 60), true);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 61), false);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 62), false);
+ CheckPageInCore(ptr1 - kPointerOffset + (kSystemPageSize * 63), false);
+
+ partitionFreeGeneric(genericAllocator.root(), ptr1);
+ }
+
+ TestShutdown();
+}
+
// Tests that the countLeadingZeros() functions work to our satisfaction.
// It doesn't seem worth the overhead of a whole new file for these tests, so
// we'll put them here since partitionAllocGeneric will depend heavily on these
« Source/wtf/PartitionAlloc.cpp ('K') | « Source/wtf/PartitionAlloc.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698