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 "content/browser/histogram_synchronizer.h" | 5 #include "content/browser/histogram_synchronizer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/location.h" |
9 #include "base/logging.h" | 10 #include "base/logging.h" |
10 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
11 #include "base/metrics/histogram_delta_serialization.h" | 12 #include "base/metrics/histogram_delta_serialization.h" |
12 #include "base/pickle.h" | 13 #include "base/pickle.h" |
| 14 #include "base/single_thread_task_runner.h" |
13 #include "base/threading/thread.h" | 15 #include "base/threading/thread.h" |
14 #include "base/threading/thread_restrictions.h" | 16 #include "base/threading/thread_restrictions.h" |
15 #include "content/browser/histogram_controller.h" | 17 #include "content/browser/histogram_controller.h" |
16 #include "content/public/browser/browser_thread.h" | 18 #include "content/public/browser/browser_thread.h" |
17 #include "content/public/browser/histogram_fetcher.h" | 19 #include "content/public/browser/histogram_fetcher.h" |
18 #include "content/public/common/content_constants.h" | 20 #include "content/public/common/content_constants.h" |
19 | 21 |
20 using base::Time; | 22 using base::Time; |
21 using base::TimeDelta; | 23 using base::TimeDelta; |
22 using base::TimeTicks; | 24 using base::TimeTicks; |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 callback_.Reset(); | 314 callback_.Reset(); |
313 callback_thread_ = NULL; | 315 callback_thread_ = NULL; |
314 } | 316 } |
315 InternalPostTask(thread, callback); | 317 InternalPostTask(thread, callback); |
316 } | 318 } |
317 | 319 |
318 void HistogramSynchronizer::InternalPostTask(base::MessageLoop* thread, | 320 void HistogramSynchronizer::InternalPostTask(base::MessageLoop* thread, |
319 const base::Closure& callback) { | 321 const base::Closure& callback) { |
320 if (callback.is_null() || !thread) | 322 if (callback.is_null() || !thread) |
321 return; | 323 return; |
322 thread->PostTask(FROM_HERE, callback); | 324 thread->task_runner()->PostTask(FROM_HERE, callback); |
323 } | 325 } |
324 | 326 |
325 int HistogramSynchronizer::GetNextAvailableSequenceNumber( | 327 int HistogramSynchronizer::GetNextAvailableSequenceNumber( |
326 ProcessHistogramRequester requester) { | 328 ProcessHistogramRequester requester) { |
327 base::AutoLock auto_lock(lock_); | 329 base::AutoLock auto_lock(lock_); |
328 ++last_used_sequence_number_; | 330 ++last_used_sequence_number_; |
329 // Watch out for wrapping to a negative number. | 331 // Watch out for wrapping to a negative number. |
330 if (last_used_sequence_number_ < 0) { | 332 if (last_used_sequence_number_ < 0) { |
331 // Bypass the reserved number, which is used when a renderer spontaneously | 333 // Bypass the reserved number, which is used when a renderer spontaneously |
332 // decides to send some histogram data. | 334 // decides to send some histogram data. |
333 last_used_sequence_number_ = | 335 last_used_sequence_number_ = |
334 kHistogramSynchronizerReservedSequenceNumber + 1; | 336 kHistogramSynchronizerReservedSequenceNumber + 1; |
335 } | 337 } |
336 DCHECK_NE(last_used_sequence_number_, | 338 DCHECK_NE(last_used_sequence_number_, |
337 kHistogramSynchronizerReservedSequenceNumber); | 339 kHistogramSynchronizerReservedSequenceNumber); |
338 if (requester == ASYNC_HISTOGRAMS) | 340 if (requester == ASYNC_HISTOGRAMS) |
339 async_sequence_number_ = last_used_sequence_number_; | 341 async_sequence_number_ = last_used_sequence_number_; |
340 return last_used_sequence_number_; | 342 return last_used_sequence_number_; |
341 } | 343 } |
342 | 344 |
343 } // namespace content | 345 } // namespace content |
OLD | NEW |