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

Commit e503a21b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "init: handle process actions when waiting for exec services" am: db8881b7 

Change-Id: Ib4cac038b8a95ebbc74c15e2ea25982b6cd6aa1d
parents 8cf544b7 db8881b7

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;

        }

        }