From 8b1d526a72c1e6705b03f4b3267ee02fe84ce765 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Tue, 15 Nov 2016 23:58:55 -0800 Subject: [PATCH] Revert "Revert "init: warn slow action"" This reverts commit 1802d11cc766f04e75e93c7f98dcf52fb2e64149. Test: grep init log Bug: 32712851 --- init/action.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/init/action.cpp b/init/action.cpp index ccc18cf9e..e9b2a0dfe 100644 --- a/init/action.cpp +++ b/init/action.cpp @@ -118,14 +118,16 @@ void Action::ExecuteCommand(const Command& command) const { 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."; } }