Merge "If dex2oat takes >1s, show a breakdown of where the time went." into dalvik-dev

1 files changed, 6 insertions, 2 deletions

diff --git a/src/timing_logger.h b/src/timing_logger.h
index b8e545e673..594ae98b55 100644
--- a/src/timing_logger.h
+++ b/src/timing_logger.h
@@ -41,9 +41,13 @@ class TimingLogger {
   void Dump() {
     LOG(INFO) << name_ << ": begin";
     for (size_t i = 1; i < times_.size(); ++i) {
-      LOG(INFO) << name_ << ": " << PrettyDuration(times_[i] - times_[i-1]) << labels_[i];
+      LOG(INFO) << name_ << StringPrintf(": %8lld ms, ", NsToMs(times_[i] - times_[i-1])) << labels_[i];
     }
-    LOG(INFO) << name_ << ": end, " << PrettyDuration(times_.back() - times_.front());
+    LOG(INFO) << name_ << ": end, " << NsToMs(GetTotalNs()) << " ms";
+  }
+
+  uint64_t GetTotalNs() {
+    return times_.back() - times_.front();
   }
 
  private: