OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/metrics/histogram_synchronizer.h" | 5 #include "chrome/browser/metrics/histogram_synchronizer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/lazy_instance.h" |
8 #include "base/logging.h" | 9 #include "base/logging.h" |
9 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
10 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" |
11 #include "base/threading/thread_restrictions.h" | 12 #include "base/threading/thread_restrictions.h" |
12 #include "chrome/common/chrome_constants.h" | 13 #include "chrome/common/chrome_constants.h" |
13 #include "chrome/common/render_messages.h" | |
14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/browser/render_process_host.h" | 15 #include "content/public/browser/histogram_controller.h" |
16 | 16 |
17 using base::Time; | 17 using base::Time; |
18 using base::TimeDelta; | 18 using base::TimeDelta; |
19 using base::TimeTicks; | 19 using base::TimeTicks; |
20 using content::BrowserThread; | 20 using content::BrowserThread; |
21 | 21 |
| 22 // The "HistogramRequestContext" structure describes an individual request |
| 23 // received from the UI. All methods are accessible on UI thread. |
| 24 class HistogramRequestContext { |
| 25 public: |
| 26 // A map from sequence_number_ to the actual HistogramRequestContexts. |
| 27 typedef std::map<int, HistogramRequestContext*> HistogramRequestContextMap; |
| 28 |
| 29 ~HistogramRequestContext() {} |
| 30 |
| 31 HistogramRequestContext(const base::Closure& callback, |
| 32 int sequence_number) |
| 33 : callback_(callback), |
| 34 sequence_number_(sequence_number), |
| 35 received_process_group_count_(0), |
| 36 processes_pending_(0) { |
| 37 } |
| 38 |
| 39 void SetReceivedProcessGroupCount(bool done) { |
| 40 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 41 received_process_group_count_ = done; |
| 42 } |
| 43 |
| 44 void AddProcessesPending(int processes_pending) { |
| 45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 46 processes_pending_ += processes_pending; |
| 47 } |
| 48 |
| 49 void DecrementProcessesPending() { |
| 50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 51 --processes_pending_; |
| 52 } |
| 53 |
| 54 // Records that we are waiting for one less histogram data from a process for |
| 55 // the given sequence number. If |received_process_group_count_| and |
| 56 // |processes_pending_| are zero, then delete the current object by calling |
| 57 // Unregister. |
| 58 void DeleteIfAllDone() { |
| 59 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 60 |
| 61 if (processes_pending_ <= 0 && received_process_group_count_) { |
| 62 HistogramRequestContext::Unregister(sequence_number_); |
| 63 } |
| 64 } |
| 65 |
| 66 // Register a |HistogramRequestContext| in |outstanding_requests_| map for the |
| 67 // given |sequence_number|. |
| 68 static void Register(const base::Closure& callback, int sequence_number) { |
| 69 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 70 |
| 71 HistogramRequestContext* request = new HistogramRequestContext( |
| 72 callback, sequence_number); |
| 73 outstanding_requests_.Get()[sequence_number] = request; |
| 74 } |
| 75 |
| 76 // Find the |HistogramRequestContext| in |outstanding_requests_| map for the |
| 77 // given |sequence_number|. |
| 78 static HistogramRequestContext* GetHistogramRequestContext( |
| 79 int sequence_number) { |
| 80 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 81 |
| 82 HistogramRequestContextMap::iterator it = |
| 83 outstanding_requests_.Get().find(sequence_number); |
| 84 if (it == outstanding_requests_.Get().end()) |
| 85 return NULL; |
| 86 |
| 87 HistogramRequestContext* request = NULL; |
| 88 request = it->second; |
| 89 DCHECK(sequence_number == request->sequence_number_); |
| 90 return request; |
| 91 } |
| 92 |
| 93 // Delete the entry for the given |sequence_number| from |
| 94 // |outstanding_requests_| map. This method is called when all changes have |
| 95 // been acquired, or when the wait time expires (whichever is sooner). |
| 96 static void Unregister(int sequence_number) { |
| 97 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 98 |
| 99 HistogramRequestContextMap::iterator it = |
| 100 outstanding_requests_.Get().find(sequence_number); |
| 101 if (it == outstanding_requests_.Get().end()) |
| 102 return; |
| 103 |
| 104 HistogramRequestContext* request = it->second; |
| 105 DCHECK(sequence_number == request->sequence_number_); |
| 106 bool received_process_group_count = request->received_process_group_count_; |
| 107 int unresponsive_processes = request->processes_pending_; |
| 108 |
| 109 request->callback_.Run(); |
| 110 |
| 111 delete it->second; |
| 112 outstanding_requests_.Get().erase(it); |
| 113 |
| 114 UMA_HISTOGRAM_BOOLEAN("Histogram.ReceivedProcessGroupCount", |
| 115 received_process_group_count); |
| 116 UMA_HISTOGRAM_COUNTS("Histogram.PendingProcessNotResponding", |
| 117 unresponsive_processes); |
| 118 } |
| 119 |
| 120 // Delete all the entries in |outstanding_requests_| map. |
| 121 static void OnShutdown() { |
| 122 // Just in case we have any pending tasks, clear them out. |
| 123 while (!outstanding_requests_.Get().empty()) { |
| 124 HistogramRequestContextMap::iterator it = |
| 125 outstanding_requests_.Get().begin(); |
| 126 delete it->second; |
| 127 outstanding_requests_.Get().erase(it); |
| 128 } |
| 129 } |
| 130 |
| 131 // Requests are made to asynchronously send data to the |callback_|. |
| 132 base::Closure callback_; |
| 133 |
| 134 // The sequence number used by the most recent update request to contact all |
| 135 // processes. |
| 136 int sequence_number_; |
| 137 |
| 138 // Indicates if we have received all pending processes count. |
| 139 bool received_process_group_count_; |
| 140 |
| 141 // The number of pending processes (all renderer processes and browser child |
| 142 // processes) that have not yet responded to requests. |
| 143 int processes_pending_; |
| 144 |
| 145 // Map of all outstanding HistogramRequestContexts, from sequence_number_ to |
| 146 // HistogramRequestContext. |
| 147 static base::LazyInstance<HistogramRequestContextMap>::Leaky |
| 148 outstanding_requests_; |
| 149 }; |
| 150 |
22 // Negative numbers are never used as sequence numbers. We explicitly pick a | 151 // Negative numbers are never used as sequence numbers. We explicitly pick a |
23 // negative number that is "so negative" that even when we add one (as is done | 152 // negative number that is "so negative" that even when we add one (as is done |
24 // when we generated the next sequence number) that it will still be negative. | 153 // when we generated the next sequence number) that it will still be negative. |
25 // We have code that handles wrapping around on an overflow into negative | 154 // We have code that handles wrapping around on an overflow into negative |
26 // territory. | 155 // territory. |
27 static const int kNeverUsableSequenceNumber = -2; | 156 static const int kNeverUsableSequenceNumber = -2; |
28 | 157 |
29 HistogramSynchronizer::HistogramSynchronizer() | 158 HistogramSynchronizer::HistogramSynchronizer() |
30 : lock_(), | 159 : lock_(), |
31 received_all_renderer_histograms_(&lock_), | |
32 callback_thread_(NULL), | 160 callback_thread_(NULL), |
33 last_used_sequence_number_(kNeverUsableSequenceNumber), | 161 last_used_sequence_number_(kNeverUsableSequenceNumber), |
34 async_sequence_number_(kNeverUsableSequenceNumber), | 162 async_sequence_number_(kNeverUsableSequenceNumber) { |
35 async_renderers_pending_(0), | 163 DCHECK(g_histogram_synchronizer == NULL); |
36 synchronous_sequence_number_(kNeverUsableSequenceNumber), | 164 g_histogram_synchronizer = this; |
37 synchronous_renderers_pending_(0) { | 165 content::HistogramController::GetInstance()->Register(this); |
38 DCHECK(histogram_synchronizer_ == NULL); | |
39 histogram_synchronizer_ = this; | |
40 } | 166 } |
41 | 167 |
42 HistogramSynchronizer::~HistogramSynchronizer() { | 168 HistogramSynchronizer::~HistogramSynchronizer() { |
| 169 HistogramRequestContext::OnShutdown(); |
| 170 |
43 // Just in case we have any pending tasks, clear them out. | 171 // Just in case we have any pending tasks, clear them out. |
44 SetCallbackTaskAndThread(NULL, base::Closure()); | 172 SetCallbackTaskAndThread(NULL, base::Closure()); |
45 histogram_synchronizer_ = NULL; | 173 g_histogram_synchronizer = NULL; |
46 } | 174 } |
47 | 175 |
48 // static | 176 // static |
49 HistogramSynchronizer* HistogramSynchronizer::CurrentSynchronizer() { | 177 HistogramSynchronizer* HistogramSynchronizer::CurrentSynchronizer() { |
50 DCHECK(histogram_synchronizer_ != NULL); | 178 DCHECK(g_histogram_synchronizer != NULL); |
51 return histogram_synchronizer_; | 179 return g_histogram_synchronizer; |
52 } | 180 } |
53 | 181 |
54 void HistogramSynchronizer::FetchRendererHistogramsSynchronously( | 182 void HistogramSynchronizer::FetchHistogramsSynchronously( |
55 TimeDelta wait_time) { | 183 TimeDelta wait_time) { |
56 NotifyAllRenderers(SYNCHRONOUS_HISTOGRAMS); | 184 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
57 | 185 RegisterAndNotifyAllProcesses(SYNCHRONOUS_HISTOGRAMS, |
58 TimeTicks start = TimeTicks::Now(); | 186 base::TimeDelta::FromMinutes(1)); |
59 TimeTicks end_time = start + wait_time; | |
60 int unresponsive_renderer_count; | |
61 { | |
62 base::AutoLock auto_lock(lock_); | |
63 while (synchronous_renderers_pending_ > 0 && TimeTicks::Now() < end_time) { | |
64 wait_time = end_time - TimeTicks::Now(); | |
65 base::ThreadRestrictions::ScopedAllowWait allow_wait; | |
66 received_all_renderer_histograms_.TimedWait(wait_time); | |
67 } | |
68 unresponsive_renderer_count = synchronous_renderers_pending_; | |
69 synchronous_renderers_pending_ = 0; | |
70 synchronous_sequence_number_ = kNeverUsableSequenceNumber; | |
71 } | |
72 UMA_HISTOGRAM_COUNTS("Histogram.RendersNotRespondingSynchronous", | |
73 unresponsive_renderer_count); | |
74 if (!unresponsive_renderer_count) | |
75 UMA_HISTOGRAM_TIMES("Histogram.FetchRendererHistogramsSynchronously", | |
76 TimeTicks::Now() - start); | |
77 } | 187 } |
78 | 188 |
79 // static | 189 // static |
80 void HistogramSynchronizer::FetchRendererHistogramsAsynchronously( | 190 void HistogramSynchronizer::FetchHistogramsAsynchronously( |
81 MessageLoop* callback_thread, | 191 MessageLoop* callback_thread, |
82 const base::Closure& callback, | 192 const base::Closure& callback, |
83 base::TimeDelta wait_time) { | 193 base::TimeDelta wait_time) { |
84 DCHECK(callback_thread != NULL); | 194 DCHECK(callback_thread != NULL); |
85 DCHECK(!callback.is_null()); | 195 DCHECK(!callback.is_null()); |
86 | 196 |
87 HistogramSynchronizer* current_synchronizer = CurrentSynchronizer(); | 197 HistogramSynchronizer* current_synchronizer = CurrentSynchronizer(); |
88 | 198 |
89 if (current_synchronizer == NULL) { | 199 if (current_synchronizer == NULL) { |
90 // System teardown is happening. | 200 // System teardown is happening. |
91 callback_thread->PostTask(FROM_HERE, callback); | 201 callback_thread->PostTask(FROM_HERE, callback); |
92 return; | 202 return; |
93 } | 203 } |
94 | 204 |
95 current_synchronizer->SetCallbackTaskAndThread(callback_thread, | 205 current_synchronizer->SetCallbackTaskAndThread(callback_thread, |
96 callback); | 206 callback); |
97 | 207 |
98 int sequence_number = | 208 current_synchronizer->RegisterAndNotifyAllProcesses(ASYNC_HISTOGRAMS, |
99 current_synchronizer->NotifyAllRenderers(ASYNC_HISTOGRAMS); | 209 wait_time); |
| 210 } |
| 211 |
| 212 void HistogramSynchronizer::RegisterAndNotifyAllProcesses( |
| 213 ProcessHistogramRequester requester, |
| 214 base::TimeDelta wait_time) { |
| 215 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 216 |
| 217 int sequence_number = GetNextAvailableSequenceNumber(requester); |
| 218 |
| 219 base::Closure callback = |
| 220 base::Bind( |
| 221 &HistogramSynchronizer::ForceHistogramSynchronizationDoneCallback, |
| 222 this, |
| 223 sequence_number); |
| 224 |
| 225 HistogramRequestContext::Register(callback, sequence_number); |
| 226 |
| 227 // Get histogram data from renderer and browser child processes. |
| 228 content::HistogramController::GetInstance()->GetHistogramData( |
| 229 sequence_number); |
100 | 230 |
101 // Post a task that would be called after waiting for wait_time. This acts | 231 // Post a task that would be called after waiting for wait_time. This acts |
102 // as a watchdog, to ensure that a non-responsive renderer won't block us from | 232 // as a watchdog, to cancel the requests for non-responsive processes. |
103 // making the callback. | |
104 BrowserThread::PostDelayedTask( | 233 BrowserThread::PostDelayedTask( |
105 BrowserThread::UI, FROM_HERE, | 234 BrowserThread::UI, FROM_HERE, |
106 base::Bind( | 235 base::Bind(&HistogramRequestContext::Unregister, sequence_number), |
107 &HistogramSynchronizer::ForceHistogramSynchronizationDoneCallback, | |
108 current_synchronizer, | |
109 sequence_number), | |
110 wait_time); | 236 wait_time); |
111 } | 237 } |
112 | 238 |
113 // static | 239 void HistogramSynchronizer::OnPendingProcesses(int sequence_number, |
114 void HistogramSynchronizer::DeserializeHistogramList( | 240 int pending_processes, |
| 241 bool end) { |
| 242 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 243 |
| 244 HistogramRequestContext* request = |
| 245 HistogramRequestContext::GetHistogramRequestContext(sequence_number); |
| 246 if (!request) |
| 247 return; |
| 248 request->AddProcessesPending(pending_processes); |
| 249 request->SetReceivedProcessGroupCount(end); |
| 250 request->DeleteIfAllDone(); |
| 251 } |
| 252 |
| 253 void HistogramSynchronizer::OnHistogramDataCollected( |
| 254 int sequence_number, |
| 255 const std::vector<std::string>& histogram_data, |
| 256 content::ProcessType process_type) { |
| 257 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 258 DecrementPendingProcessesAndSendData(sequence_number, histogram_data); |
| 259 } |
| 260 |
| 261 void HistogramSynchronizer::DecrementPendingProcessesAndSendData( |
115 int sequence_number, | 262 int sequence_number, |
116 const std::vector<std::string>& histograms) { | 263 const std::vector<std::string>& histograms) { |
117 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 264 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 265 |
| 266 HistogramRequestContext* request = |
| 267 HistogramRequestContext::GetHistogramRequestContext(sequence_number); |
| 268 |
118 for (std::vector<std::string>::const_iterator it = histograms.begin(); | 269 for (std::vector<std::string>::const_iterator it = histograms.begin(); |
119 it < histograms.end(); | 270 it < histograms.end(); |
120 ++it) { | 271 ++it) { |
121 base::Histogram::DeserializeHistogramInfo(*it); | 272 base::Histogram::DeserializeHistogramInfo(*it); |
122 } | 273 } |
123 | 274 |
124 HistogramSynchronizer* current_synchronizer = CurrentSynchronizer(); | 275 if (!request) |
125 if (current_synchronizer == NULL) | |
126 return; | 276 return; |
127 | 277 |
128 // Record that we have received a histogram from renderer process. | 278 // Delete request if we have heard back from all child processes. |
129 current_synchronizer->DecrementPendingRenderers(sequence_number); | 279 request->DecrementProcessesPending(); |
130 } | 280 request->DeleteIfAllDone(); |
131 | |
132 int HistogramSynchronizer::NotifyAllRenderers( | |
133 RendererHistogramRequester requester) { | |
134 // To iterate over RenderProcessHosts, or to send messages to the hosts, we | |
135 // need to be on the UI thread. | |
136 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | |
137 | |
138 int notification_count = 0; | |
139 for (content::RenderProcessHost::iterator it( | |
140 content::RenderProcessHost::AllHostsIterator()); | |
141 !it.IsAtEnd(); it.Advance()) | |
142 ++notification_count; | |
143 | |
144 int sequence_number = GetNextAvailableSequenceNumber(requester, | |
145 notification_count); | |
146 for (content::RenderProcessHost::iterator it( | |
147 content::RenderProcessHost::AllHostsIterator()); | |
148 !it.IsAtEnd(); it.Advance()) { | |
149 if (!it.GetCurrentValue()->Send( | |
150 new ChromeViewMsg_GetRendererHistograms(sequence_number))) | |
151 DecrementPendingRenderers(sequence_number); | |
152 } | |
153 | |
154 return sequence_number; | |
155 } | |
156 | |
157 void HistogramSynchronizer::DecrementPendingRenderers(int sequence_number) { | |
158 bool synchronous_completed = false; | |
159 bool asynchronous_completed = false; | |
160 | |
161 { | |
162 base::AutoLock auto_lock(lock_); | |
163 if (sequence_number == async_sequence_number_) { | |
164 if (--async_renderers_pending_ <= 0) | |
165 asynchronous_completed = true; | |
166 } else if (sequence_number == synchronous_sequence_number_) { | |
167 if (--synchronous_renderers_pending_ <= 0) | |
168 synchronous_completed = true; | |
169 } | |
170 } | |
171 | |
172 if (asynchronous_completed) | |
173 ForceHistogramSynchronizationDoneCallback(sequence_number); | |
174 else if (synchronous_completed) | |
175 received_all_renderer_histograms_.Signal(); | |
176 } | 281 } |
177 | 282 |
178 void HistogramSynchronizer::SetCallbackTaskAndThread( | 283 void HistogramSynchronizer::SetCallbackTaskAndThread( |
179 MessageLoop* callback_thread, | 284 MessageLoop* callback_thread, |
180 const base::Closure& callback) { | 285 const base::Closure& callback) { |
181 base::Closure old_callback; | 286 base::Closure old_callback; |
182 MessageLoop* old_thread = NULL; | 287 MessageLoop* old_thread = NULL; |
183 TimeTicks old_start_time; | |
184 int unresponsive_renderers; | |
185 const TimeTicks now = TimeTicks::Now(); | |
186 { | 288 { |
187 base::AutoLock auto_lock(lock_); | 289 base::AutoLock auto_lock(lock_); |
188 old_callback = callback_; | 290 old_callback = callback_; |
189 callback_ = callback; | 291 callback_ = callback; |
190 old_thread = callback_thread_; | 292 old_thread = callback_thread_; |
191 callback_thread_ = callback_thread; | 293 callback_thread_ = callback_thread; |
192 unresponsive_renderers = async_renderers_pending_; | |
193 old_start_time = async_callback_start_time_; | |
194 async_callback_start_time_ = now; | |
195 // Prevent premature calling of our new callbacks. | 294 // Prevent premature calling of our new callbacks. |
196 async_sequence_number_ = kNeverUsableSequenceNumber; | 295 async_sequence_number_ = kNeverUsableSequenceNumber; |
197 } | 296 } |
198 // Just in case there was a task pending.... | 297 // Just in case there was a task pending.... |
199 InternalPostTask(old_thread, old_callback, unresponsive_renderers, | 298 InternalPostTask(old_thread, old_callback); |
200 old_start_time); | |
201 } | 299 } |
202 | 300 |
203 void HistogramSynchronizer::ForceHistogramSynchronizationDoneCallback( | 301 void HistogramSynchronizer::ForceHistogramSynchronizationDoneCallback( |
204 int sequence_number) { | 302 int sequence_number) { |
205 base::Closure callback; | 303 base::Closure callback; |
206 MessageLoop* thread = NULL; | 304 MessageLoop* thread = NULL; |
207 TimeTicks started; | |
208 int unresponsive_renderers; | |
209 { | 305 { |
210 base::AutoLock lock(lock_); | 306 base::AutoLock lock(lock_); |
211 if (sequence_number != async_sequence_number_) | 307 if (sequence_number != async_sequence_number_) |
212 return; | 308 return; |
213 callback = callback_; | 309 callback = callback_; |
214 thread = callback_thread_; | 310 thread = callback_thread_; |
215 callback_.Reset(); | 311 callback_.Reset(); |
216 callback_thread_ = NULL; | 312 callback_thread_ = NULL; |
217 started = async_callback_start_time_; | |
218 unresponsive_renderers = async_renderers_pending_; | |
219 } | 313 } |
220 InternalPostTask(thread, callback, unresponsive_renderers, started); | 314 InternalPostTask(thread, callback); |
221 } | 315 } |
222 | 316 |
223 void HistogramSynchronizer::InternalPostTask(MessageLoop* thread, | 317 void HistogramSynchronizer::InternalPostTask(MessageLoop* thread, |
224 const base::Closure& callback, | 318 const base::Closure& callback) { |
225 int unresponsive_renderers, | |
226 const base::TimeTicks& started) { | |
227 if (callback.is_null() || !thread) | 319 if (callback.is_null() || !thread) |
228 return; | 320 return; |
229 UMA_HISTOGRAM_COUNTS("Histogram.RendersNotRespondingAsynchronous", | |
230 unresponsive_renderers); | |
231 if (!unresponsive_renderers) { | |
232 UMA_HISTOGRAM_TIMES("Histogram.FetchRendererHistogramsAsynchronously", | |
233 TimeTicks::Now() - started); | |
234 } | |
235 | |
236 thread->PostTask(FROM_HERE, callback); | 321 thread->PostTask(FROM_HERE, callback); |
237 } | 322 } |
238 | 323 |
239 int HistogramSynchronizer::GetNextAvailableSequenceNumber( | 324 int HistogramSynchronizer::GetNextAvailableSequenceNumber( |
240 RendererHistogramRequester requester, | 325 ProcessHistogramRequester requester) { |
241 int renderer_count) { | |
242 base::AutoLock auto_lock(lock_); | 326 base::AutoLock auto_lock(lock_); |
243 ++last_used_sequence_number_; | 327 ++last_used_sequence_number_; |
244 // Watch out for wrapping to a negative number. | 328 // Watch out for wrapping to a negative number. |
245 if (last_used_sequence_number_ < 0) { | 329 if (last_used_sequence_number_ < 0) { |
246 // Bypass the reserved number, which is used when a renderer spontaneously | 330 // Bypass the reserved number, which is used when a renderer spontaneously |
247 // decides to send some histogram data. | 331 // decides to send some histogram data. |
248 last_used_sequence_number_ = | 332 last_used_sequence_number_ = |
249 chrome::kHistogramSynchronizerReservedSequenceNumber + 1; | 333 chrome::kHistogramSynchronizerReservedSequenceNumber + 1; |
250 } | 334 } |
251 DCHECK_NE(last_used_sequence_number_, | 335 DCHECK_NE(last_used_sequence_number_, |
252 chrome::kHistogramSynchronizerReservedSequenceNumber); | 336 chrome::kHistogramSynchronizerReservedSequenceNumber); |
253 if (requester == ASYNC_HISTOGRAMS) { | 337 if (requester == ASYNC_HISTOGRAMS) |
254 async_sequence_number_ = last_used_sequence_number_; | 338 async_sequence_number_ = last_used_sequence_number_; |
255 async_renderers_pending_ = renderer_count; | |
256 } else if (requester == SYNCHRONOUS_HISTOGRAMS) { | |
257 synchronous_sequence_number_ = last_used_sequence_number_; | |
258 synchronous_renderers_pending_ = renderer_count; | |
259 } | |
260 return last_used_sequence_number_; | 339 return last_used_sequence_number_; |
261 } | 340 } |
262 | 341 |
263 // static | 342 // static |
264 HistogramSynchronizer* HistogramSynchronizer::histogram_synchronizer_ = NULL; | 343 HistogramSynchronizer* HistogramSynchronizer::g_histogram_synchronizer = NULL; |
| 344 |
| 345 // static |
| 346 base::LazyInstance<HistogramRequestContext::HistogramRequestContextMap>::Leaky |
| 347 HistogramRequestContext::outstanding_requests_ = LAZY_INSTANCE_INITIALIZER; |
OLD | NEW |