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

Commit 331cf2fb authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Replace the "coldboot" timeout with a property. 

Also rename init's existing boot-time related properties so they're
all "ro.*" properties.

Example result:

  # Three properties showing when init started...
  [ro.boottime.init]: [5294587604]
  # ...how long it waited for ueventd...
  [ro.boottime.init.cold_boot_wait]: [646956470]
  # ...and how long SELinux initialization took...
  [ro.boottime.init.selinux]: [45742921]

  # Plus one property for each service, showing when it first started.
  [ro.boottime.InputEventFind]: [10278767840]
  [ro.boottime.adbd]: [8359267180]
  [ro.boottime.atfwd]: [10338554773]
  [ro.boottime.audioserver]: [10298157478]
  [ro.boottime.bootanim]: [9323670089]
  [ro.boottime.cameraserver]: [10299402321]
  [ro.boottime.cnd]: [10335931856]
  [ro.boottime.debuggerd]: [7001352774]
  [ro.boottime.debuggerd64]: [7002261785]
  [ro.boottime.drm]: [10301082113]
  [ro.boottime.fingerprintd]: [10331443314]
  [ro.boottime.flash-nanohub-fw]: [6995265534]
  [ro.boottime.gatekeeperd]: [10340355242]
  [ro.boottime.healthd]: [7856893380]
  [ro.boottime.hwservicemanager]: [7856051088]
  [ro.boottime.imscmservice]: [10290530758]
  [ro.boottime.imsdatadaemon]: [10358136702]
  [ro.boottime.imsqmidaemon]: [10289084872]
  [ro.boottime.installd]: [10303296020]
  [ro.boottime.irsc_util]: [10279807632]
  [ro.boottime.keystore]: [10305034093]
  [ro.boottime.lmkd]: [7863506714]
  [ro.boottime.loc_launcher]: [10324525241]
  [ro.boottime.logd]: [6526221633]
  [ro.boottime.logd-reinit]: [7850662702]
  [ro.boottime.mcfg-sh]: [10337268315]
  [ro.boottime.media]: [10312152687]
  [ro.boottime.mediacodec]: [10306852530]
  [ro.boottime.mediadrm]: [10308707999]
  [ro.boottime.mediaextractor]: [10310681177]
  [ro.boottime.msm_irqbalance]: [7862451974]
  [ro.boottime.netd]: [10313523104]
  [ro.boottime.netmgrd]: [10285009351]
  [ro.boottime.oem_qmi_server]: [10293329092]
  [ro.boottime.per_mgr]: [7857915776]
  [ro.boottime.per_proxy]: [8335121605]
  [ro.boottime.perfd]: [10283443101]
  [ro.boottime.qcamerasvr]: [10329644772]
  [ro.boottime.qmuxd]: [10282346643]
  [ro.boottime.qseecomd]: [6855708593]
  [ro.boottime.qti]: [10286196851]
  [ro.boottime.ril-daemon]: [10314933677]
  [ro.boottime.rmt_storage]: [7859105047]
  [ro.boottime.servicemanager]: [7864555881]
  [ro.boottime.ss_ramdump]: [8337634938]
  [ro.boottime.ssr_setup]: [8336268324]
  [ro.boottime.surfaceflinger]: [7866921402]
  [ro.boottime.thermal-engine]: [10281249924]
  [ro.boottime.time_daemon]: [10322006542]
  [ro.boottime.ueventd]: [5618663938]
  [ro.boottime.vold]: [7003493920]
  [ro.boottime.wificond]: [10316641073]
  [ro.boottime.wpa_supplicant]: [18959816881]
  [ro.boottime.zygote]: [10295295029]
  [ro.boottime.zygote_secondary]: [10296637269]

Bug: http://b/31800756
Test: boots
Change-Id: I094cce0c1bab9406d950ca94212689dc2e15dba5
parent 48dfc220

