Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44d5ec37 authored by Tom Cherry's avatar Tom Cherry
Browse files

init: handle process actions when waiting for exec services 

We currently do not handle process actions (restarting services or
exiting timedout services) when we are waiting for an exec service,
but this seems to be the wrong behavior.  Particularly, an exec
service may depend on a previously started service and if that service
crashes, we will deadlock unless init restarts it.

Bug: 146920034
Test: build, boot
Change-Id: Id2fc936b8a7b989862ba4c32c398a544941e0e76
parent 838b1a1f

init/init.cpp

+10 −10
Original line number Original line Diff line number Diff line
@@ -780,7 +780,6 @@ int SecondStageMain(int argc, char** argv) { 
        if (!(waiting_for_prop || Service::is_exec_service_running())) {

        if (!(waiting_for_prop || Service::is_exec_service_running())) {

            am.ExecuteOneCommand();

            am.ExecuteOneCommand();

        }

        }

        if (!(waiting_for_prop || Service::is_exec_service_running())) {

        if (!IsShuttingDown()) {

        if (!IsShuttingDown()) {

            auto next_process_action_time = HandleProcessActions();

            auto next_process_action_time = HandleProcessActions();
@@ -792,6 +791,7 @@ int SecondStageMain(int argc, char** argv) { 
            }

            }

        }

        }





        if (!(waiting_for_prop || Service::is_exec_service_running())) {

            // If there's more work to do, wake up again immediately.

            // If there's more work to do, wake up again immediately.

            if (am.HasMoreCommands()) epoll_timeout = 0ms;

            if (am.HasMoreCommands()) epoll_timeout = 0ms;

        }

        }