1 files changed, 15 insertions, 12 deletions
diff --git a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
index 7cf86d373978..70b2aa744c6c 100644
--- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_openbsd.cc.orig	2022-04-21 18:48:31 UTC
+--- base/process/process_metrics_openbsd.cc.orig	2022-09-24 10:57:32 UTC
 +++ base/process/process_metrics_openbsd.cc
 @@ -6,14 +6,23 @@
  
@@ -24,17 +24,18 @@
  // static
  std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
      ProcessHandle process) {
-@@ -24,49 +33,24 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
+@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
    return false;
  }
  
 -static int GetProcessCPU(pid_t pid) {
-+double ProcessMetrics::GetPlatformIndependentCPUUsage() {
++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
    struct kinfo_proc info;
 -  size_t length;
 -  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
 -                sizeof(struct kinfo_proc), 0 };
 +  size_t length = sizeof(struct kinfo_proc);
++  struct timeval tv;
  
 -  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
 -    return -1;
@@ -45,11 +46,12 @@
 -
    if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
 -    return 0;
-+    return 0.0;
++    return TimeDelta();
  
 -  return info.p_pctcpu;
-+  return static_cast<double>((info.p_pctcpu * 100.0) / FSCALE);
- }
+-}
++  tv.tv_sec = info.p_rtime_sec;
++  tv.tv_usec = info.p_rtime_usec;
  
 -double ProcessMetrics::GetPlatformIndependentCPUUsage() {
 -  TimeTicks time = TimeTicks::Now();
@@ -66,13 +68,14 @@
 -  double percentage = static_cast<double>((cpu * 100.0) / FSCALE);
 -
 -  return percentage;
--}
--
- TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
-   NOTREACHED();
-   return TimeDelta();
++  return Microseconds(TimeValToMicroseconds(tv));
  }
  
+-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
+-  NOTREACHED();
+-  return TimeDelta();
+-}
+-
 -ProcessMetrics::ProcessMetrics(ProcessHandle process)
 -    : process_(process),
 -      last_cpu_(0) {}
@@ -80,7 +83,7 @@
  size_t GetSystemCommitCharge() {
    int mib[] = { CTL_VM, VM_METER };
    int pagesize;
-@@ -84,6 +68,129 @@ size_t GetSystemCommitCharge() {
+@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() {
    pagesize = getpagesize();
  
    return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);