memory-infra: Fill the memory dump callback result (2/2)

base/trace_event/memory_dump_manager.cc

 // Copyright 2015 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/trace_event/memory_dump_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/allocator/features.h"
@@ skipping 715 matching lines @@
   uint64_t sum = 0;
   for (const auto& kv : pmd->allocator_dumps()) {
     auto name = StringPiece(kv.first);
     if (MatchPattern(name, pattern))
       sum += kv.second->GetSize();
   }
   return sum / 1024;
 }
 
 // static
+void MemoryDumpManager::FillOsDumpFromProcessMemoryDump(

[Primiano Tucci (use gerrit), 2017/03/24 11:44:43]

move this to the anonymous namespace (and remove the decl from the header)

[hjd, 2017/03/24 12:12:54]

Done.

+    MemoryDumpCallbackResult::OSMemDump& osDump,
+    ProcessMemoryDump* pmd) {
+  if (pmd->has_process_totals()) {
+    auto* totals = pmd->process_totals();
+    osDump.resident_set_kb = totals->resident_set_bytes() / 1024;
+  }
+}
+
+// static
 void MemoryDumpManager::FinalizeDumpAndAddToTrace(
     std::unique_ptr<ProcessMemoryDumpAsyncState> pmd_async_state) {
   HEAP_PROFILER_SCOPED_IGNORE;
   DCHECK(pmd_async_state->pending_dump_providers.empty());
   const uint64_t dump_guid = pmd_async_state->req_args.dump_guid;
   if (!pmd_async_state->callback_task_runner->BelongsToCurrentThread()) {
     scoped_refptr<SingleThreadTaskRunner> callback_task_runner =
         pmd_async_state->callback_task_runner;
     callback_task_runner->PostTask(
         FROM_HERE, Bind(&MemoryDumpManager::FinalizeDumpAndAddToTrace,
@@ skipping 38 matching lines @@
           GetDumpsSumKb("v8/*", process_memory_dump);
 
       // partition_alloc reports sizes for both allocated_objects and
       // partitions. The memory allocated_objects uses is a subset of
       // the partitions memory so to avoid double counting we only
       // count partitions memory.
       result.chrome_dump.partition_alloc_total_kb =
           GetDumpsSumKb("partition_alloc/partitions/*", process_memory_dump);
       result.chrome_dump.blink_gc_total_kb =
           GetDumpsSumKb("blink_gc", process_memory_dump);
+    } else {
+      auto& os_dump = result.extra_processes_dump[pid];
+      FillOsDumpFromProcessMemoryDump(os_dump, process_memory_dump);

[Primiano Tucci (use gerrit), 2017/03/24 11:44:43]

I think we want to do this also in the case above (pid == kNull)

[hjd, 2017/03/24 12:12:54]

oops, I must have lost it in a rebase, thanks!

     }
   }
 
   bool tracing_still_enabled;
   TRACE_EVENT_CATEGORY_GROUP_ENABLED(kTraceCategory, &tracing_still_enabled);
   if (!tracing_still_enabled) {
     pmd_async_state->dump_successful = false;
     VLOG(1) << kLogPrefix << " failed because tracing was disabled before"
             << " the dump was completed";
   }
@@ skipping 192 matching lines @@
   if (iter == process_dumps.end()) {
     std::unique_ptr<ProcessMemoryDump> new_pmd(
         new ProcessMemoryDump(session_state, dump_args));
     iter = process_dumps.insert(std::make_pair(pid, std::move(new_pmd))).first;
   }
   return iter->second.get();
 }
 
 }  // namespace trace_event
 }  // namespace base