commit 2369b1eb8095f42c16f05f553dd58683353ed65d
author Wei Wang <wvw@google.com> Thu Nov 17 03:46:43 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 17 03:46:44 2016 +0000
tree 747e4d1afc388635ba9b6d36fb29ba97dc3ddb58
parent d8d7fc6717c5d873411053f84abed680a4f1bf72
parent d67a4abc647d5ed7235ff7ee1695b31340e63a1c

Merge changes from topic 'slow_log'

* changes:
  init: fix undefined behavior in ExecuteCommand
  Revert "Revert "init: warn slow action""

init/action.cpp

diff --git a/init/action.cpp b/init/action.cpp
index ccc18cf..acbb12e 100644
--- a/init/action.cpp
+++ b/init/action.cpp
@@ -105,7 +105,10 @@
 }
 
 void Action::ExecuteOneCommand(std::size_t command) const {
-    ExecuteCommand(commands_[command]);
+    // We need a copy here since some Command execution may result in
+    // changing commands_ vector by importing .rc files through parser
+    Command cmd = commands_[command];
+    ExecuteCommand(cmd);
 }
 
 void Action::ExecuteAllCommands() const {
@@ -118,14 +121,16 @@
     Timer t;
     int result = command.InvokeFunc();
 
-    // TODO: this should probably be changed to "if (failed || took a long time)"...
-    if (android::base::GetMinimumLogSeverity() <= android::base::DEBUG) {
+    double duration_ms = t.duration() * 1000;
+    // Any action longer than 50ms will be warned to user as slow operation
+    if (duration_ms > 50.0 ||
+        android::base::GetMinimumLogSeverity() <= android::base::DEBUG) {
         std::string trigger_name = BuildTriggersString();
         std::string cmd_str = command.BuildCommandString();
         std::string source = command.BuildSourceString();
 
         LOG(INFO) << "Command '" << cmd_str << "' action=" << trigger_name << source
-                  << " returned " << result << " took " << t.duration() << "s";
+                  << " returned " << result << " took " << duration_ms << "ms.";
     }
 }
 

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 08b591b..8042bfd 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -589,9 +589,9 @@
 
     for (na = args.size() - 1; na > 1; --na) {
         if (args[na] == "--early") {
-             path_arg_end = na;
-             queue_event = false;
-             mount_mode = MOUNT_MODE_EARLY;
+            path_arg_end = na;
+            queue_event = false;
+            mount_mode = MOUNT_MODE_EARLY;
         } else if (args[na] == "--late") {
             path_arg_end = na;
             import_rc = false;