mac: Fix calulation for number of resident pages in a process.

chrome/browser/task_manager/sampling/task_group_sampler.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 "chrome/browser/task_manager/sampling/task_group_sampler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 108 matching lines @@
   DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
 
   return process_metrics_->GetCPUUsage();
 }
 
 MemoryUsageStats TaskGroupSampler::RefreshMemoryUsage() {
   DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
 
   MemoryUsageStats memory_usage;
 #if defined(OS_MACOSX)
-  memory_usage.physical_bytes =

[Mark Mentovai, 2017/03/13 18:13:33]

Leaving this alone was nice because it consolidates all of our “what is working
set size?” logic in the Mac implementation file.

[ssid, 2017/03/13 18:44:55]

Yes, the main consumer of this number I'd expect would be the users and IIUC
they'd see different number in Chrome task manager and system task manager.

[Mark Mentovai, 2017/03/13 18:48:03]

ssid wrote:
What I meant was “use the new logic, just consolidate it.” Are you suggesting
“use the old logic” for one or more use sites?

[ssid, 2017/03/13 18:59:14]

Um sorry, yes I just felt showing different number in Chrome task manager and
system's might be get bad? It's just an opinion, I am fine with the change.

[erikchen, 2017/03/13 21:00:41]

Calculating private/shared bytes has a performance cost [order of magnitude:
1ms]. Keeping the existing API would require running that calculation twice.
I'll add a new macOS-only function to base/process/process_metrics.h that
returns private bytes, shared privates, and working set size.

-      static_cast<int64_t>(process_metrics_->GetWorkingSetSize());
-
   size_t private_bytes = 0;
   size_t shared_bytes = 0;
   if (process_metrics_->GetMemoryBytes(&private_bytes, &shared_bytes)) {
     memory_usage.private_bytes = static_cast<int64_t>(private_bytes);
     memory_usage.shared_bytes = static_cast<int64_t>(shared_bytes);
+    memory_usage.physical_bytes =
+        memory_usage.private_bytes + memory_usage.shared_bytes;
   }
 #else
   // Refreshing the physical/private/shared memory at one shot.
   base::WorkingSetKBytes ws_usage;
   if (process_metrics_->GetWorkingSetKBytes(&ws_usage)) {
     memory_usage.private_bytes = static_cast<int64_t>(ws_usage.priv * 1024);
     memory_usage.shared_bytes = static_cast<int64_t>(ws_usage.shared * 1024);
 #if defined(OS_LINUX)
     // On Linux private memory is also resident. Just use it.
     memory_usage.physical_bytes = memory_usage.private_bytes;
@@ skipping 36 matching lines @@
   DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
 #if defined(OS_MACOSX)
   return process_.IsProcessBackgrounded(
       content::BrowserChildProcessHost::GetPortProvider());
 #else
   return process_.IsProcessBackgrounded();
 #endif  // defined(OS_MACOSX)
 }
 
 }  // namespace task_manager