The function to send out ChromeFrame histograms can be invoked from m…

…ultiple threads in IE. This causes the histogram snapshots to get corrupted. Fix is to synchronize access to the function which gathers these histograms. Fixes bugs http://code.google.com/p/chromium/issues/detail?id=36500 http://code.google.com/p/chromium/issues/detail?id=36510 Bug=36500,36510 Review URL: http://codereview.chromium.org/657023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39817 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Feb 24, 2010 · b074083 · b074083
1 parent 18597e6
commit b074083
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/chrome_frame/chrome_frame_histograms.cc b/chrome_frame/chrome_frame_histograms.cc
@@ -22,6 +22,8 @@ ChromeFrameHistogramSnapshots::ChromeFrameHistogramSnapshots() {
 ChromeFrameHistogramSnapshots::HistogramPickledList
   ChromeFrameHistogramSnapshots::GatherAllHistograms() {
 
+  AutoLock auto_lock(lock_);
+
   StatisticsRecorder::Histograms histograms;
   StatisticsRecorder::GetHistograms(&histograms);
 

diff --git a/chrome_frame/chrome_frame_histograms.h b/chrome_frame/chrome_frame_histograms.h
@@ -48,6 +48,9 @@ class ChromeFrameHistogramSnapshots {
   // histogram) so that we can send only the delta with the next log.
   LoggedSampleMap logged_samples_;
 
+  // Synchronizes the histogram gathering operation.
+  Lock lock_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeFrameHistogramSnapshots);
 };