chromium/src
0
Fork 0
Code Activity

[tracing] Use GlobalMemoryStatusEx in SystemMetricsSampler

Browse Source 
Based on previous experience of using GetPerformanceInfo in
SystemMemoryPressureEvaluator, it can hang. Microsoft engineers also
indicated that it's not efficient. See crrev.com/c/6172368

Fixed: 407562408
Change-Id: I45acbdd7c4026ae67545c42d6b7789f82482e290
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6420148
Reviewed-by: Francois Pierre Doray <fdoray@chromium.org>
Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1442297}
This commit is contained in:
Etienne Pierre-doray
2025-04-03 11:18:06 -07:00
committed by Chromium LUCI CQ
parent 94d833796e
commit be93deea81
1 changed files with 10 additions and 20 deletions

30
services/tracing/public/cpp/system_metrics_sampler.cc

@ -30,14 +30,6 @@ namespace {
constexpr base::TimeDelta kDefaultSamplingInterval = base::Seconds(5);
#if BUILDFLAG(IS_WIN)
// Returns memory in bytes from pages count.
size_t GetTotalMemory(size_t num_pages, size_t page_size) {
return base::ValueOrDefaultForType<size_t>(
base::CheckedNumeric(num_pages) * page_size, 0U);
}
#endif // BUILDFLAG(IS_WIN)
} // namespace
void SystemMetricsSampler::Register(bool system_wide) {
@ -117,27 +109,25 @@ void SystemMetricsSampler::SystemSampler::SampleSystemMetrics() {
#if BUILDFLAG(IS_WIN)
void SystemMetricsSampler::SystemSampler::SampleMemoryMetrics() {
PERFORMANCE_INFORMATION performance_info = {};
performance_info.cb = sizeof(performance_info);
bool get_performance_info_result =
::GetPerformanceInfo(&performance_info, sizeof(performance_info));
if (!get_performance_info_result) {
MEMORYSTATUSEX mem_status = {};
mem_status.dwLength = sizeof(mem_status);
if (!::GlobalMemoryStatusEx(&mem_status)) {
return;
}
TRACE_COUNTER(
TRACE_DISABLED_BY_DEFAULT("system_metrics"),
perfetto::CounterTrack("CommitMemoryLimit", perfetto::Track::Global(0)),
GetTotalMemory(performance_info.CommitLimit, performance_info.PageSize));
TRACE_COUNTER(
TRACE_DISABLED_BY_DEFAULT("system_metrics"),
perfetto::CounterTrack("CommitMemoryTotal", perfetto::Track::Global(0)),
GetTotalMemory(performance_info.CommitTotal, performance_info.PageSize));
mem_status.ullTotalPageFile);
TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"),
perfetto::CounterTrack("CommitMemoryAvailable",
perfetto::Track::Global(0)),
mem_status.ullAvailPageFile);
TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"),
perfetto::CounterTrack("AvailablePhysicalMemory",
perfetto::Track::Global(0)),
GetTotalMemory(performance_info.PhysicalAvailable,
performance_info.PageSize));
mem_status.ullAvailPhys);
}
#endif // BUILDFLAG(IS_WIN)