[Memory-UMA] Implement basic working prototype.

services/resource_coordinator/memory/coordinator/coordinator_impl.cc

 // Copyright 2017 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 "services/resource_coordinator/memory/coordinator/coordinator_impl.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/memory_dump_request_args.h"
 #include "services/resource_coordinator/public/cpp/memory/process_local_dump_manager_impl.h"
 #include "services/resource_coordinator/public/interfaces/memory/constants.mojom.h"
 #include "services/resource_coordinator/public/interfaces/memory/memory_instrumentation.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/constants.mojom.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mac_util.h"
 #endif
 
 namespace {
 
 memory_instrumentation::CoordinatorImpl* g_coordinator_impl;
 
 uint32_t CalculatePrivateFootprintKb(
@@ skipping 22 matching lines @@
 
 }  // namespace
 
 namespace memory_instrumentation {
 
 // static
 CoordinatorImpl* CoordinatorImpl::GetInstance() {
   return g_coordinator_impl;
 }
 
-CoordinatorImpl::CoordinatorImpl(bool initialize_memory_dump_manager)
+CoordinatorImpl::CoordinatorImpl(bool initialize_memory_dump_manager,
+                                 service_manager::Connector* connector,
+                                 bool initialize_process_map)
     : failed_memory_dump_count_(0),
       initialize_memory_dump_manager_(initialize_memory_dump_manager) {
   if (initialize_memory_dump_manager) {
     // TODO(primiano): the current state where the coordinator also creates a
     // client (ProcessLocalDumpManagerImpl) is contra-intuitive. BrowserMainLoop
     // should be doing this.
     ProcessLocalDumpManagerImpl::CreateInstance(
         ProcessLocalDumpManagerImpl::Config(this, mojom::ProcessType::BROWSER));
     base::trace_event::MemoryDumpManager::GetInstance()->set_tracing_process_id(
         mojom::kServiceTracingProcessId);
   }
+  if (initialize_process_map)

[Primiano Tucci (use gerrit), 2017/05/15 03:48:09]

this seems only for testing. just pass nullptr as connector (ProcessMap need to
support that case anyways to deal with its own unittest).

[erikchen, 2017/05/15 17:29:15]

Done.

+    InitProcessMap(connector);
   g_coordinator_impl = this;
 }
 
+service_manager::Identity CoordinatorImpl::GetDispatchContext() const {
+  return bindings_.dispatch_context();
+}
+
 CoordinatorImpl::~CoordinatorImpl() {
   g_coordinator_impl = nullptr;
 }
 
 void CoordinatorImpl::BindCoordinatorRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::CoordinatorRequest request) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  bindings_.AddBinding(this, std::move(request));
+  bindings_.AddBinding(this, std::move(request), source_info.identity);
 }
 
 CoordinatorImpl::QueuedMemoryDumpRequest::QueuedMemoryDumpRequest(
     const base::trace_event::MemoryDumpRequestArgs args,
     const RequestGlobalMemoryDumpCallback callback)
     : args(args), callback(callback) {}
 
 CoordinatorImpl::QueuedMemoryDumpRequest::~QueuedMemoryDumpRequest() {}
 
 void CoordinatorImpl::RequestGlobalMemoryDump(
     const base::trace_event::MemoryDumpRequestArgs& args,
     const RequestGlobalMemoryDumpCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   bool another_dump_already_in_progress = !queued_memory_dump_requests_.empty();
 
   // If this is a periodic or peak memory dump request and there already is
   // another request in the queue with the same level of detail, there's no
   // point in enqueuing this request.
   if (another_dump_already_in_progress &&
       args.dump_type !=
-          base::trace_event::MemoryDumpType::EXPLICITLY_TRIGGERED) {
+          base::trace_event::MemoryDumpType::EXPLICITLY_TRIGGERED &&
+      args.dump_type != base::trace_event::MemoryDumpType::SUMMARY_ONLY) {
     for (const auto& request : queued_memory_dump_requests_) {
       if (request.args.level_of_detail == args.level_of_detail) {
         VLOG(1) << base::trace_event::MemoryDumpManager::kLogPrefix << " ("
                 << base::trace_event::MemoryDumpTypeToString(args.dump_type)
                 << ") skipped because another dump request with the same "
                    "level of detail ("
                 << base::trace_event::MemoryDumpLevelOfDetailToString(
                        args.level_of_detail)
                 << ") is already in the queue";
         callback.Run(args.dump_guid, false /* success */,
@@ skipping 12 matching lines @@
 
   PerformNextQueuedGlobalMemoryDump();
 }
 
 void CoordinatorImpl::RegisterProcessLocalDumpManager(
     mojom::ProcessLocalDumpManagerPtr process_manager) {
   DCHECK(thread_checker_.CalledOnValidThread());
   process_manager.set_connection_error_handler(
       base::Bind(&CoordinatorImpl::UnregisterProcessLocalDumpManager,
                  base::Unretained(this), process_manager.get()));
-  auto result = process_managers_.insert(
-      std::make_pair<mojom::ProcessLocalDumpManager*,
-                     mojom::ProcessLocalDumpManagerPtr>(
-          process_manager.get(), std::move(process_manager)));
+  auto result = process_managers_.emplace(
+      process_manager.get(),

[Primiano Tucci (use gerrit), 2017/05/15 03:48:09]

This relies on the evaluation order to be left-to-right, which IIRC is not
specified [1].
The problem here is that if the std::move(process_manager) comes first, here you
pass the .get() of an emptied object (which might be undefined behavior,
depending on how the Ptr is iimplemented, std::move semantic don't guarantee
that the rhs is left in a consistent state)

[1] I will be honest, I don't understand what the standard says:
"""
From http://en.cppreference.com/w/cpp/language/eval_order:

Sequenced before is an asymmetric, transitive, pair-wise relation between
evaluations executed by a single thread (1.10), which induces a partial order
among those evaluations. Given any two evaluations A and B, if A is sequenced
before B, then the execution of A shall precede the execution of B. If A is not
sequenced before B and B is not sequenced before A, then A and B are
unsequenced. [ Note: The execution of unsequenced evaluations can overlap. —end
note ] Evaluations A and B are indeterminately sequenced when either A is
sequenced before B or B is sequenced before A, but it is unspecified which. [
Note: Indeterminately sequenced evaluations cannot overlap, but either could be
executed first. —end note ]
"""

Also this SO seems to suggest it's not defined:
http://stackoverflow.com/questions/30691551/how-to-determine-c-function-call-...

EDIT: dcheng@ on slack confirmed evaluation  order is not well defined. 

[DmitrySkiba, 2017/05/15 06:30:55]

Well, the code had the same issue before, which I think hints that
map<ProcessLocalDumpManager*, ProcessLocalDumpManagerPtr> is not very friendly
structure to work with.  Do we really need to use map there?

+      std::make_pair(std::move(process_manager), GetDispatchContext()));
   DCHECK(result.second);
 }
 
 void CoordinatorImpl::UnregisterProcessLocalDumpManager(
     mojom::ProcessLocalDumpManager* process_manager) {
   size_t num_deleted = process_managers_.erase(process_manager);
   DCHECK(num_deleted == 1);
 
   // Check if we are waiting for an ack from this process-local manager.
   if (pending_process_managers_.find(process_manager) !=
       pending_process_managers_.end()) {
     DCHECK(!queued_memory_dump_requests_.empty());
     OnProcessMemoryDumpResponse(
         process_manager, queued_memory_dump_requests_.front().args.dump_guid,
         false /* success */, nullptr /* process_memory_dump */);
   }
 }
 
 void CoordinatorImpl::PerformNextQueuedGlobalMemoryDump() {
   DCHECK(!queued_memory_dump_requests_.empty());
   const base::trace_event::MemoryDumpRequestArgs& args =
       queued_memory_dump_requests_.front().args;
 
   // No need to treat the service process different than other processes. The
-  // service process will register itself as a ProcessLocalDumpManager and will
-  // be treated like other process-local managers.
+  // service process will register itself as a ProcessLocalDumpManager and
+  // will be treated like other process-local managers.
   pending_process_managers_.clear();
   failed_memory_dump_count_ = 0;
   for (const auto& key_value : process_managers_) {
     pending_process_managers_.insert(key_value.first);
     auto callback = base::Bind(&CoordinatorImpl::OnProcessMemoryDumpResponse,
                                base::Unretained(this), key_value.first);
-    key_value.second->RequestProcessMemoryDump(args, callback);
+    key_value.second.first->RequestProcessMemoryDump(args, callback);
   }
   // Run the callback in case there are no process-local managers.
   FinalizeGlobalMemoryDumpIfAllManagersReplied();
 }
 
 void CoordinatorImpl::OnProcessMemoryDumpResponse(
     mojom::ProcessLocalDumpManager* process_manager,
     uint64_t dump_guid,
     bool success,
     mojom::ProcessMemoryDumpPtr process_memory_dump) {
   auto it = pending_process_managers_.find(process_manager);
 
   if (queued_memory_dump_requests_.empty() ||
       queued_memory_dump_requests_.front().args.dump_guid != dump_guid ||
       it == pending_process_managers_.end()) {
     VLOG(1) << "Received unexpected memory dump response: " << dump_guid;
     return;
   }
   if (process_memory_dump) {
+    base::ProcessId pid = base::kNullProcessId;
+    auto it = process_managers_.find(process_manager);
+    if (it != process_managers_.end()) {
+      pid = process_map_->GetProcessId(it->second.second);
+    }
+
     queued_memory_dump_requests_.front().process_memory_dumps.push_back(
-        std::move(process_memory_dump));
+        std::make_pair(pid, std::move(process_memory_dump)));
   }
 
   pending_process_managers_.erase(it);
 
   if (!success) {
     ++failed_memory_dump_count_;
     VLOG(1) << base::trace_event::MemoryDumpManager::kLogPrefix
             << " failed because of NACK from provider";
   }
 
   FinalizeGlobalMemoryDumpIfAllManagersReplied();
 }
 
 void CoordinatorImpl::FinalizeGlobalMemoryDumpIfAllManagersReplied() {
   if (pending_process_managers_.size() > 0)
     return;
 
   if (queued_memory_dump_requests_.empty()) {
     NOTREACHED();
     return;
   }
 
   std::map<base::ProcessId, mojom::ProcessMemoryDumpPtr> finalized_pmds;
   for (auto& result :
        queued_memory_dump_requests_.front().process_memory_dumps) {
-    // TODO(fmeawad): Write into correct map entry instead of always
-    // to pid = 0.
-    mojom::ProcessMemoryDumpPtr& pmd = finalized_pmds[0];
+    mojom::ProcessMemoryDumpPtr& pmd = finalized_pmds[result.first];
     if (!pmd)
       pmd = mojom::ProcessMemoryDump::New();
-    pmd->chrome_dump = std::move(result->chrome_dump);
+    pmd->chrome_dump = std::move(result.second->chrome_dump);
 
     // TODO(hjd): We should have a better way to tell if os_dump is filled.
-    if (result->os_dump.resident_set_kb > 0) {
-      pmd->os_dump = std::move(result->os_dump);
+    if (result.second->os_dump.resident_set_kb > 0) {
+      pmd->os_dump = std::move(result.second->os_dump);
     }
 
-    for (auto& pair : result->extra_processes_dump) {
+    for (auto& pair : result.second->extra_processes_dump) {
       base::ProcessId pid = pair.first;
       mojom::ProcessMemoryDumpPtr& pmd = finalized_pmds[pid];
       if (!pmd)
         pmd = mojom::ProcessMemoryDump::New();
-      pmd->os_dump = std::move(result->extra_processes_dump[pid]);
+      pmd->os_dump = std::move(result.second->extra_processes_dump[pid]);
     }
+
+    pmd->process_type = result.second->process_type;
   }
 
   mojom::GlobalMemoryDumpPtr global_dump(mojom::GlobalMemoryDump::New());
   for (auto& pair : finalized_pmds) {
     // It's possible that the renderer has died but we still have an os_dump,
-    // because those were comptued from the browser proces before the renderer
+    // because those were computed from the browser proces before the renderer
     // died. We should skip these.
     // TODO(hjd): We should have a better way to tell if a chrome_dump is
     // filled.
     if (!pair.second->chrome_dump.malloc_total_kb)
       continue;
     base::ProcessId pid = pair.first;
-    mojom::ProcessMemoryDumpPtr pmd = std::move(finalized_pmds[pid]);
+    mojom::ProcessMemoryDumpPtr& pmd = finalized_pmds[pid];
     pmd->private_footprint = CalculatePrivateFootprintKb(pmd->os_dump);
     global_dump->process_dumps.push_back(std::move(pmd));
   }
 
   const auto& callback = queued_memory_dump_requests_.front().callback;
   const bool global_success = failed_memory_dump_count_ == 0;
   callback.Run(queued_memory_dump_requests_.front().args.dump_guid,
                global_success, std::move(global_dump));
   queued_memory_dump_requests_.pop_front();
 
   // Schedule the next queued dump (if applicable).
   if (!queued_memory_dump_requests_.empty()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&CoordinatorImpl::PerformNextQueuedGlobalMemoryDump,
                    base::Unretained(this)));
   }
 }
 
+void CoordinatorImpl::InitProcessMap(service_manager::Connector* connector) {

[Primiano Tucci (use gerrit), 2017/05/15 03:48:09]

as the name suggest, why this happens here and not in the ctor of ProcessMap?

[erikchen, 2017/05/15 17:29:15]

moved

+  service_manager::mojom::ServiceManagerPtr service_manager;
+  connector->BindInterface(service_manager::mojom::kServiceName,
+                           &service_manager);
+  service_manager::mojom::ServiceManagerListenerPtr listener;
+  service_manager::mojom::ServiceManagerListenerRequest request(
+      mojo::MakeRequest(&listener));
+  service_manager->AddListener(std::move(listener));
+  process_map_.reset(new ProcessMap());
+  process_map_->BindRequest(std::move(request));
+}
+
 }  // namespace memory_instrumentation