diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 03:06:12 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 03:06:12 +0000 |
| commit | 2f4a8e1220d91ba95c2c46ec232dd53d27807ecd (patch) | |
| tree | a353800ca5728e7c26423af7cccedf9812404d9a /base/metrics | |
| parent | 27488c22fe34d431fa34576032d8a0fc92b61572 (diff) | |
| download | chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.zip chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.tar.gz chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.tar.bz2 | |
Revert 107042 - Replace most LOG/CHECK statements with DLOG/DCHECK statements in base.
I tried hard not to change CHECKs that had side effects. I kept fatal checks
that seemed security or debugging-info (in crash reports) sensitive, and ones
that seems particularly well-conceived.
Review URL: http://codereview.chromium.org/8368009
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/8351025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics')
| -rw-r--r-- | base/metrics/histogram.cc | 12 | ||||
| -rw-r--r-- | base/metrics/stats_table.cc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index 7077b09..484d095 100644 --- a/base/metrics/histogram.cc +++ b/base/metrics/histogram.cc @@ -268,7 +268,7 @@ bool Histogram::DeserializeHistogramInfo(const std::string& histogram_info) { !pickle.ReadInt(&iter, &histogram_type) || !pickle.ReadInt(&iter, &pickle_flags) || !sample.Histogram::SampleSet::Deserialize(&iter, pickle)) { - DLOG(ERROR) << "Pickle error decoding Histogram: " << histogram_name; + LOG(ERROR) << "Pickle error decoding Histogram: " << histogram_name; return false; } DCHECK(pickle_flags & kIPCSerializationSourceFlag); @@ -276,7 +276,7 @@ bool Histogram::DeserializeHistogramInfo(const std::string& histogram_info) { // checks above and beyond those in Histogram::Initialize() if (declared_max <= 0 || declared_min <= 0 || declared_max < declared_min || INT_MAX / sizeof(Count) <= bucket_count || bucket_count < 2) { - DLOG(ERROR) << "Values error decoding Histogram: " << histogram_name; + LOG(ERROR) << "Values error decoding Histogram: " << histogram_name; return false; } @@ -295,8 +295,8 @@ bool Histogram::DeserializeHistogramInfo(const std::string& histogram_info) { } else if (histogram_type == BOOLEAN_HISTOGRAM) { render_histogram = BooleanHistogram::FactoryGet(histogram_name, flags); } else { - DLOG(ERROR) << "Error Deserializing Histogram Unknown histogram_type: " - << histogram_type; + LOG(ERROR) << "Error Deserializing Histogram Unknown histogram_type: " + << histogram_type; return false; } @@ -433,7 +433,7 @@ Histogram::~Histogram() { if (StatisticsRecorder::dump_on_exit()) { std::string output; WriteAscii(true, "\n", &output); - DLOG(INFO) << output; + LOG(INFO) << output; } // Just to make sure most derived class did this properly... @@ -1025,7 +1025,7 @@ StatisticsRecorder::~StatisticsRecorder() { if (dump_on_exit_) { std::string output; WriteGraph("", &output); - DLOG(INFO) << output; + LOG(INFO) << output; } // Clean up. HistogramMap* histograms = NULL; diff --git a/base/metrics/stats_table.cc b/base/metrics/stats_table.cc index 2bccc90..3db008e 100644 --- a/base/metrics/stats_table.cc +++ b/base/metrics/stats_table.cc @@ -265,7 +265,7 @@ StatsTable::StatsTable(const std::string& name, int max_threads, impl_ = Private::New(name, table_size, max_threads, max_counters); if (!impl_) - DPLOG(ERROR) << "StatsTable did not initialize"; + PLOG(ERROR) << "StatsTable did not initialize"; } StatsTable::~StatsTable() { |