init/action.cpp

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void Action::ExecuteCommand(const Command& command) const { 
    Timer t;

    int result = command.InvokeFunc();



    double duration_ms = t.duration() * 1000;

    double duration_ms = t.duration_s() * 1000;

    // Any action longer than 50ms will be warned to user as slow operation

    if (duration_ms > 50.0 ||

        android::base::GetMinimumLogSeverity() <= android::base::DEBUG) {

init/builtins.cpp

+4 −6
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ static int wipe_data_via_recovery(const std::string& reason) { 
        LOG(ERROR) << "failed to set bootloader message: " << err;

        return -1;

    }

    android_reboot(ANDROID_RB_RESTART2, 0, "recovery");

    while (1) { pause(); }  // never reached

    reboot("recovery");

}



static void unmount_and_fsck(const struct mntent *entry) {
@@ -727,7 +726,7 @@ static int do_powerctl(const std::vector<std::string>& args) { 
        ServiceManager::GetInstance().ForEachService(

            [] (Service* s) { s->Terminate(); });



        while (t.duration() < delay) {

        while (t.duration_s() < delay) {

            ServiceManager::GetInstance().ReapAnyOutstandingChildren();



            int service_count = 0;
@@ -751,11 +750,10 @@ static int do_powerctl(const std::vector<std::string>& args) { 
            // Wait a bit before recounting the number or running services.

            std::this_thread::sleep_for(50ms);

        }

        LOG(VERBOSE) << "Terminating running services took " << t.duration() << " seconds";

        LOG(VERBOSE) << "Terminating running services took " << t;

    }



    return android_reboot_with_callback(cmd, 0, reboot_target,

                                        callback_on_ro_remount);

    return android_reboot_with_callback(cmd, 0, reboot_target, callback_on_ro_remount);

}



static int do_trigger(const std::vector<std::string>& args) {

init/devices.cpp

+2 −2
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ static void handle_firmware_event(uevent* uevent) { 
    if (pid == 0) {

        Timer t;

        process_firmware_event(uevent);

        LOG(INFO) << "loading " << uevent->path << " took " << t.duration() << "s";

        LOG(INFO) << "loading " << uevent->path << " took " << t;

        _exit(EXIT_SUCCESS);

    } else if (pid == -1) {

        PLOG(ERROR) << "could not fork to process firmware event for " << uevent->firmware;
@@ -1043,7 +1043,7 @@ void device_init() { 
    coldboot("/sys/block");

    coldboot("/sys/devices");

    close(open(COLDBOOT_DONE, O_WRONLY|O_CREAT|O_CLOEXEC, 0000));

    LOG(INFO) << "Coldboot took " << t.duration() << "s.";

    LOG(INFO) << "Coldboot took " << t;

}



int get_device_fd() {

init/init.cpp

+23 −12
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <android-base/file.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <cutils/android_reboot.h>

#include <cutils/fs.h>

#include <cutils/iosched_policy.h>

#include <cutils/list.h>
@@ -163,14 +162,21 @@ static int wait_for_coldboot_done_action(const std::vector<std::string>& args) { 
    Timer t;



    LOG(VERBOSE) << "Waiting for " COLDBOOT_DONE "...";

    // Any longer than 1s is an unreasonable length of time to delay booting.

    // If you're hitting this timeout, check that you didn't make your

    // sepolicy regular expressions too expensive (http://b/19899875).

    if (wait_for_file(COLDBOOT_DONE, 1s)) {



    // Historically we had a 1s timeout here because we weren't otherwise

    // tracking boot time, and many OEMs made their sepolicy regular

    // expressions too expensive (http://b/19899875).



    // Now we're tracking boot time, just log the time taken to a system

    // property. We still panic if it takes more than a minute though,

    // because any build that slow isn't likely to boot at all, and we'd

    // rather any test lab devices fail back to the bootloader.

    if (wait_for_file(COLDBOOT_DONE, 60s) < 0) {

        LOG(ERROR) << "Timed out waiting for " COLDBOOT_DONE;

        panic();

    }



    LOG(VERBOSE) << "Waiting for " COLDBOOT_DONE " took " << t.duration() << "s.";

    property_set("ro.boottime.init.cold_boot_wait", std::to_string(t.duration_ns()).c_str());

    return 0;

}
@@ -409,9 +415,8 @@ static int audit_callback(void *data, security_class_t /*cls*/, char *buf, size_ 
}



static void security_failure() {

    LOG(ERROR) << "Security failure; rebooting into recovery mode...";

    android_reboot(ANDROID_RB_RESTART2, 0, "recovery");

    while (true) { pause(); }  // never reached

    LOG(ERROR) << "Security failure...";

    panic();

}



static void selinux_initialize(bool in_kernel_domain) {
@@ -443,8 +448,8 @@ static void selinux_initialize(bool in_kernel_domain) { 
            security_failure();

        }



        LOG(INFO) << "(Initializing SELinux " << (is_enforcing ? "enforcing" : "non-enforcing")

                  << " took " << t.duration() << "s.)";

        // init's first stage can't set properties, so pass the time to the second stage.

        setenv("INIT_SELINUX_TOOK", std::to_string(t.duration_ns()).c_str(), 1);

    } else {

        selinux_init_all_handles();

    }
@@ -650,7 +655,13 @@ int main(int argc, char** argv) { 
        export_kernel_boot_props();



        // Make the time that init started available for bootstat to log.

        property_set("init.start", getenv("INIT_STARTED_AT"));

        property_set("ro.boottime.init", getenv("INIT_STARTED_AT"));

        property_set("ro.boottime.init.selinux", getenv("INIT_SELINUX_TOOK"));



        // Clean up our environment.

        unsetenv("INIT_SECOND_STAGE");

        unsetenv("INIT_STARTED_AT");

        unsetenv("INIT_SELINUX_TOOK");



        // Now set up SELinux for second stage.

        selinux_initialize(false);

init/init_parser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ bool Parser::ParseConfigFile(const std::string& path) { 
    // Nexus 9 boot time, so it's disabled by default.

    if (false) DumpState();



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

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

    return true;

}