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

Commit 3a3df3dc authored by Chung-Kai (Michael) Mei's avatar Chung-Kai (Michael) Mei
Browse files

Revert "Parallel Module Loading: Add conservative mode" 

Revert submission 3556468

Reason for revert: stability issue

Reverted changes: /q/submissionid:3556468

Bug: 406160196
Change-Id: Ic3d2c950249ed745134761bb43cd3eeb5889b303
parent e5777c3a

init/first_stage_init.cpp

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

        != std::string::npos)

        want_parallel_mode = Modprobe::LoadParallelMode::PERFORMANCE;

    else if (bootconfig.find("androidboot.load_modules_parallel = \"conservative\"")

        != std::string::npos)

        want_parallel_mode = Modprobe::LoadParallelMode::CONSERVATIVE;



    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
@@ -32,7 +32,6 @@ class Modprobe { 
      NONE = 0,

      NORMAL,

      PERFORMANCE,

      CONSERVATIVE,

    };



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

libmodprobe/libmodprobe.cpp

+1 −5
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ bool Modprobe::LoadModulesParallel(int num_threads, int mode) { 


                if (mode == LoadParallelMode::PERFORMANCE)

                    cv_update_module.notify_one();

                else if (sleeping_threads == num_threads)

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

                    cv_update_module.notify_one();



                cv_load_module.wait(lock, [&](){
@@ -603,10 +603,6 @@ bool Modprobe::LoadModulesParallel(int num_threads, int mode) { 
                else

                    parallel_modules.emplace_back(cnd_last);

            }



            if (mode == LoadParallelMode::CONSERVATIVE &&

                parallel_modules.size() >= num_threads)

                break;

        }



        cv_load_module.notify_all();