| Index: base/metrics/histogram_macros.h
|
| diff --git a/base/metrics/histogram_macros.h b/base/metrics/histogram_macros.h
|
| index a9996d1c2a30b83d69b320e901488d368d254b38..e9a871c358f71860f8314cd4510eb3bab6285132 100644
|
| --- a/base/metrics/histogram_macros.h
|
| +++ b/base/metrics/histogram_macros.h
|
| @@ -68,25 +68,25 @@
|
| // a macro argument here. The name is only used in a DCHECK, to assure that
|
| // callers don't try to vary the name of the histogram (which would tend to be
|
| // ignored by the one-time initialization of the histogtram_pointer).
|
| -#define STATIC_HISTOGRAM_POINTER_BLOCK(constant_histogram_name, \
|
| - histogram_add_method_invocation, \
|
| - histogram_factory_get_invocation) \
|
| - do { \
|
| - static base::subtle::AtomicWord atomic_histogram_pointer = 0; \
|
| - base::HistogramBase* histogram_pointer( \
|
| - reinterpret_cast<base::HistogramBase*>( \
|
| - base::subtle::Acquire_Load(&atomic_histogram_pointer))); \
|
| - if (!histogram_pointer) { \
|
| - histogram_pointer = histogram_factory_get_invocation; \
|
| - base::subtle::Release_Store(&atomic_histogram_pointer, \
|
| +#define STATIC_HISTOGRAM_POINTER_BLOCK(constant_histogram_name, \
|
| + histogram_add_method_invocation, \
|
| + histogram_factory_get_invocation) \
|
| + do { \
|
| + static base::subtle::AtomicWord atomic_histogram_pointer = 0; \
|
| + base::HistogramBase* histogram_pointer( \
|
| + reinterpret_cast<base::HistogramBase*>( \
|
| + base::subtle::Acquire_Load(&atomic_histogram_pointer))); \
|
| + if (!histogram_pointer) { \
|
| + histogram_pointer = histogram_factory_get_invocation; \
|
| + base::subtle::Release_Store( \
|
| + &atomic_histogram_pointer, \
|
| reinterpret_cast<base::subtle::AtomicWord>(histogram_pointer)); \
|
| - } \
|
| - if (DCHECK_IS_ON) \
|
| - histogram_pointer->CheckName(constant_histogram_name); \
|
| - histogram_pointer->histogram_add_method_invocation; \
|
| + } \
|
| + if (DCHECK_IS_ON()) \
|
| + histogram_pointer->CheckName(constant_histogram_name); \
|
| + histogram_pointer->histogram_add_method_invocation; \
|
| } while (0)
|
|
|
| -
|
| //------------------------------------------------------------------------------
|
| // Provide easy general purpose histogram in a macro, just like stats counters.
|
| // The first four macros use 50 buckets.
|
|
|