Move malloc/partition_alloc memory usage functions to base

base/process/process_metrics.cc

 // Copyright 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 <utility>
 
+#include "base/allocator/partition_allocator/partition_alloc.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "build/build_config.h"
 
+#if defined(OS_MACOSX)

[Primiano Tucci (use gerrit), 2017/06/14 12:10:32]

looks like you could split this file in process_metrics_win.cc and
process_metrics_posix.cc instead of putting in the generic .cc and then #ifdef

[keishi, 2017/06/14 13:21:39]

Done.

+#include <malloc/malloc.h>
+#else
+#include <malloc.h>
+#endif
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
 namespace base {
 
 SystemMemoryInfoKB::SystemMemoryInfoKB() = default;
 
 SystemMemoryInfoKB::SystemMemoryInfoKB(const SystemMemoryInfoKB& other) =
     default;
 
 SystemMetrics::SystemMetrics() {
   committed_memory_ = 0;
 }
@@ skipping 71 matching lines @@
   // dropping down into floating point).
   return (wakeups_delta_for_ms + time_delta / 2) / time_delta;
 }
 #else
 int ProcessMetrics::GetIdleWakeupsPerSecond() {
   NOTIMPLEMENTED();  // http://crbug.com/120488
   return 0;
 }
 #endif  // defined(OS_MACOSX) || defined(OS_LINUX)
 
+// TODO(tasak): Replace the following GetMallocUsage() with memory-infra
+// when it is possible to run memory-infra without tracing.
+size_t GetMallocUsage() {
+#if defined(OS_WIN)
+  // Iterate through whichever heap the CRT is using.
+  HANDLE crt_heap = reinterpret_cast<HANDLE>(_get_heap_handle());
+  if (crt_heap == NULL)
+    return 0;
+  if (!::HeapLock(crt_heap))
+    return 0;
+  size_t malloc_usage = 0;
+  PROCESS_HEAP_ENTRY heap_entry;
+  heap_entry.lpData = NULL;
+  while (::HeapWalk(crt_heap, &heap_entry) != 0) {
+    if ((heap_entry.wFlags & PROCESS_HEAP_ENTRY_BUSY) != 0)
+      malloc_usage += heap_entry.cbData;
+  }
+  ::HeapUnlock(crt_heap);
+  return malloc_usage;
+#elif defined(OS_MACOSX) || defined(OS_IOS)
+  malloc_statistics_t stats = {0};
+  malloc_zone_statistics(nullptr, &stats);
+  return stats.size_in_use;
+#elif defined(OS_LINUX) || defined(OS_ANDROID)
+  struct mallinfo minfo = mallinfo();
+#if defined(USE_TCMALLOC)
+  return minfo.uordblks;
+#else
+  return minfo.hblkhd + minfo.arena;
+#endif
+#endif
+}
+
+namespace {
+
+class LightPartitionStatsDumperImpl : public base::PartitionStatsDumper {
+ public:
+  LightPartitionStatsDumperImpl() : total_active_bytes_(0) {}
+
+  void PartitionDumpTotals(
+      const char* partition_name,
+      const base::PartitionMemoryStats* memory_stats) override {
+    total_active_bytes_ += memory_stats->total_active_bytes;
+  }
+
+  void PartitionsDumpBucketStats(
+      const char* partition_name,
+      const base::PartitionBucketMemoryStats*) override {}
+
+  size_t TotalActiveBytes() const { return total_active_bytes_; }
+
+ private:
+  size_t total_active_bytes_;
+};
+
+}  // namespace
+
+size_t GetPartitionAllocUsage() {
+  LightPartitionStatsDumperImpl dumper;

[Primiano Tucci (use gerrit), 2017/06/14 12:19:49]

also, looks like you should call  PartitionDumpTotals(...) on the various
partitions to actually accumulate the total? this will just always return 0 as
it is

[keishi, 2017/06/14 13:21:39]

I forgot to call WTF::Partitions::DumpMemoryStats(). But since it contains Blink
specific partition names I think I'll give up moving GetPartitionAllocUsage into
base. It wasn't necessary, I just thought it would be nice to have it next to
GetMallocUsage.

+  return dumper.TotalActiveBytes();
+}
+
 }  // namespace base