tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "init: fix DumpState() logging"

Browse source
This commit is contained in:
Tom Cherry 2017-03-14 20:12:48 +00:00 committed by Gerrit Code Review
commit f31abeb973
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
init/action.cpp
View file

@ -246,20 +246,16 @@ bool Action::TriggersEqual(const Action& other) const {
}
std::string Action::BuildTriggersString() const {
std::string result;
std::vector<std::string> triggers;
for (const auto& [trigger_name, trigger_value] : property_triggers_) {
result += trigger_name;
result += '=';
result += trigger_value;
result += ' ';
triggers.emplace_back(trigger_name + '=' + trigger_value);
}
if (!event_trigger_.empty()) {
result += event_trigger_;
result += ' ';
triggers.emplace_back(event_trigger_);
}
result.pop_back();
return result;
return Join(triggers, " && ");
}
void Action::DumpState() const {
@ -268,7 +264,7 @@ void Action::DumpState() const {
for (const auto& c : commands_) {
std::string cmd_str = c.BuildCommandString();
LOG(INFO) << " %s" << cmd_str;
LOG(INFO) << " " << cmd_str;
}
}

4
init/builtins.cpp
View file

@ -494,6 +494,10 @@ static void import_late(const std::vector<std::string>& args, size_t start_index
parser.ParseConfig(args[i]);
}
}
// Turning this on and letting the INFO logging be discarded adds 0.2s to
// Nexus 9 boot time, so it's disabled by default.
if (false) parser.DumpState();
}
/* mount_fstab

4
init/init.cpp
View file

@ -1254,6 +1254,10 @@ int main(int argc, char** argv) {
parser.set_is_odm_etc_init_loaded(true);
}
// Turning this on and letting the INFO logging be discarded adds 0.2s to
// Nexus 9 boot time, so it's disabled by default.
if (false) parser.DumpState();
ActionManager& am = ActionManager::GetInstance();
am.QueueEventTrigger("early-init");

4
init/init_parser.cpp
View file

@ -106,10 +106,6 @@ bool Parser::ParseConfigFile(const std::string& path) {
sp.second->EndFile(path);
}
// Turning this on and letting the INFO logging be discarded adds 0.2s to
// Nexus 9 boot time, so it's disabled by default.
if (false) DumpState();
LOG(VERBOSE) << "(Parsing " << path << " took " << t << ".)";
return true;
}