| Index: components/tracing/process_metrics_memory_dump_provider_unittest.cc
|
| diff --git a/base/trace_event/process_memory_maps_dump_provider_unittest.cc b/components/tracing/process_metrics_memory_dump_provider_unittest.cc
|
| similarity index 69%
|
| rename from base/trace_event/process_memory_maps_dump_provider_unittest.cc
|
| rename to components/tracing/process_metrics_memory_dump_provider_unittest.cc
|
| index 624f96fcb0a18517b645eada3b29ddec04537680..62e8fd61bc9e294533b2f25d09e320d79bb10e0b 100644
|
| --- a/base/trace_event/process_memory_maps_dump_provider_unittest.cc
|
| +++ b/components/tracing/process_metrics_memory_dump_provider_unittest.cc
|
| @@ -2,19 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/trace_event/process_memory_maps_dump_provider.h"
|
| +#include "components/tracing/process_metrics_memory_dump_provider.h"
|
|
|
| #include <stdint.h>
|
|
|
| #include "base/files/file_util.h"
|
| #include "base/trace_event/process_memory_dump.h"
|
| #include "base/trace_event/process_memory_maps.h"
|
| +#include "base/trace_event/process_memory_totals.h"
|
| #include "base/trace_event/trace_event_argument.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace base {
|
| -namespace trace_event {
|
| +namespace tracing {
|
|
|
| +#if defined(OS_LINUX) || defined(OS_ANDROID)
|
| namespace {
|
| const char kTestSmaps1[] =
|
| "00400000-004be000 r-xp 00000000 fc:01 1234 /file/1\n"
|
| @@ -105,8 +106,8 @@ const char kTestSmaps2[] =
|
| "VmFlags: rd wr mr mw me ac sd\n";
|
|
|
| void CreateAndSetSmapsFileForTesting(const char* smaps_string,
|
| - ScopedFILE& file) {
|
| - FilePath temp_path;
|
| + base::ScopedFILE& file) {
|
| + base::FilePath temp_path;
|
| FILE* temp_file = CreateAndOpenTemporaryFile(&temp_path);
|
| file.reset(temp_file);
|
| ASSERT_TRUE(temp_file);
|
| @@ -116,28 +117,69 @@ void CreateAndSetSmapsFileForTesting(const char* smaps_string,
|
| }
|
|
|
| } // namespace
|
| +#endif // defined(OS_LINUX) || defined(OS_ANDROID)
|
|
|
| -TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) {
|
| - const uint32_t kProtR = ProcessMemoryMaps::VMRegion::kProtectionFlagsRead;
|
| - const uint32_t kProtW = ProcessMemoryMaps::VMRegion::kProtectionFlagsWrite;
|
| - const uint32_t kProtX = ProcessMemoryMaps::VMRegion::kProtectionFlagsExec;
|
| - const MemoryDumpArgs dump_args = {MemoryDumpLevelOfDetail::DETAILED};
|
| +TEST(ProcessMetricsMemoryDumpProviderTest, DumpRSS) {
|
| + const base::trace_event::MemoryDumpArgs high_detail_args = {
|
| + base::trace_event::MemoryDumpLevelOfDetail::DETAILED};
|
| + scoped_ptr<ProcessMetricsMemoryDumpProvider> pmtdp(
|
| + new ProcessMetricsMemoryDumpProvider(base::kNullProcessId));
|
| + scoped_ptr<base::trace_event::ProcessMemoryDump> pmd_before(
|
| + new base::trace_event::ProcessMemoryDump(nullptr));
|
| + scoped_ptr<base::trace_event::ProcessMemoryDump> pmd_after(
|
| + new base::trace_event::ProcessMemoryDump(nullptr));
|
|
|
| - auto pmmdp = ProcessMemoryMapsDumpProvider::GetInstance();
|
| + ProcessMetricsMemoryDumpProvider::rss_bytes_for_testing = 1024;
|
| + pmtdp->OnMemoryDump(high_detail_args, pmd_before.get());
|
| +
|
| + // Pretend that the RSS of the process increased of +1M.
|
| + const size_t kAllocSize = 1048576;
|
| + ProcessMetricsMemoryDumpProvider::rss_bytes_for_testing += kAllocSize;
|
| +
|
| + pmtdp->OnMemoryDump(high_detail_args, pmd_after.get());
|
| +
|
| + ProcessMetricsMemoryDumpProvider::rss_bytes_for_testing = 0;
|
| +
|
| + ASSERT_TRUE(pmd_before->has_process_totals());
|
| + ASSERT_TRUE(pmd_after->has_process_totals());
|
| +
|
| + const uint64_t rss_before =
|
| + pmd_before->process_totals()->resident_set_bytes();
|
| + const uint64_t rss_after = pmd_after->process_totals()->resident_set_bytes();
|
| +
|
| + EXPECT_NE(0U, rss_before);
|
| + EXPECT_NE(0U, rss_after);
|
| +
|
| + EXPECT_EQ(rss_after - rss_before, kAllocSize);
|
| +}
|
| +
|
| +#if defined(OS_LINUX) || defined(OS_ANDROID)
|
| +TEST(ProcessMetricsMemoryDumpProviderTest, ParseProcSmaps) {
|
| + const uint32_t kProtR =
|
| + base::trace_event::ProcessMemoryMaps::VMRegion::kProtectionFlagsRead;
|
| + const uint32_t kProtW =
|
| + base::trace_event::ProcessMemoryMaps::VMRegion::kProtectionFlagsWrite;
|
| + const uint32_t kProtX =
|
| + base::trace_event::ProcessMemoryMaps::VMRegion::kProtectionFlagsExec;
|
| + const base::trace_event::MemoryDumpArgs dump_args = {
|
| + base::trace_event::MemoryDumpLevelOfDetail::DETAILED};
|
| +
|
| + scoped_ptr<ProcessMetricsMemoryDumpProvider> pmmdp(
|
| + new ProcessMetricsMemoryDumpProvider(base::kNullProcessId));
|
|
|
| // Emulate an empty /proc/self/smaps.
|
| - ProcessMemoryDump pmd_invalid(nullptr /* session_state */);
|
| - ScopedFILE empty_file(OpenFile(FilePath("/dev/null"), "r"));
|
| + base::trace_event::ProcessMemoryDump pmd_invalid(nullptr /* session_state */);
|
| + base::ScopedFILE empty_file(OpenFile(base::FilePath("/dev/null"), "r"));
|
| ASSERT_TRUE(empty_file.get());
|
| - ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = empty_file.get();
|
| + ProcessMetricsMemoryDumpProvider::proc_smaps_for_testing = empty_file.get();
|
| pmmdp->OnMemoryDump(dump_args, &pmd_invalid);
|
| ASSERT_FALSE(pmd_invalid.has_process_mmaps());
|
|
|
| // Parse the 1st smaps file.
|
| - ProcessMemoryDump pmd_1(nullptr /* session_state */);
|
| - ScopedFILE temp_file1;
|
| + base::trace_event::ProcessMemoryDump pmd_1(nullptr /* session_state */);
|
| + base::ScopedFILE temp_file1;
|
| CreateAndSetSmapsFileForTesting(kTestSmaps1, temp_file1);
|
| - ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = temp_file1.get();
|
| + ProcessMetricsMemoryDumpProvider::proc_smaps_for_testing = temp_file1.get();
|
| pmmdp->OnMemoryDump(dump_args, &pmd_1);
|
| ASSERT_TRUE(pmd_1.has_process_mmaps());
|
| const auto& regions_1 = pmd_1.process_mmaps()->vm_regions();
|
| @@ -166,10 +208,10 @@ TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) {
|
| EXPECT_EQ(0 * 1024UL, regions_1[1].byte_stats_swapped);
|
|
|
| // Parse the 2nd smaps file.
|
| - ProcessMemoryDump pmd_2(nullptr /* session_state */);
|
| - ScopedFILE temp_file2;
|
| + base::trace_event::ProcessMemoryDump pmd_2(nullptr /* session_state */);
|
| + base::ScopedFILE temp_file2;
|
| CreateAndSetSmapsFileForTesting(kTestSmaps2, temp_file2);
|
| - ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = temp_file2.get();
|
| + ProcessMetricsMemoryDumpProvider::proc_smaps_for_testing = temp_file2.get();
|
| pmmdp->OnMemoryDump(dump_args, &pmd_2);
|
| ASSERT_TRUE(pmd_2.has_process_mmaps());
|
| const auto& regions_2 = pmd_2.process_mmaps()->vm_regions();
|
| @@ -185,6 +227,6 @@ TEST(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps) {
|
| EXPECT_EQ(4 * 1024UL, regions_2[0].byte_stats_private_dirty_resident);
|
| EXPECT_EQ(0 * 1024UL, regions_2[0].byte_stats_swapped);
|
| }
|
| +#endif // defined(OS_LINUX) || defined(OS_ANDROID)
|
|
|
| -} // namespace trace_event
|
| -} // namespace base
|
| +} // namespace tracing
|
|
|