diff options
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/render_thread.cc | 10 | ||||
-rw-r--r-- | chrome/renderer/render_thread.h | 4 | ||||
-rw-r--r-- | chrome/renderer/renderer_histogram_snapshots.cc | 16 | ||||
-rw-r--r-- | chrome/renderer/renderer_histogram_snapshots.h | 4 |
4 files changed, 17 insertions, 17 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index eae0c55..0412b94 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -95,8 +95,8 @@ void RenderThread::Resolve(const char* name, size_t length) { return dns_master_->Resolve(name, length); } -void RenderThread::SendHistograms() { - return histogram_snapshots_->SendHistograms(); +void RenderThread::SendHistograms(int sequence_number) { + return histogram_snapshots_->SendHistograms(sequence_number); } static WebAppCacheContext* CreateAppCacheContextForRenderer() { @@ -212,7 +212,7 @@ void RenderThread::OnControlMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(ViewMsg_New, OnCreateNewView) IPC_MESSAGE_HANDLER(ViewMsg_SetCacheCapacities, OnSetCacheCapacities) IPC_MESSAGE_HANDLER(ViewMsg_GetRendererHistograms, - OnGetRendererHistograms) + OnGetRendererHistograms) IPC_MESSAGE_HANDLER(ViewMsg_GetCacheResourceStats, OnGetCacheResourceStats) IPC_MESSAGE_HANDLER(ViewMsg_UserScripts_UpdatedScripts, @@ -274,8 +274,8 @@ void RenderThread::OnGetCacheResourceStats() { Send(new ViewHostMsg_ResourceTypeStats(stats)); } -void RenderThread::OnGetRendererHistograms() { - SendHistograms(); +void RenderThread::OnGetRendererHistograms(int sequence_number) { + SendHistograms(sequence_number); } void RenderThread::InformHostOfCacheStats() { diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h index 123c9dc..27312c0 100644 --- a/chrome/renderer/render_thread.h +++ b/chrome/renderer/render_thread.h @@ -97,7 +97,7 @@ class RenderThread : public RenderThreadBase, void Resolve(const char* name, size_t length); // Send all the Histogram data to browser. - void SendHistograms(); + void SendHistograms(int sequence_number); // Invokes InformHostOfCacheStats after a short delay. Used to move this // bookkeeping operation off the critical latency path. @@ -125,7 +125,7 @@ class RenderThread : public RenderThreadBase, void OnGetCacheResourceStats(); // Send all histograms to browser. - void OnGetRendererHistograms(); + void OnGetRendererHistograms(int sequence_number); void OnExtensionHandleConnect(int channel_id, const std::string& tab_json); void OnExtensionHandleMessage(const std::string& message, int channel_id); diff --git a/chrome/renderer/renderer_histogram_snapshots.cc b/chrome/renderer/renderer_histogram_snapshots.cc index 6d0507d..025eb73 100644 --- a/chrome/renderer/renderer_histogram_snapshots.cc +++ b/chrome/renderer/renderer_histogram_snapshots.cc @@ -22,13 +22,13 @@ RendererHistogramSnapshots::RendererHistogramSnapshots() } // Send data quickly! -void RendererHistogramSnapshots::SendHistograms() { +void RendererHistogramSnapshots::SendHistograms(int sequence_number) { RenderThread::current()->message_loop()->PostTask(FROM_HERE, renderer_histogram_snapshots_factory_.NewRunnableMethod( - &RendererHistogramSnapshots::UploadAllHistrograms)); + &RendererHistogramSnapshots::UploadAllHistrograms, sequence_number)); } -void RendererHistogramSnapshots::UploadAllHistrograms() { +void RendererHistogramSnapshots::UploadAllHistrograms(int sequence_number) { StatisticsRecorder::Histograms histograms; StatisticsRecorder::GetHistograms(&histograms); @@ -39,11 +39,11 @@ void RendererHistogramSnapshots::UploadAllHistrograms() { it++) { UploadHistrogram(**it, &pickled_histograms); } - // Send the handle over synchronous IPC. - if (pickled_histograms.size() > 0) { - RenderThread::current()->Send( - new ViewHostMsg_RendererHistograms(pickled_histograms)); - } + // Send the sequence number and list of pickled histograms over synchronous + // IPC. + RenderThread::current()->Send( + new ViewHostMsg_RendererHistograms( + sequence_number, pickled_histograms)); } // Extract snapshot data and then send it off the the Browser process diff --git a/chrome/renderer/renderer_histogram_snapshots.h b/chrome/renderer/renderer_histogram_snapshots.h index 5c9f93a..0a1238c 100644 --- a/chrome/renderer/renderer_histogram_snapshots.h +++ b/chrome/renderer/renderer_histogram_snapshots.h @@ -24,7 +24,7 @@ class RendererHistogramSnapshots { ~RendererHistogramSnapshots() {} // Send the histogram data. - void SendHistograms(); + void SendHistograms(int sequence_number); // Maintain a map of histogram names to the sample stats we've sent. typedef std::map<std::string, Histogram::SampleSet> LoggedSampleMap; @@ -33,7 +33,7 @@ class RendererHistogramSnapshots { private: // Extract snapshot data and then send it off the the Browser process. // Send only a delta to what we have already sent. - void UploadAllHistrograms(); + void UploadAllHistrograms(int sequence_number); void UploadHistrogram(const Histogram& histogram, HistogramPickledList* histograms); void UploadHistogramDelta(const Histogram& histogram, |