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

Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""

Browse source
This commit is contained in:
Treehugger Robot 2016-11-29 18:05:50 +00:00 committed by Gerrit Code Review
commit a10bd47d60
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
init/init.cpp
View file

@ -163,28 +163,14 @@ static int wait_for_coldboot_done_action(const std::vector<std::string>& args) {
Timer t;
LOG(VERBOSE) << "Waiting for " COLDBOOT_DONE "...";
// History:
// Any longer than 1s is an unreasonable length of time to delay booting.
// If you're hitting this timeout, check that you didn't make your
// sepolicy regular expressions too expensive (http://b/19899875).
// Update:
// It is bad to allow device to randomly fail to boot. So, we should
// instead log an error and abandon boot process if we have waited
// for a *considerably* long period of time. For attempts that do not
// exceed the treshold, we keep a record of how long it took for further
// optimization work.
// Also, a longer wait period before timeout gives slower builds like
// heavily instrumented debug builds (e.g. KASan) a chance to fully boot.
if (wait_for_file(COLDBOOT_DONE, 45s) < 0) {
LOG(ERROR) << "Timed out waiting for " COLDBOOT_DONE "; rebooting into recovery mode...";
android_reboot(ANDROID_RB_RESTART2, 0, "recovery");
while (true) { pause(); } // in case reboot is denied
if (wait_for_file(COLDBOOT_DONE, 1s)) {
LOG(ERROR) << "Timed out waiting for " COLDBOOT_DONE;
}
double duration = t.duration();
property_set("ro.bootstats.cold_boot_duration", StringPrintf("%fs", duration).c_str());
LOG(VERBOSE) << "Waiting for " COLDBOOT_DONE " took " << duration << "s.";
LOG(VERBOSE) << "Waiting for " COLDBOOT_DONE " took " << t.duration() << "s.";
return 0;
}