Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Unified Diff: content/browser/histogram_controller.cc

Issue 328823002: Don't fetch histograms from the same process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/histogram_controller.cc
===================================================================
--- content/browser/histogram_controller.cc (revision 276253)
+++ content/browser/histogram_controller.cc (working copy)
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/metrics/histogram.h"
+#include "base/process/process_handle.h"
#include "content/browser/histogram_subscriber.h"
#include "content/common/child_process_messages.h"
#include "content/public/browser/browser_child_process_host_iterator.h"
@@ -70,9 +71,11 @@
int sequence_number) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const base::ProcessId current_proc_id = base::GetCurrentProcId();
int pending_processes = 0;
for (BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) {
- int type = iter.GetData().process_type;
+ const ChildProcessData& data = iter.GetData();
+ int type = data.process_type;
if (type != PROCESS_TYPE_PLUGIN &&
type != PROCESS_TYPE_GPU &&
type != PROCESS_TYPE_PPAPI_PLUGIN &&
@@ -80,6 +83,12 @@
continue;
}
+ // In some cases, the child process may be the same as the current process -
+ // for example the GPU process may be the same as the browser process. Don't
+ // ask it for histogram data in that case.
+ if (base::GetProcId(data.handle) == current_proc_id)
+ continue;
+
++pending_processes;
if (!iter.Send(new ChildProcessMsg_GetChildHistogramData(sequence_number)))
--pending_processes;

Powered by Google App Engine
This is Rietveld 408576698