| Index: net/disk_cache/blockfile/histogram_macros.h
|
| diff --git a/net/disk_cache/blockfile/histogram_macros.h b/net/disk_cache/blockfile/histogram_macros.h
|
| index ecffc8f0a4f6ca1d4d052d2472625bfa86b606a0..6037362fb5411aa39461f5d07b95cfd973569a7a 100644
|
| --- a/net/disk_cache/blockfile/histogram_macros.h
|
| +++ b/net/disk_cache/blockfile/histogram_macros.h
|
| @@ -17,43 +17,56 @@
|
| // the counter is not cached locally.
|
|
|
| #define CACHE_HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, bucket_count) \
|
| - do { \
|
| - base::HistogramBase* counter = base::Histogram::FactoryGet( \
|
| - name, min, max, bucket_count, \
|
| - base::Histogram::kUmaTargetedHistogramFlag); \
|
| - counter->Add(sample); \
|
| - } while (0)
|
| + do { \
|
| + base::HistogramBase* counter = base::Histogram::FactoryGet( \
|
| + name, \
|
| + min, \
|
| + max, \
|
| + bucket_count, \
|
| + base::Histogram::kUmaTargetedHistogramFlag); \
|
| + counter->Add(sample); \
|
| + } while (0)
|
|
|
| -#define CACHE_HISTOGRAM_COUNTS(name, sample) CACHE_HISTOGRAM_CUSTOM_COUNTS( \
|
| - name, sample, 1, 1000000, 50)
|
| +#define CACHE_HISTOGRAM_COUNTS(name, sample) \
|
| + CACHE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 1000000, 50)
|
|
|
| #define CACHE_HISTOGRAM_COUNTS_10000(name, sample) \
|
| - CACHE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 10000, 50)
|
| + CACHE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 10000, 50)
|
|
|
| #define CACHE_HISTOGRAM_COUNTS_50000(name, sample) \
|
| - CACHE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 50000000, 50)
|
| + CACHE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 50000000, 50)
|
|
|
| #define CACHE_HISTOGRAM_CUSTOM_TIMES(name, sample, min, max, bucket_count) \
|
| - do { \
|
| - base::HistogramBase* counter = base::Histogram::FactoryTimeGet( \
|
| - name, min, max, bucket_count, \
|
| - base::Histogram::kUmaTargetedHistogramFlag); \
|
| - counter->AddTime(sample); \
|
| - } while (0)
|
| -
|
| -#define CACHE_HISTOGRAM_TIMES(name, sample) CACHE_HISTOGRAM_CUSTOM_TIMES( \
|
| - name, sample, base::TimeDelta::FromMilliseconds(1), \
|
| - base::TimeDelta::FromSeconds(10), 50)
|
| -
|
| -#define CACHE_HISTOGRAM_ENUMERATION(name, sample, boundary_value) do { \
|
| + do { \
|
| + base::HistogramBase* counter = base::Histogram::FactoryTimeGet( \
|
| + name, \
|
| + min, \
|
| + max, \
|
| + bucket_count, \
|
| + base::Histogram::kUmaTargetedHistogramFlag); \
|
| + counter->AddTime(sample); \
|
| + } while (0)
|
| +
|
| +#define CACHE_HISTOGRAM_TIMES(name, sample) \
|
| + CACHE_HISTOGRAM_CUSTOM_TIMES(name, \
|
| + sample, \
|
| + base::TimeDelta::FromMilliseconds(1), \
|
| + base::TimeDelta::FromSeconds(10), \
|
| + 50)
|
| +
|
| +#define CACHE_HISTOGRAM_ENUMERATION(name, sample, boundary_value) \
|
| + do { \
|
| base::HistogramBase* counter = base::LinearHistogram::FactoryGet( \
|
| - name, 1, boundary_value, boundary_value + 1, \
|
| - base::Histogram::kUmaTargetedHistogramFlag); \
|
| - counter->Add(sample); \
|
| + name, \
|
| + 1, \
|
| + boundary_value, \
|
| + boundary_value + 1, \
|
| + base::Histogram::kUmaTargetedHistogramFlag); \
|
| + counter->Add(sample); \
|
| } while (0)
|
|
|
| #define CACHE_HISTOGRAM_PERCENTAGE(name, under_one_hundred) \
|
| - CACHE_HISTOGRAM_ENUMERATION(name, under_one_hundred, 101)
|
| + CACHE_HISTOGRAM_ENUMERATION(name, under_one_hundred, 101)
|
|
|
| // -----------------------------------------------------------------------------
|
|
|
| @@ -64,16 +77,16 @@
|
| // HISTOGRAM_AGE will collect time elapsed since |initial_time|, with a
|
| // granularity of hours and normal values of a few months.
|
| #define CACHE_HISTOGRAM_AGE(name, initial_time) \
|
| - CACHE_HISTOGRAM_COUNTS_10000(name, \
|
| - (base::Time::Now() - initial_time).InHours())
|
| + CACHE_HISTOGRAM_COUNTS_10000(name, \
|
| + (base::Time::Now() - initial_time).InHours())
|
|
|
| // HISTOGRAM_AGE_MS will collect time elapsed since |initial_time|, with the
|
| // normal resolution of the UMA_HISTOGRAM_TIMES.
|
| -#define CACHE_HISTOGRAM_AGE_MS(name, initial_time)\
|
| - CACHE_HISTOGRAM_TIMES(name, base::TimeTicks::Now() - initial_time)
|
| +#define CACHE_HISTOGRAM_AGE_MS(name, initial_time) \
|
| + CACHE_HISTOGRAM_TIMES(name, base::TimeTicks::Now() - initial_time)
|
|
|
| #define CACHE_HISTOGRAM_CACHE_ERROR(name, sample) \
|
| - CACHE_HISTOGRAM_ENUMERATION(name, sample, 50)
|
| + CACHE_HISTOGRAM_ENUMERATION(name, sample, 50)
|
|
|
| // Generates a UMA histogram of the given type, generating the proper name for
|
| // it (asking backend_->HistogramName), and adding the provided sample.
|
| @@ -85,21 +98,22 @@
|
| // UMA_HISTOGRAM_COUNTS("DiskCache.2.MyName", 20); // "2" is the CacheType.
|
| // UMA_HISTOGRAM_COUNTS("DiskCache.2.MyExperiment_530", 55);
|
| //
|
| -#define CACHE_UMA(type, name, experiment, sample) {\
|
| - const std::string my_name =\
|
| - CACHE_UMA_BACKEND_IMPL_OBJ->HistogramName(name, experiment);\
|
| - switch (CACHE_UMA_BACKEND_IMPL_OBJ->cache_type()) {\
|
| - default:\
|
| - NOTREACHED();\
|
| - /* Fall-through. */\
|
| - case net::DISK_CACHE:\
|
| - case net::MEDIA_CACHE:\
|
| - case net::APP_CACHE:\
|
| - case net::SHADER_CACHE:\
|
| - case net::PNACL_CACHE:\
|
| - CACHE_HISTOGRAM_##type(my_name.data(), sample);\
|
| - break;\
|
| - }\
|
| +#define CACHE_UMA(type, name, experiment, sample) \
|
| + { \
|
| + const std::string my_name = \
|
| + CACHE_UMA_BACKEND_IMPL_OBJ->HistogramName(name, experiment); \
|
| + switch (CACHE_UMA_BACKEND_IMPL_OBJ->cache_type()) { \
|
| + default: \
|
| + NOTREACHED(); \
|
| + /* Fall-through. */ \
|
| + case net::DISK_CACHE: \
|
| + case net::MEDIA_CACHE: \
|
| + case net::APP_CACHE: \
|
| + case net::SHADER_CACHE: \
|
| + case net::PNACL_CACHE: \
|
| + CACHE_HISTOGRAM_##type(my_name.data(), sample); \
|
| + break; \
|
| + } \
|
| }
|
|
|
| #endif // NET_DISK_CACHE_BLOCKFILE_HISTOGRAM_MACROS_H_
|
|
|