Add the UMA metric Memory.Gpu.PhysicalFootprint.MacOS

base/process/process_metrics_mac.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/process/process_metrics.h"
 
 #include <mach/mach.h>
 #include <mach/mach_vm.h>
 #include <mach/shared_region.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/sysctl.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #include "base/mac/mach_logging.h"
 #include "base/mac/scoped_mach_port.h"
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/sys_info.h"
 
 namespace base {
 
 namespace {
 
+#if !defined(MAC_OS_X_VERSION_10_11) || \
+    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11

[Mark Mentovai, 2017/04/21 03:30:00]

Whether task_vm_info is available and correct is an SDK (MAX_ALLOWED) thing, not
a deployment target (MIN_REQUIRED) thing.

[erikchen, 2017/04/21 17:35:32]

Thanks, I seem to have a penchant for mixing the two up.

+// The |phys_footprint| field was introduced in 10.11.
+struct ChromeTaskVMInfo {
+  mach_vm_size_t virtual_size;
+  integer_t region_count;
+  integer_t page_size;
+  mach_vm_size_t resident_size;
+  mach_vm_size_t resident_size_peak;
+  mach_vm_size_t device;
+  mach_vm_size_t device_peak;
+  mach_vm_size_t internal;
+  mach_vm_size_t internal_peak;
+  mach_vm_size_t external;
+  mach_vm_size_t external_peak;
+  mach_vm_size_t reusable;
+  mach_vm_size_t reusable_peak;
+  mach_vm_size_t purgeable_volatile_pmap;
+  mach_vm_size_t purgeable_volatile_resident;
+  mach_vm_size_t purgeable_volatile_virtual;
+  mach_vm_size_t compressed;
+  mach_vm_size_t compressed_peak;
+  mach_vm_size_t compressed_lifetime;
+  mach_vm_size_t phys_footprint;
+};
+mach_msg_type_number_t ChromeTaskVMInfoCount =
+    sizeof(ChromeTaskVMInfo) / sizeof(natural_t);
+#else
+using ChromeTaskVMInfo = task_vm_info;
+mach_msg_type_number_t ChromeTaskVMInfoCount = TASK_VM_INFO_REV1_COUNT;

[zino, 2017/04/23 20:35:45]

Hi

This line is breaking build on 11.x.
I'm not sure but the TASK_VM_INFO_REV1_COUNT is not defined in 11.x.
(https://github.com/practicalswift/osx/blob/c72157565335b24d683dc7316873513ec3...)

+#endif  // MAC_OS_X_VERSION_10_11
+
 bool GetTaskInfo(mach_port_t task, task_basic_info_64* task_info_data) {
   if (task == MACH_PORT_NULL)
     return false;
   mach_msg_type_number_t count = TASK_BASIC_INFO_64_COUNT;
   kern_return_t kr = task_info(task,
                                TASK_BASIC_INFO_64,
                                reinterpret_cast<task_info_t>(task_info_data),
                                &count);
   // Most likely cause for failure: |task| is a zombie.
   return kr == KERN_SUCCESS;
@@ skipping 247 matching lines @@
   usage->mapped = 0;
   usage->image = 0;
 
   ws_usage->priv = task_info_data.resident_size / 1024;
   ws_usage->shareable = 0;
   ws_usage->shared = 0;
 
   return true;
 }
 
+size_t ProcessMetrics::GetPhysicalFootprint() const {
+  if (mac::IsAtMostOS10_10())
+    return 0;
+
+  ChromeTaskVMInfo task_vm_info;
+  mach_msg_type_number_t count = ChromeTaskVMInfoCount;
+  kern_return_t result =
+      task_info(TaskForPid(process_), TASK_VM_INFO,
+                reinterpret_cast<task_info_t>(&task_vm_info), &count);
+  if (result != KERN_SUCCESS)
+    return 0;
+  return task_vm_info.phys_footprint;
+}
+
 #define TIME_VALUE_TO_TIMEVAL(a, r) do {  \
   (r)->tv_sec = (a)->seconds;             \
   (r)->tv_usec = (a)->microseconds;       \
 } while (0)
 
 double ProcessMetrics::GetCPUUsage() {
   mach_port_t task = TaskForPid(process_);
   if (task == MACH_PORT_NULL)
     return 0;
 
@@ skipping 147 matching lines @@
       saturated_cast<int>(PAGE_SIZE / 1024 * vm_info.speculative_count);
   meminfo->file_backed =
       saturated_cast<int>(PAGE_SIZE / 1024 * vm_info.external_page_count);
   meminfo->purgeable =
       saturated_cast<int>(PAGE_SIZE / 1024 * vm_info.purgeable_count);
 
   return true;
 }
 
 }  // namespace base