Merge remote-tracking branch 'aosp/upstream' into master

am: 223a86e1a1

Change-Id: I06dbdde3b1899ea784996541bd8bdfac86dd47d8

3 files changed, 30 insertions, 5 deletions

diff --git a/find.cc b/find.cc
index a1675d2..1b9e23f 100644
--- a/find.cc
+++ b/find.cc
@@ -733,7 +733,8 @@ class FindCommandParser {
         if (!GetNextToken(&tok) || !tok.empty())
           return false;
         return true;
-      } else if (tok == "build/tools/findleaves.py") {
+      } else if (tok == "build/tools/findleaves.py" ||
+                 tok == "build/make/tools/findleaves.py") {
         if (!ParseFindLeaves())
           return false;
         return true;
@@ -1033,7 +1034,8 @@ FindCommand::~FindCommand() {}
 
 bool FindCommand::Parse(const string& cmd) {
   FindCommandParser fcp(cmd, this);
-  if (!HasWord(cmd, "find") && !HasWord(cmd, "build/tools/findleaves.py"))
+  if (!HasWord(cmd, "find") && !HasWord(cmd, "build/tools/findleaves.py") &&
+      !HasWord(cmd, "build/make/tools/findleaves.py"))
     return false;
 
   if (!fcp.Parse())
diff --git a/stats.cc b/stats.cc
index 8bd3e73..27d6c50 100644
--- a/stats.cc
+++ b/stats.cc
@@ -16,6 +16,7 @@
 
 #include "stats.h"
 
+#include <algorithm>
 #include <mutex>
 #include <vector>
 
@@ -40,6 +41,21 @@ Stats::Stats(const char* name) : name_(name), elapsed_(0), cnt_(0) {
   g_stats->push_back(this);
 }
 
+void Stats::DumpTop() const {
+  unique_lock<mutex> lock(mu_);
+  if (detailed_.size() > 0) {
+    vector<pair<string, double>> v(detailed_.begin(), detailed_.end());
+    sort(
+        v.begin(), v.end(),
+        [](const pair<string, double> a, const pair<string, double> b) -> bool {
+          return a.second > b.second;
+        });
+    for (unsigned int i = 0; i < 10 && i < v.size(); i++) {
+      LOG_STAT(" %5.3f %s", v[i].first.c_str(), v[i].second);
+    }
+  }
+}
+
 string Stats::String() const {
   unique_lock<mutex> lock(mu_);
   return StringPrintf("%s: %f / %d", name_, elapsed_, cnt_);
@@ -52,12 +68,15 @@ void Stats::Start() {
   cnt_++;
 }
 
-double Stats::End() {
+double Stats::End(const char* msg) {
   CHECK(TLS_REF(g_start_time));
   double e = GetTime() - TLS_REF(g_start_time);
   TLS_REF(g_start_time) = 0;
   unique_lock<mutex> lock(mu_);
   elapsed_ += e;
+  if (msg != 0) {
+    detailed_[string(msg)] += e;
+  }
   return e;
 }
 
@@ -71,7 +90,7 @@ ScopedStatsRecorder::ScopedStatsRecorder(Stats* st, const char* msg)
 ScopedStatsRecorder::~ScopedStatsRecorder() {
   if (!g_flags.enable_stat_logs)
     return;
-  double e = st_->End();
+  double e = st_->End(msg_);
   if (msg_ && e > 3.0) {
     LOG_STAT("slow %s (%f): %s", st_->name_, e, msg_);
   }
@@ -82,6 +101,7 @@ void ReportAllStats() {
     return;
   for (Stats* st : *g_stats) {
     LOG_STAT("%s", st->String().c_str());
+    st->DumpTop();
   }
   delete g_stats;
 }
diff --git a/stats.h b/stats.h
index e77503a..25f6e5b 100644
--- a/stats.h
+++ b/stats.h
@@ -17,6 +17,7 @@
 
 #include <mutex>
 #include <string>
+#include <unordered_map>
 
 using namespace std;
 
@@ -24,11 +25,12 @@ class Stats {
  public:
   explicit Stats(const char* name);
 
+  void DumpTop() const;
   string String() const;
 
  private:
   void Start();
-  double End();
+  double End(const char* msg);
 
   friend class ScopedStatsRecorder;
 
@@ -36,6 +38,7 @@ class Stats {
   double elapsed_;
   int cnt_;
   mutable mutex mu_;
+  unordered_map<string, double> detailed_;
 };
 
 class ScopedStatsRecorder {