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

Commit 0f62f623 authored by Chung-Kai (Michael) Mei's avatar Chung-Kai (Michael) Mei
Browse files

Revert "Parallel Module Loading: Add performance mode" 

Revert submission 3556468

Reason for revert: stability issue

Reverted changes: /q/submissionid:3556468

Bug: 406160196
Change-Id: I5566ccde4003b674bad51d4f8f449090fb890f67
parent 3a3df3dc

init/first_stage_init.cpp

+0 −3
Original line number Diff line number Diff line
@@ -442,9 +442,6 @@ int FirstStageMain(int argc, char** argv) { 
    if (bootconfig.find("androidboot.load_modules_parallel = \"true\"")

        != std::string::npos)

        want_parallel_mode = Modprobe::LoadParallelMode::NORMAL;

    else if (bootconfig.find("androidboot.load_modules_parallel_mode = \"performance\"")

        != std::string::npos)

        want_parallel_mode = Modprobe::LoadParallelMode::PERFORMANCE;



    boot_clock::time_point module_start_time = boot_clock::now();

    int module_count = 0;

libmodprobe/include/modprobe/modprobe.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ class Modprobe { 
    enum LoadParallelMode {

      NONE = 0,

      NORMAL,

      PERFORMANCE,

    };



    Modprobe(const std::vector<std::string>&, const std::string load_file = "modules.load",

libmodprobe/libmodprobe.cpp

+1 −3
Original line number Diff line number Diff line
@@ -546,9 +546,7 @@ bool Modprobe::LoadModulesParallel(int num_threads, int mode) { 
            if (sequential_modules.empty() && parallel_modules.empty()) {

                sleeping_threads++;



                if (mode == LoadParallelMode::PERFORMANCE)

                    cv_update_module.notify_one();

                else if (mode == LoadParallelMode::NORMAL && sleeping_threads == num_threads)

                if (mode == LoadParallelMode::NORMAL && sleeping_threads == num_threads)

                    cv_update_module.notify_one();



                cv_load_module.wait(lock, [&](){