diff options
Diffstat (limited to 'base/metrics/histogram_base.cc')
-rw-r--r-- | base/metrics/histogram_base.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/base/metrics/histogram_base.cc b/base/metrics/histogram_base.cc index 8c4f1eca18..396f29739a 100644 --- a/base/metrics/histogram_base.cc +++ b/base/metrics/histogram_base.cc @@ -97,8 +97,7 @@ bool HistogramBase::SerializeInfo(Pickle* pickle) const { return SerializeInfoImpl(pickle); } -uint32_t HistogramBase::FindCorruption( - const HistogramSamples& /*samples*/) const { +uint32_t HistogramBase::FindCorruption(const HistogramSamples& /* samples */) const { // Not supported by default. return NO_INCONSISTENCIES; } @@ -119,14 +118,16 @@ void HistogramBase::WriteJSON(std::string* output) const { root.SetInteger("flags", flags()); root.Set("params", std::move(parameters)); root.Set("buckets", std::move(buckets)); - root.SetInteger("pid", GetCurrentProcId()); + root.SetInteger("pid", GetUniqueIdForProcess()); serializer.Serialize(root); } // static void HistogramBase::EnableActivityReportHistogram( const std::string& process_type) { - DCHECK(!report_histogram_); + if (report_histogram_) + return; + size_t existing = StatisticsRecorder::GetHistogramCount(); if (existing != 0) { DVLOG(1) << existing @@ -174,12 +175,7 @@ void HistogramBase::WriteAsciiBucketGraph(double current_size, const std::string HistogramBase::GetSimpleAsciiBucketRange( Sample sample) const { - std::string result; - if (kHexRangePrintingFlag & flags()) - StringAppendF(&result, "%#x", sample); - else - StringAppendF(&result, "%d", sample); - return result; + return StringPrintf("%d", sample); } void HistogramBase::WriteAsciiBucketValue(Count current, |