diff options
Diffstat (limited to 'src/tracing/ipc/posix_shared_memory_unittest.cc')
-rw-r--r-- | src/tracing/ipc/posix_shared_memory_unittest.cc | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/src/tracing/ipc/posix_shared_memory_unittest.cc b/src/tracing/ipc/posix_shared_memory_unittest.cc index b3c59670c..e5589d0e9 100644 --- a/src/tracing/ipc/posix_shared_memory_unittest.cc +++ b/src/tracing/ipc/posix_shared_memory_unittest.cc @@ -16,10 +16,6 @@ #include "src/tracing/ipc/posix_shared_memory.h" -#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) - #include <errno.h> #include <fcntl.h> #include <stdio.h> @@ -47,12 +43,12 @@ bool IsFileDescriptorClosed(int fd) { TEST(PosixSharedMemoryTest, DestructorUnmapsMemory) { PosixSharedMemory::Factory factory; std::unique_ptr<SharedMemory> shm = - factory.CreateSharedMemory(base::GetSysPageSize()); + factory.CreateSharedMemory(base::kPageSize); ASSERT_NE(shm.get(), nullptr); void* const shm_start = shm->start(); const size_t shm_size = shm->size(); ASSERT_NE(nullptr, shm_start); - ASSERT_EQ(base::GetSysPageSize(), shm_size); + ASSERT_EQ(base::kPageSize, shm_size); memcpy(shm_start, "test", 5); ASSERT_TRUE(base::vm_test_utils::IsMapped(shm_start, shm_size)); @@ -63,11 +59,11 @@ TEST(PosixSharedMemoryTest, DestructorUnmapsMemory) { TEST(PosixSharedMemoryTest, DestructorClosesFD) { std::unique_ptr<PosixSharedMemory> shm = - PosixSharedMemory::Create(base::GetSysPageSize()); + PosixSharedMemory::Create(base::kPageSize); ASSERT_NE(shm.get(), nullptr); int fd = shm->fd(); ASSERT_GE(fd, 0); - ASSERT_EQ(static_cast<off_t>(base::GetSysPageSize()), lseek(fd, 0, SEEK_END)); + ASSERT_EQ(static_cast<off_t>(base::kPageSize), lseek(fd, 0, SEEK_END)); shm.reset(); ASSERT_TRUE(IsFileDescriptorClosed(fd)); @@ -76,7 +72,7 @@ TEST(PosixSharedMemoryTest, DestructorClosesFD) { TEST(PosixSharedMemoryTest, AttachToFdWithoutSeals) { base::TempFile tmp_file = base::TempFile::CreateUnlinked(); const int fd_num = tmp_file.fd(); - ASSERT_EQ(0, ftruncate(fd_num, static_cast<off_t>(base::GetSysPageSize()))); + ASSERT_EQ(0, ftruncate(fd_num, base::kPageSize)); ASSERT_EQ(7, base::WriteAll(fd_num, "foobar", 7)); std::unique_ptr<PosixSharedMemory> shm = PosixSharedMemory::AttachToFd( @@ -85,7 +81,7 @@ TEST(PosixSharedMemoryTest, AttachToFdWithoutSeals) { void* const shm_start = shm->start(); const size_t shm_size = shm->size(); ASSERT_NE(nullptr, shm_start); - ASSERT_EQ(base::GetSysPageSize(), shm_size); + ASSERT_EQ(base::kPageSize, shm_size); ASSERT_EQ(0, memcmp("foobar", shm_start, 7)); ASSERT_FALSE(IsFileDescriptorClosed(fd_num)); @@ -98,7 +94,7 @@ TEST(PosixSharedMemoryTest, AttachToFdWithoutSeals) { TEST(PosixSharedMemoryTest, AttachToFdRequiresSeals) { base::TempFile tmp_file = base::TempFile::CreateUnlinked(); const int fd_num = tmp_file.fd(); - ASSERT_EQ(0, ftruncate(fd_num, static_cast<off_t>(base::GetSysPageSize()))); + ASSERT_EQ(0, ftruncate(fd_num, base::kPageSize)); std::unique_ptr<PosixSharedMemory> shm = PosixSharedMemory::AttachToFd(tmp_file.ReleaseFD()); @@ -112,15 +108,12 @@ TEST(PosixSharedMemoryTest, AttachToFdRequiresSeals) { } TEST(PosixSharedMemoryTest, CreateAndMap) { - // Deliberately trying to cover cases where the shm size is smaller than the - // system page size (crbug.com/1116576). - const size_t kLessThanAPage = 2048; std::unique_ptr<PosixSharedMemory> shm = - PosixSharedMemory::Create(kLessThanAPage); + PosixSharedMemory::Create(base::kPageSize); void* const shm_start = shm->start(); const size_t shm_size = shm->size(); ASSERT_NE(shm_start, nullptr); - ASSERT_EQ(shm_size, kLessThanAPage); + ASSERT_EQ(shm_size, base::kPageSize); memcpy(shm_start, "test", 5); ASSERT_TRUE(base::vm_test_utils::IsMapped(shm_start, shm_size)); @@ -148,4 +141,3 @@ TEST(PosixSharedMemoryTest, CreateAndMap) { } // namespace } // namespace perfetto -#endif // OS_LINUX || OS_ANDROID || OS_APPLE |