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

Commit d8a7257b authored by Tom Cherry's avatar Tom Cherry
Browse files

init: fix DumpState() logging 

Fix two formatting issues in Action::DumpState(),

Old:
on ro.crypto.state=encrypted ro.crypto.type=file zygote-start
New:
on ro.crypto.state=encrypted && ro.crypto.type=file && zygote-start

Old:
on boot
  %sifup lo
  %shostname localhost
  %sdomainname localdomain
  %swrite /proc/sys/vm/overcommit_memory 1
New:
on boot
  ifup lo
  hostname localhost
  domainname localdomain
  write /proc/sys/vm/overcommit_memory 1

Also, now that we're importing many small rc files, it no longer makes
sense to call Parser::DumpState() after each import.  Therefore, move
the conditional to call Parser::DumpState() to after /init.rc and its
imports are parsed and after the late imports are parsed.

Test: Boot bullhead with DumpState() enabled and check the output
Change-Id: I0b81305b8938aa1a7133d7dd2055f34f47609cf9
parent 2bc00140

init/action.cpp

+6 −10
Original line number Diff line number Diff line
@@ -246,20 +246,16 @@ bool Action::TriggersEqual(const Action& other) const { 
}



std::string Action::BuildTriggersString() const {

    std::string result;

    std::vector<std::string> triggers;



    for (const auto& [trigger_name, trigger_value] : property_triggers_) {

        result += trigger_name;

        result += '=';

        result += trigger_value;

        result += ' ';

        triggers.emplace_back(trigger_name + '=' + trigger_value);

    }

    if (!event_trigger_.empty()) {

        result += event_trigger_;

        result += ' ';

        triggers.emplace_back(event_trigger_);

    }

    result.pop_back();

    return result;



    return Join(triggers, " && ");

}



void Action::DumpState() const {
@@ -268,7 +264,7 @@ void Action::DumpState() const { 


    for (const auto& c : commands_) {

        std::string cmd_str = c.BuildCommandString();

        LOG(INFO) << "  %s" << cmd_str;

        LOG(INFO) << "  " << cmd_str;

    }

}

init/builtins.cpp

+4 −0
Original line number Diff line number Diff line
@@ -494,6 +494,10 @@ static void import_late(const std::vector<std::string>& args, size_t start_index 
            parser.ParseConfig(args[i]);

        }

    }



    // Turning this on and letting the INFO logging be discarded adds 0.2s to

    // Nexus 9 boot time, so it's disabled by default.

    if (false) parser.DumpState();

}



/* mount_fstab

init/init.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,10 @@ int main(int argc, char** argv) { 
        parser.set_is_odm_etc_init_loaded(true);

    }



    // Turning this on and letting the INFO logging be discarded adds 0.2s to

    // Nexus 9 boot time, so it's disabled by default.

    if (false) parser.DumpState();



    ActionManager& am = ActionManager::GetInstance();



    am.QueueEventTrigger("early-init");

init/init_parser.cpp

+0 −4
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ bool Parser::ParseConfigFile(const std::string& path) { 
        sp.second->EndFile(path);

    }



    // Turning this on and letting the INFO logging be discarded adds 0.2s to

    // Nexus 9 boot time, so it's disabled by default.

    if (false) DumpState();



    LOG(VERBOSE) << "(Parsing " << path << " took " << t << ".)";

    return true;

}