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

Unified Diff: base/memory/discardable_shared_memory_unittest.cc

Issue 1407483003: Reland of [tracing] Display the locked size of discardable memory segment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix. Created 5 years, 2 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
Index: base/memory/discardable_shared_memory_unittest.cc
diff --git a/base/memory/discardable_shared_memory_unittest.cc b/base/memory/discardable_shared_memory_unittest.cc
index 91b0b68523aed4d24a5425ea0f96fdb6cf96c04b..d5b71d31cb0b9649087bea036d3ecf6e8cc40a21 100644
--- a/base/memory/discardable_shared_memory_unittest.cc
+++ b/base/memory/discardable_shared_memory_unittest.cc
@@ -33,6 +33,7 @@ TEST(DiscardableSharedMemoryTest, CreateAndMap) {
bool rv = memory.CreateAndMap(kDataSize);
ASSERT_TRUE(rv);
EXPECT_GE(memory.mapped_size(), kDataSize);
+ EXPECT_TRUE(memory.IsMemoryLocked());
}
TEST(DiscardableSharedMemoryTest, CreateFromHandle) {
@@ -50,6 +51,7 @@ TEST(DiscardableSharedMemoryTest, CreateFromHandle) {
TestDiscardableSharedMemory memory2(shared_handle);
rv = memory2.Map(kDataSize);
ASSERT_TRUE(rv);
+ EXPECT_TRUE(memory2.IsMemoryLocked());
}
TEST(DiscardableSharedMemoryTest, LockAndUnlock) {
@@ -62,6 +64,7 @@ TEST(DiscardableSharedMemoryTest, LockAndUnlock) {
// Memory is initially locked. Unlock it.
memory1.SetNow(Time::FromDoubleT(1));
memory1.Unlock(0, 0);
+ EXPECT_FALSE(memory1.IsMemoryLocked());
// Lock and unlock memory.
auto lock_rv = memory1.Lock(0, 0);
@@ -72,6 +75,7 @@ TEST(DiscardableSharedMemoryTest, LockAndUnlock) {
// Lock again before duplicating and passing ownership to new instance.
lock_rv = memory1.Lock(0, 0);
EXPECT_EQ(DiscardableSharedMemory::SUCCESS, lock_rv);
+ EXPECT_TRUE(memory1.IsMemoryLocked());
SharedMemoryHandle shared_handle;
ASSERT_TRUE(
@@ -86,13 +90,18 @@ TEST(DiscardableSharedMemoryTest, LockAndUnlock) {
memory2.SetNow(Time::FromDoubleT(3));
memory2.Unlock(0, 0);
+ // Both memory instances should be unlocked now.
+ EXPECT_FALSE(memory2.IsMemoryLocked());
+ EXPECT_FALSE(memory1.IsMemoryLocked());
+
// Lock second instance before passing ownership back to first instance.
lock_rv = memory2.Lock(0, 0);
EXPECT_EQ(DiscardableSharedMemory::SUCCESS, lock_rv);
- // Memory should still be resident.
+ // Memory should still be resident and locked.
rv = memory1.IsMemoryResident();
EXPECT_TRUE(rv);
+ EXPECT_TRUE(memory1.IsMemoryLocked());
// Unlock first instance.
memory1.SetNow(Time::FromDoubleT(4));

Powered by Google App Engine
This is Rietveld 408576698