diff options
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/timing_logger.cc | 8 | ||||
| -rw-r--r-- | runtime/base/timing_logger.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc index 1dcad0e..11dc542 100644 --- a/runtime/base/timing_logger.cc +++ b/runtime/base/timing_logger.cc @@ -77,7 +77,7 @@ uint64_t CumulativeLogger::GetTotalTime() const { void CumulativeLogger::AddLogger(const base::TimingLogger &logger) { MutexLock mu(Thread::Current(), lock_); const base::TimingLogger::SplitTimings& splits = logger.GetSplits(); - for (base::TimingLogger::SplitsIterator it = splits.begin(), end = splits.end(); + for (base::TimingLogger::SplitTimingsIterator it = splits.begin(), end = splits.end(); it != end; ++it) { base::TimingLogger::SplitTiming split = *it; uint64_t split_time = split.first; @@ -155,7 +155,7 @@ void TimingLogger::NewSplit(const char* new_split_label) { uint64_t TimingLogger::GetTotalNs() const { uint64_t total_ns = 0; - for (base::TimingLogger::SplitsIterator it = splits_.begin(), end = splits_.end(); + for (base::TimingLogger::SplitTimingsIterator it = splits_.begin(), end = splits_.end(); it != end; ++it) { base::TimingLogger::SplitTiming split = *it; total_ns += split.first; @@ -166,7 +166,7 @@ uint64_t TimingLogger::GetTotalNs() const { void TimingLogger::Dump(std::ostream &os) const { uint64_t longest_split = 0; uint64_t total_ns = 0; - for (base::TimingLogger::SplitsIterator it = splits_.begin(), end = splits_.end(); + for (base::TimingLogger::SplitTimingsIterator it = splits_.begin(), end = splits_.end(); it != end; ++it) { base::TimingLogger::SplitTiming split = *it; uint64_t split_time = split.first; @@ -177,7 +177,7 @@ void TimingLogger::Dump(std::ostream &os) const { TimeUnit tu = GetAppropriateTimeUnit(longest_split); uint64_t divisor = GetNsToTimeUnitDivisor(tu); // Print formatted splits. - for (base::TimingLogger::SplitsIterator it = splits_.begin(), end = splits_.end(); + for (base::TimingLogger::SplitTimingsIterator it = splits_.begin(), end = splits_.end(); it != end; ++it) { base::TimingLogger::SplitTiming split = *it; uint64_t split_time = split.first; diff --git a/runtime/base/timing_logger.h b/runtime/base/timing_logger.h index 777d3f0..07d1ee0 100644 --- a/runtime/base/timing_logger.h +++ b/runtime/base/timing_logger.h @@ -33,9 +33,6 @@ namespace base { class CumulativeLogger { public: - typedef std::map<std::string, Histogram<uint64_t> *> Histograms; - typedef std::map<std::string, Histogram<uint64_t> *>::const_iterator HistogramsIterator; - explicit CumulativeLogger(const std::string& name); void prepare_stats(); ~CumulativeLogger(); @@ -50,6 +47,9 @@ class CumulativeLogger { void AddLogger(const base::TimingLogger& logger) LOCKS_EXCLUDED(lock_); private: + typedef std::map<std::string, Histogram<uint64_t> *> Histograms; + typedef std::map<std::string, Histogram<uint64_t> *>::const_iterator HistogramsIterator; + void AddPair(const std::string &label, uint64_t delta_time) EXCLUSIVE_LOCKS_REQUIRED(lock_); void DumpHistogram(std::ostream &os) EXCLUSIVE_LOCKS_REQUIRED(lock_); @@ -73,7 +73,7 @@ class TimingLogger { // Splits are nanosecond times and split names. typedef std::pair<uint64_t, const char*> SplitTiming; typedef std::vector<SplitTiming> SplitTimings; - typedef std::vector<SplitTiming>::const_iterator SplitsIterator; + typedef std::vector<SplitTiming>::const_iterator SplitTimingsIterator; explicit TimingLogger(const char* name, bool precise, bool verbose); |