Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Side by Side Diff: net/disk_cache/stats_histogram.cc

Issue 6962016: Revert "Land http://codereview.chromium.org/6869009 for the third time." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/disk_cache/stats_histogram.h ('k') | tools/heapcheck/suppressions.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "net/disk_cache/stats_histogram.h" 5 #include "net/disk_cache/stats_histogram.h"
6 6
7 #include "base/debug/leak_annotations.h"
8 #include "base/logging.h" 7 #include "base/logging.h"
9 #include "net/disk_cache/stats.h" 8 #include "net/disk_cache/stats.h"
10 9
11 namespace disk_cache { 10 namespace disk_cache {
12 11
13 using base::Histogram; 12 using base::Histogram;
14 using base::StatisticsRecorder; 13 using base::StatisticsRecorder;
15 14
16 // Static. 15 // Static.
17 const Stats* StatsHistogram::stats_ = NULL; 16 const Stats* StatsHistogram::stats_ = NULL;
18 17
19 StatsHistogram::~StatsHistogram() { 18 StatsHistogram::~StatsHistogram() {
20 // Only cleanup what we set. 19 // Only cleanup what we set.
21 if (init_) 20 if (init_)
22 stats_ = NULL; 21 stats_ = NULL;
23 } 22 }
24 23
25 StatsHistogram* StatsHistogram::FactoryGet(const std::string& name) { 24 StatsHistogram* StatsHistogram::StatsHistogramFactoryGet(
25 const std::string& name) {
26 Histogram* histogram(NULL); 26 Histogram* histogram(NULL);
27 27
28 Sample minimum = 1; 28 Sample minimum = 1;
29 Sample maximum = disk_cache::Stats::kDataSizesLength - 1; 29 Sample maximum = disk_cache::Stats::kDataSizesLength - 1;
30 size_t bucket_count = disk_cache::Stats::kDataSizesLength; 30 size_t bucket_count = disk_cache::Stats::kDataSizesLength;
31 31
32 if (StatisticsRecorder::FindHistogram(name, &histogram)) { 32 if (StatisticsRecorder::FindHistogram(name, &histogram)) {
33 DCHECK(histogram != NULL); 33 DCHECK(histogram != NULL);
34 } else { 34 } else {
35 // To avoid racy destruction at shutdown, the following will be leaked. 35 // To avoid racy destruction at shutdown, the following will be leaked.
36 StatsHistogram* stats_histogram = 36 StatsHistogram* stats_histogram =
37 new StatsHistogram(name, minimum, maximum, bucket_count); 37 new StatsHistogram(name, minimum, maximum, bucket_count);
38 stats_histogram->InitializeBucketRange(); 38 stats_histogram->InitializeBucketRange();
39 stats_histogram->SetFlags(kUmaTargetedHistogramFlag); 39 stats_histogram->SetFlags(kUmaTargetedHistogramFlag);
40 histogram = StatisticsRecorder::RegisterOrDeleteDuplicate(stats_histogram); 40 histogram = StatisticsRecorder::RegisterOrDeleteDuplicate(stats_histogram);
41 } 41 }
42 42
43 DCHECK(HISTOGRAM == histogram->histogram_type()); 43 DCHECK(HISTOGRAM == histogram->histogram_type());
44 DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count)); 44 DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count));
45 45
46 // We're preparing for an otherwise unsafe upcast by ensuring we have the 46 // We're preparing for an otherwise unsafe upcast by ensuring we have the
47 // proper class type. 47 // proper class type.
48 StatsHistogram* return_histogram = static_cast<StatsHistogram*>(histogram); 48 StatsHistogram* return_histogram = static_cast<StatsHistogram*>(histogram);
49 // Validate upcast by seeing that we're probably providing the checksum. 49 // Validate upcast by seeing that we're probably providing the checksum.
50 CHECK_EQ(return_histogram->StatsHistogram::CalculateRangeChecksum(), 50 CHECK_EQ(return_histogram->StatsHistogram::CalculateRangeChecksum(),
51 return_histogram->CalculateRangeChecksum()); 51 return_histogram->CalculateRangeChecksum());
52 ANNOTATE_LEAKING_OBJECT_PTR(return_histogram); // see crbug.com/79322
53 return return_histogram; 52 return return_histogram;
54 } 53 }
55 54
56 bool StatsHistogram::Init(const Stats* stats) { 55 bool StatsHistogram::Init(const Stats* stats) {
57 DCHECK(stats); 56 DCHECK(stats);
58 if (stats_) 57 if (stats_)
59 return false; 58 return false;
60 59
61 // We support statistics report for only one cache. 60 // We support statistics report for only one cache.
62 init_ = true; 61 init_ = true;
(...skipping 27 matching lines...) Expand all
90 return NO_INCONSISTENCIES; // This class won't monitor inconsistencies. 89 return NO_INCONSISTENCIES; // This class won't monitor inconsistencies.
91 } 90 }
92 91
93 uint32 StatsHistogram::CalculateRangeChecksum() const { 92 uint32 StatsHistogram::CalculateRangeChecksum() const {
94 // We don't calculate checksums, so at least establish a unique constant. 93 // We don't calculate checksums, so at least establish a unique constant.
95 const uint32 kStatsHistogramChecksum = 0x0cecce; 94 const uint32 kStatsHistogramChecksum = 0x0cecce;
96 return kStatsHistogramChecksum; 95 return kStatsHistogramChecksum;
97 } 96 }
98 97
99 } // namespace disk_cache 98 } // namespace disk_cache
OLDNEW
« no previous file with comments | « net/disk_cache/stats_histogram.h ('k') | tools/heapcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698