ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: don't wait if we have more work to do" am: 32ee9fc24a am: c746ecbcbe

Browse source 
am: df47019a30

Change-Id: I5b3b6e2dd9c3696fad262711290e484f4298205b
This commit is contained in:
Wei Wang 2016-12-01 04:02:50 +00:00 • committed by android-build-merger
commit a88839684a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/init.cpp
View file

@ -731,15 +731,15 @@ int main(int argc, char** argv) {
// By default, sleep until something happens.
int epoll_timeout_ms = -1;
// If there's more work to do, wake up again immediately.
if (am.HasMoreCommands()) epoll_timeout_ms = 0;
// If there's a process that needs restarting, wake up in time for that.
if (process_needs_restart_at != 0) {
epoll_timeout_ms = (process_needs_restart_at - time(nullptr)) * 1000;
if (epoll_timeout_ms < 0) epoll_timeout_ms = 0;
}
// If there's more work to do, wake up again immediately.
if (am.HasMoreCommands()) epoll_timeout_ms = 0;
bootchart_sample(&epoll_timeout_ms);
epoll_event ev;