Skip to content

GitLab

T
tangled
Commit 912563e6 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot
Browse files
Options

Clean up / improve Linux process metrics code. 

- Check for missing fields in base::ParseProcVmstat() and return false
  in that case. Add unit tests to test for failure.
- Change SystemMetricsTests to use const char arrays instead of
  std::string when possible.
- Refactor a block of ChromeOS-only code in base::GetSystemMemoryInfo()
  into its own function.
- Clang format the modified files.

Change-Id: Ie70695d7a8efdfe1d951a980bebc21133b4b2da2
Reviewed-on: https://chromium-review.googlesource.com/578789Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488271}
parent fce13371
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 212 deletions
base/process/process_metrics_linux.cc
View file @ 912563e6
......@@ -164,6 +164,44 @@ int GetProcessCPU(pid_t pid) {
return total_cpu;
}
#if defined(OS_CHROMEOS)
// Report on Chrome OS GEM object graphics memory. /run/debugfs_gpu is a
// bind mount into /sys/kernel/debug and synchronously reading the in-memory
// files in /sys is fast.
void ReadChromeOSGraphicsMemory(SystemMemoryInfoKB* meminfo) {
#if defined(ARCH_CPU_ARM_FAMILY)
FilePath geminfo_file("/run/debugfs_gpu/exynos_gem_objects");
#else
FilePath geminfo_file("/run/debugfs_gpu/i915_gem_objects");
#endif
std::string geminfo_data;
meminfo->gem_objects = -1;
meminfo->gem_size = -1;
if (ReadFileToString(geminfo_file, &geminfo_data)) {
int gem_objects = -1;
long long gem_size = -1;
int num_res = sscanf(geminfo_data.c_str(), "%d objects, %lld bytes",
&gem_objects, &gem_size);
if (num_res == 2) {
meminfo->gem_objects = gem_objects;
meminfo->gem_size = gem_size;
}
}
#if defined(ARCH_CPU_ARM_FAMILY)
// Incorporate Mali graphics memory if present.
FilePath mali_memory_file("/sys/class/misc/mali0/device/memory");
std::string mali_memory_data;
if (ReadFileToString(mali_memory_file, &mali_memory_data)) {
long long mali_size = -1;
int num_res = sscanf(mali_memory_data.c_str(), "%lld bytes", &mali_size);
if (num_res == 1)
meminfo->gem_size += mali_size;
}
#endif // defined(ARCH_CPU_ARM_FAMILY)
}
#endif // defined(OS_CHROMEOS)
} // namespace
// static
......@@ -670,6 +708,9 @@ bool ParseProcVmstat(StringPiece vmstat_data, SystemMemoryInfoKB* meminfo) {
//
// Iterate through the whole file because the position of the
// fields are dependent on the kernel version and configuration.
bool has_pswpin = false;
bool has_pswpout = false;
bool has_pgmajfault = false;
for (const StringPiece& line : SplitStringPiece(
vmstat_data, "\n", KEEP_WHITESPACE, SPLIT_WANT_NONEMPTY)) {
std::vector<StringPiece> tokens = SplitStringPiece(
......@@ -683,14 +724,22 @@ bool ParseProcVmstat(StringPiece vmstat_data, SystemMemoryInfoKB* meminfo) {
if (tokens[0] == "pswpin") {
meminfo->pswpin = val;
DCHECK(!has_pswpin);
has_pswpin = true;
} else if (tokens[0] == "pswpout") {
meminfo->pswpout = val;
DCHECK(!has_pswpout);
has_pswpout = true;
} else if (tokens[0] == "pgmajfault") {
meminfo->pgmajfault = val;
DCHECK(!has_pgmajfault);
has_pgmajfault = true;
}
if (has_pswpin && has_pswpout && has_pgmajfault)
return true;
}
return true;
return false;
}
bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
......@@ -711,41 +760,8 @@ bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
}
#if defined(OS_CHROMEOS)
// Report on Chrome OS GEM object graphics memory. /run/debugfs_gpu is a
// bind mount into /sys/kernel/debug and synchronously reading the in-memory
// files in /sys is fast.
#if defined(ARCH_CPU_ARM_FAMILY)
FilePath geminfo_file("/run/debugfs_gpu/exynos_gem_objects");
#else
FilePath geminfo_file("/run/debugfs_gpu/i915_gem_objects");
ReadChromeOSGraphicsMemory(meminfo);
#endif
std::string geminfo_data;
meminfo->gem_objects = -1;
meminfo->gem_size = -1;
if (ReadFileToString(geminfo_file, &geminfo_data)) {
int gem_objects = -1;
long long gem_size = -1;
int num_res = sscanf(geminfo_data.c_str(),
"%d objects, %lld bytes",
&gem_objects, &gem_size);
if (num_res == 2) {
meminfo->gem_objects = gem_objects;
meminfo->gem_size = gem_size;
}
}
#if defined(ARCH_CPU_ARM_FAMILY)
// Incorporate Mali graphics memory if present.
FilePath mali_memory_file("/sys/class/misc/mali0/device/memory");
std::string mali_memory_data;
if (ReadFileToString(mali_memory_file, &mali_memory_data)) {
long long mali_size = -1;
int num_res = sscanf(mali_memory_data.c_str(), "%lld bytes", &mali_size);
if (num_res == 1)
meminfo->gem_size += mali_size;
}
#endif // defined(ARCH_CPU_ARM_FAMILY)
#endif // defined(OS_CHROMEOS)
FilePath vmstat_file("/proc/vmstat");
std::string vmstat_data;
......
base/process/process_metrics_unittest.cc
View file @ 912563e6
......@@ -95,14 +95,14 @@ TEST_F(SystemMetricsTest, LockedBytes) {
#if defined(OS_LINUX) || defined(OS_ANDROID)
TEST_F(SystemMetricsTest, IsValidDiskName) {
std::string invalid_input1 = "";
std::string invalid_input2 = "s";
std::string invalid_input3 = "sdz+";
std::string invalid_input4 = "hda0";
std::string invalid_input5 = "mmcbl";
std::string invalid_input6 = "mmcblka";
std::string invalid_input7 = "mmcblkb";
std::string invalid_input8 = "mmmblk0";
const char invalid_input1[] = "";
const char invalid_input2[] = "s";
const char invalid_input3[] = "sdz+";
const char invalid_input4[] = "hda0";
const char invalid_input5[] = "mmcbl";
const char invalid_input6[] = "mmcblka";
const char invalid_input7[] = "mmcblkb";
const char invalid_input8[] = "mmmblk0";
EXPECT_FALSE(IsValidDiskName(invalid_input1));
EXPECT_FALSE(IsValidDiskName(invalid_input2));
......@@ -113,11 +113,11 @@ TEST_F(SystemMetricsTest, IsValidDiskName) {
EXPECT_FALSE(IsValidDiskName(invalid_input7));
EXPECT_FALSE(IsValidDiskName(invalid_input8));
std::string valid_input1 = "sda";
std::string valid_input2 = "sdaaaa";
std::string valid_input3 = "hdz";
std::string valid_input4 = "mmcblk0";
std::string valid_input5 = "mmcblk999";
const char valid_input1[] = "sda";
const char valid_input2[] = "sdaaaa";
const char valid_input3[] = "hdz";
const char valid_input4[] = "mmcblk0";
const char valid_input5[] = "mmcblk999";
EXPECT_TRUE(IsValidDiskName(valid_input1));
EXPECT_TRUE(IsValidDiskName(valid_input2));
......@@ -127,88 +127,88 @@ TEST_F(SystemMetricsTest, IsValidDiskName) {
}
TEST_F(SystemMetricsTest, ParseMeminfo) {
struct SystemMemoryInfoKB meminfo;
std::string invalid_input1 = "abc";
std::string invalid_input2 = "MemTotal:";
SystemMemoryInfoKB meminfo;
const char invalid_input1[] = "abc";
const char invalid_input2[] = "MemTotal:";
// Partial file with no MemTotal
std::string invalid_input3 =
"MemFree: 3913968 kB\n"
"Buffers: 2348340 kB\n"
"Cached: 49071596 kB\n"
"SwapCached: 12 kB\n"
"Active: 36393900 kB\n"
"Inactive: 21221496 kB\n"
"Active(anon): 5674352 kB\n"
"Inactive(anon): 633992 kB\n";
const char invalid_input3[] =
"MemFree: 3913968 kB\n"
"Buffers: 2348340 kB\n"
"Cached: 49071596 kB\n"
"SwapCached: 12 kB\n"
"Active: 36393900 kB\n"
"Inactive: 21221496 kB\n"
"Active(anon): 5674352 kB\n"
"Inactive(anon): 633992 kB\n";
EXPECT_FALSE(ParseProcMeminfo(invalid_input1, &meminfo));
EXPECT_FALSE(ParseProcMeminfo(invalid_input2, &meminfo));
EXPECT_FALSE(ParseProcMeminfo(invalid_input3, &meminfo));
std::string valid_input1 =
"MemTotal: 3981504 kB\n"
"MemFree: 140764 kB\n"
"MemAvailable: 535413 kB\n"
"Buffers: 116480 kB\n"
"Cached: 406160 kB\n"
"SwapCached: 21304 kB\n"
"Active: 3152040 kB\n"
"Inactive: 472856 kB\n"
"Active(anon): 2972352 kB\n"
"Inactive(anon): 270108 kB\n"
"Active(file): 179688 kB\n"
"Inactive(file): 202748 kB\n"
"Unevictable: 0 kB\n"
"Mlocked: 0 kB\n"
"SwapTotal: 5832280 kB\n"
"SwapFree: 3672368 kB\n"
"Dirty: 184 kB\n"
"Writeback: 0 kB\n"
"AnonPages: 3101224 kB\n"
"Mapped: 142296 kB\n"
"Shmem: 140204 kB\n"
"Slab: 54212 kB\n"
"SReclaimable: 30936 kB\n"
"SUnreclaim: 23276 kB\n"
"KernelStack: 2464 kB\n"
"PageTables: 24812 kB\n"
"NFS_Unstable: 0 kB\n"
"Bounce: 0 kB\n"
"WritebackTmp: 0 kB\n"
"CommitLimit: 7823032 kB\n"
"Committed_AS: 7973536 kB\n"
"VmallocTotal: 34359738367 kB\n"
"VmallocUsed: 375940 kB\n"
"VmallocChunk: 34359361127 kB\n"
"DirectMap4k: 72448 kB\n"
"DirectMap2M: 4061184 kB\n";
const char valid_input1[] =
"MemTotal: 3981504 kB\n"
"MemFree: 140764 kB\n"
"MemAvailable: 535413 kB\n"
"Buffers: 116480 kB\n"
"Cached: 406160 kB\n"
"SwapCached: 21304 kB\n"
"Active: 3152040 kB\n"
"Inactive: 472856 kB\n"
"Active(anon): 2972352 kB\n"
"Inactive(anon): 270108 kB\n"
"Active(file): 179688 kB\n"
"Inactive(file): 202748 kB\n"
"Unevictable: 0 kB\n"
"Mlocked: 0 kB\n"
"SwapTotal: 5832280 kB\n"
"SwapFree: 3672368 kB\n"
"Dirty: 184 kB\n"
"Writeback: 0 kB\n"
"AnonPages: 3101224 kB\n"
"Mapped: 142296 kB\n"
"Shmem: 140204 kB\n"
"Slab: 54212 kB\n"
"SReclaimable: 30936 kB\n"
"SUnreclaim: 23276 kB\n"
"KernelStack: 2464 kB\n"
"PageTables: 24812 kB\n"
"NFS_Unstable: 0 kB\n"
"Bounce: 0 kB\n"
"WritebackTmp: 0 kB\n"
"CommitLimit: 7823032 kB\n"
"Committed_AS: 7973536 kB\n"
"VmallocTotal: 34359738367 kB\n"
"VmallocUsed: 375940 kB\n"
"VmallocChunk: 34359361127 kB\n"
"DirectMap4k: 72448 kB\n"
"DirectMap2M: 4061184 kB\n";
// output from a much older kernel where the Active and Inactive aren't
// broken down into anon and file and Huge Pages are enabled
std::string valid_input2 =
"MemTotal: 255908 kB\n"
"MemFree: 69936 kB\n"
"Buffers: 15812 kB\n"
"Cached: 115124 kB\n"
"SwapCached: 0 kB\n"
"Active: 92700 kB\n"
"Inactive: 63792 kB\n"
"HighTotal: 0 kB\n"
"HighFree: 0 kB\n"
"LowTotal: 255908 kB\n"
"LowFree: 69936 kB\n"
"SwapTotal: 524280 kB\n"
"SwapFree: 524200 kB\n"
"Dirty: 4 kB\n"
"Writeback: 0 kB\n"
"Mapped: 42236 kB\n"
"Slab: 25912 kB\n"
"Committed_AS: 118680 kB\n"
"PageTables: 1236 kB\n"
"VmallocTotal: 3874808 kB\n"
"VmallocUsed: 1416 kB\n"
"VmallocChunk: 3872908 kB\n"
"HugePages_Total: 0\n"
"HugePages_Free: 0\n"
"Hugepagesize: 4096 kB\n";
const char valid_input2[] =
"MemTotal: 255908 kB\n"
"MemFree: 69936 kB\n"
"Buffers: 15812 kB\n"
"Cached: 115124 kB\n"
"SwapCached: 0 kB\n"
"Active: 92700 kB\n"
"Inactive: 63792 kB\n"
"HighTotal: 0 kB\n"
"HighFree: 0 kB\n"
"LowTotal: 255908 kB\n"
"LowFree: 69936 kB\n"
"SwapTotal: 524280 kB\n"
"SwapFree: 524200 kB\n"
"Dirty: 4 kB\n"
"Writeback: 0 kB\n"
"Mapped: 42236 kB\n"
"Slab: 25912 kB\n"
"Committed_AS: 118680 kB\n"
"PageTables: 1236 kB\n"
"VmallocTotal: 3874808 kB\n"
"VmallocUsed: 1416 kB\n"
"VmallocChunk: 3872908 kB\n"
"HugePages_Total: 0\n"
"HugePages_Free: 0\n"
"Hugepagesize: 4096 kB\n";
EXPECT_TRUE(ParseProcMeminfo(valid_input1, &meminfo));
EXPECT_EQ(meminfo.total, 3981504);
......@@ -249,96 +249,96 @@ TEST_F(SystemMetricsTest, ParseMeminfo) {
}
TEST_F(SystemMetricsTest, ParseVmstat) {
struct SystemMemoryInfoKB meminfo;
SystemMemoryInfoKB meminfo;
// part of vmstat from a 3.2 kernel with numa enabled
std::string valid_input1 =
"nr_free_pages 905104\n"
"nr_inactive_anon 142478"
"nr_active_anon 1520046\n"
"nr_inactive_file 4481001\n"
"nr_active_file 8313439\n"
"nr_unevictable 5044\n"
"nr_mlock 5044\n"
"nr_anon_pages 1633780\n"
"nr_mapped 104742\n"
"nr_file_pages 12828218\n"
"nr_dirty 245\n"
"nr_writeback 0\n"
"nr_slab_reclaimable 831609\n"
"nr_slab_unreclaimable 41164\n"
"nr_page_table_pages 31470\n"
"nr_kernel_stack 1735\n"
"nr_unstable 0\n"
"nr_bounce 0\n"
"nr_vmscan_write 406\n"
"nr_vmscan_immediate_reclaim 281\n"
"nr_writeback_temp 0\n"
"nr_isolated_anon 0\n"
"nr_isolated_file 0\n"
"nr_shmem 28820\n"
"nr_dirtied 84674644\n"
"nr_written 75307109\n"
"nr_anon_transparent_hugepages 0\n"
"nr_dirty_threshold 1536206\n"
"nr_dirty_background_threshold 768103\n"
"pgpgin 30777108\n"
"pgpgout 319023278\n"
"pswpin 179\n"
"pswpout 406\n"
"pgalloc_dma 0\n"
"pgalloc_dma32 20833399\n"
"pgalloc_normal 1622609290\n"
"pgalloc_movable 0\n"
"pgfree 1644355583\n"
"pgactivate 75391882\n"
"pgdeactivate 4121019\n"
"pgfault 2542879679\n"
"pgmajfault 487192\n";
std::string valid_input2 =
"nr_free_pages 180125\n"
"nr_inactive_anon 51\n"
"nr_active_anon 38832\n"
"nr_inactive_file 50171\n"
"nr_active_file 47510\n"
"nr_unevictable 0\n"
"nr_mlock 0\n"
"nr_anon_pages 38825\n"
"nr_mapped 24043\n"
"nr_file_pages 97733\n"
"nr_dirty 0\n"
"nr_writeback 0\n"
"nr_slab_reclaimable 4032\n"
"nr_slab_unreclaimable 2848\n"
"nr_page_table_pages 1505\n"
"nr_kernel_stack 626\n"
"nr_unstable 0\n"
"nr_bounce 0\n"
"nr_vmscan_write 0\n"
"nr_vmscan_immediate_reclaim 0\n"
"nr_writeback_temp 0\n"
"nr_isolated_anon 0\n"
"nr_isolated_file 0\n"
"nr_shmem 58\n"
"nr_dirtied 435358\n"
"nr_written 401258\n"
"nr_anon_transparent_hugepages 0\n"
"nr_dirty_threshold 18566\n"
"nr_dirty_background_threshold 4641\n"
"pgpgin 299464\n"
"pgpgout 2437788\n"
"pswpin 12\n"
"pswpout 901\n"
"pgalloc_normal 144213030\n"
"pgalloc_high 164501274\n"
"pgalloc_movable 0\n"
"pgfree 308894908\n"
"pgactivate 239320\n"
"pgdeactivate 1\n"
"pgfault 716044601\n"
"pgmajfault 2023\n"
"pgrefill_normal 0\n"
"pgrefill_high 0\n"
"pgrefill_movable 0\n";
const char valid_input1[] =
"nr_free_pages 905104\n"
"nr_inactive_anon 142478"
"nr_active_anon 1520046\n"
"nr_inactive_file 4481001\n"
"nr_active_file 8313439\n"
"nr_unevictable 5044\n"
"nr_mlock 5044\n"
"nr_anon_pages 1633780\n"
"nr_mapped 104742\n"
"nr_file_pages 12828218\n"
"nr_dirty 245\n"
"nr_writeback 0\n"
"nr_slab_reclaimable 831609\n"
"nr_slab_unreclaimable 41164\n"
"nr_page_table_pages 31470\n"
"nr_kernel_stack 1735\n"
"nr_unstable 0\n"
"nr_bounce 0\n"
"nr_vmscan_write 406\n"
"nr_vmscan_immediate_reclaim 281\n"
"nr_writeback_temp 0\n"
"nr_isolated_anon 0\n"
"nr_isolated_file 0\n"
"nr_shmem 28820\n"
"nr_dirtied 84674644\n"
"nr_written 75307109\n"
"nr_anon_transparent_hugepages 0\n"
"nr_dirty_threshold 1536206\n"
"nr_dirty_background_threshold 768103\n"
"pgpgin 30777108\n"
"pgpgout 319023278\n"
"pswpin 179\n"
"pswpout 406\n"
"pgalloc_dma 0\n"
"pgalloc_dma32 20833399\n"
"pgalloc_normal 1622609290\n"
"pgalloc_movable 0\n"
"pgfree 1644355583\n"
"pgactivate 75391882\n"
"pgdeactivate 4121019\n"
"pgfault 2542879679\n"
"pgmajfault 487192\n";
const char valid_input2[] =
"nr_free_pages 180125\n"
"nr_inactive_anon 51\n"
"nr_active_anon 38832\n"
"nr_inactive_file 50171\n"
"nr_active_file 47510\n"
"nr_unevictable 0\n"
"nr_mlock 0\n"
"nr_anon_pages 38825\n"
"nr_mapped 24043\n"
"nr_file_pages 97733\n"
"nr_dirty 0\n"
"nr_writeback 0\n"
"nr_slab_reclaimable 4032\n"
"nr_slab_unreclaimable 2848\n"
"nr_page_table_pages 1505\n"
"nr_kernel_stack 626\n"
"nr_unstable 0\n"
"nr_bounce 0\n"
"nr_vmscan_write 0\n"
"nr_vmscan_immediate_reclaim 0\n"
"nr_writeback_temp 0\n"
"nr_isolated_anon 0\n"
"nr_isolated_file 0\n"
"nr_shmem 58\n"
"nr_dirtied 435358\n"
"nr_written 401258\n"
"nr_anon_transparent_hugepages 0\n"
"nr_dirty_threshold 18566\n"
"nr_dirty_background_threshold 4641\n"
"pgpgin 299464\n"
"pgpgout 2437788\n"
"pswpin 12\n"
"pswpout 901\n"
"pgalloc_normal 144213030\n"
"pgalloc_high 164501274\n"
"pgalloc_movable 0\n"
"pgfree 308894908\n"
"pgactivate 239320\n"
"pgdeactivate 1\n"
"pgfault 716044601\n"
"pgmajfault 2023\n"
"pgrefill_normal 0\n"
"pgrefill_high 0\n"
"pgrefill_movable 0\n";
EXPECT_TRUE(ParseProcVmstat(valid_input1, &meminfo));
EXPECT_EQ(179LU, meminfo.pswpin);
EXPECT_EQ(406LU, meminfo.pswpout);
......@@ -347,6 +347,13 @@ TEST_F(SystemMetricsTest, ParseVmstat) {
EXPECT_EQ(12LU, meminfo.pswpin);
EXPECT_EQ(901LU, meminfo.pswpout);
EXPECT_EQ(2023LU, meminfo.pgmajfault);
const char missing_pgmajfault_input[] =
"pswpin 12\n"
"pswpout 901\n";
EXPECT_FALSE(ParseProcVmstat(missing_pgmajfault_input, &meminfo));
const char empty_input[] = "";
EXPECT_FALSE(ParseProcVmstat(empty_input, &meminfo));
}
#endif // defined(OS_LINUX) || defined(OS_ANDROID)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment