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

Commit b3989004 authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

Merge "init: Support custom shutdown actions" am: c1bc4241 

am: 5b895354

Change-Id: I57b87dac016b4d7d6f982ee0057823eb1119bab7
parents 04b74930 5b895354

init/action.cpp

+7 −0
Original line number Diff line number Diff line
@@ -326,6 +326,13 @@ void ActionManager::DumpState() const { 
    }

}



void ActionManager::ClearQueue() {

    // We are shutting down so don't claim the oneshot builtin actions back

    current_executing_actions_ = {};

    event_queue_ = {};

    current_command_ = 0;

}



bool ActionParser::ParseSection(std::vector<std::string>&& args, const std::string& filename,

                                int line, std::string* err) {

    std::vector<std::string> triggers(args.begin() + 1, args.end());

init/action.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ class ActionManager { 
    void ExecuteOneCommand();

    bool HasMoreCommands() const;

    void DumpState() const;

    void ClearQueue();



  private:

    ActionManager(ActionManager const&) = delete;

init/builtins.cpp

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int reboot_into_recovery(const std::vector<std::string>& options) { 
        LOG(ERROR) << "failed to set bootloader message: " << err;

        return -1;

    }

    DoReboot(ANDROID_RB_RESTART2, "reboot", "recovery", false);

    property_set("sys.powerctl", "reboot,recovery");

    return 0;

}

init/init.cpp

+16 −5
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static int epoll_fd = -1; 
static std::unique_ptr<Timer> waiting_for_prop(nullptr);

static std::string wait_prop_name;

static std::string wait_prop_value;

static bool shutting_down;



void DumpState() {

    ServiceManager::GetInstance().DumpState();
@@ -158,21 +159,31 @@ bool start_waiting_for_property(const char *name, const char *value) 
    return true;

}



void ResetWaitForProp() {

    wait_prop_name.clear();

    wait_prop_value.clear();

    waiting_for_prop.reset();

}



void property_changed(const std::string& name, const std::string& value) {

    // If the property is sys.powerctl, we bypass the event queue and immediately handle it.

    // This is to ensure that init will always and immediately shutdown/reboot, regardless of

    // if there are other pending events to process or if init is waiting on an exec service or

    // waiting on a property.

    if (name == "sys.powerctl") HandlePowerctlMessage(value);

    // In non-thermal-shutdown case, 'shutdown' trigger will be fired to let device specific

    // commands to be executed.

    if (name == "sys.powerctl") {

        if (HandlePowerctlMessage(value)) {

            shutting_down = true;

        }

    }



    if (property_triggers_enabled) ActionManager::GetInstance().QueuePropertyChange(name, value);



    if (waiting_for_prop) {

        if (wait_prop_name == name && wait_prop_value == value) {

            wait_prop_name.clear();

            wait_prop_value.clear();

            LOG(INFO) << "Wait for property took " << *waiting_for_prop;

            waiting_for_prop.reset();

            ResetWaitForProp();

        }

    }

}
@@ -1166,7 +1177,7 @@ int main(int argc, char** argv) { 
            am.ExecuteOneCommand();

        }

        if (!(waiting_for_prop || sm.IsWaitingForExec())) {

            restart_processes();

            if (!shutting_down) restart_processes();



            // If there's a process that needs restarting, wake up in time for that.

            if (process_needs_restart_at != 0) {

init/init.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ bool start_waiting_for_property(const char *name, const char *value); 


void DumpState();



void ResetWaitForProp();



}  // namespace init

}  // namespace android