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

Merge "init: Improve readability of the code in SecondStageMain()"

Browse source
This commit is contained in:
Bart Van Assche 2022-10-20 16:34:21 +00:00 • committed by Gerrit Code Review
commit 5c7dc40926
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/init.cpp
View file

@ -1148,7 +1148,7 @@ int SecondStageMain(int argc, char** argv) {
setpriority(PRIO_PROCESS, 0, 0); setpriority(PRIO_PROCESS, 0, 0);
while (true) { while (true) {
// By default, sleep until something happens. // By default, sleep until something happens.
auto epoll_timeout = std::optional<std::chrono::milliseconds>{kDiagnosticTimeout}; std::chrono::milliseconds epoll_timeout{kDiagnosticTimeout};
auto shutdown_command = shutdown_state.CheckShutdown(); auto shutdown_command = shutdown_state.CheckShutdown();
if (shutdown_command) { if (shutdown_command) {
@ -1168,7 +1168,7 @@ int SecondStageMain(int argc, char** argv) {
if (next_process_action_time) { if (next_process_action_time) {
epoll_timeout = std::chrono::ceil<std::chrono::milliseconds>( epoll_timeout = std::chrono::ceil<std::chrono::milliseconds>(
*next_process_action_time - boot_clock::now()); *next_process_action_time - boot_clock::now());
if (*epoll_timeout < 0ms) epoll_timeout = 0ms; if (epoll_timeout < 0ms) epoll_timeout = 0ms;
} }
} }