1 --- base/process/process_metrics.cc.orig 2022-06-17 14:20:10 UTC 2 +++ base/process/process_metrics.cc 3 @@ -17,7 +17,7 @@ namespace base { 4 namespace { 5 6 #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 7 - BUILDFLAG(IS_AIX) 8 + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) 9 int CalculateEventsPerSecond(uint64_t event_count, 10 uint64_t* last_event_count, 11 base::TimeTicks* last_calculated) { 12 @@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() { 13 SystemMetrics system_metrics; 14 15 system_metrics.committed_memory_ = GetSystemCommitCharge(); 16 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) 17 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) 18 GetSystemMemoryInfo(&system_metrics.memory_info_); 19 GetVmStatInfo(&system_metrics.vmstat_info_); 20 GetSystemDiskInfo(&system_metrics.disk_info_); 21 @@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const { 22 Value res(Value::Type::DICTIONARY); 23 24 res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); 25 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) 26 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) 27 Value meminfo = memory_info_.ToValue(); 28 Value vmstat = vmstat_info_.ToValue(); 29 meminfo.MergeDictionary(&vmstat); 30 @@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create 31 #endif // !BUILDFLAG(IS_MAC) 32 } 33 34 -#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) 35 +#if !BUILDFLAG(IS_BSD) || !BUILDFLAG(IS_POSIX) 36 double ProcessMetrics::GetPlatformIndependentCPUUsage() { 37 TimeDelta cumulative_cpu = GetCumulativeCPUUsage(); 38 TimeTicks time = TimeTicks::Now(); 39 @@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { 40 #endif // BUILDFLAG(IS_WIN) 41 42 #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 43 - BUILDFLAG(IS_AIX) 44 + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) 45 int ProcessMetrics::CalculateIdleWakeupsPerSecond( 46 uint64_t absolute_idle_wakeups) { 47 return CalculateEventsPerSecond(absolute_idle_wakeups, 48