Merge "init: fix clang-tidy performance issues"

init/action.cpp

@@ -95,7 +95,7 @@ Result<void> Action::AddCommand(std::vector<std::string>&& args, int line) {
 }
 
 void Action::AddCommand(BuiltinFunction f, std::vector<std::string>&& args, int line) {
-    commands_.emplace_back(f, false, std::move(args), line);
+    commands_.emplace_back(std::move(f), false, std::move(args), line);
 }
 
 std::size_t Action::NumCommands() const {

init/action_manager.cpp

@@ -47,7 +47,7 @@ void ActionManager::QueueAllPropertyActions() {
 void ActionManager::QueueBuiltinAction(BuiltinFunction func, const std::string& name) {
     auto action = std::make_unique<Action>(true, nullptr, "<Builtin Action>", 0, name,
                                            std::map<std::string, std::string>{});
-    action->AddCommand(func, {name}, 0);
+    action->AddCommand(std::move(func), {name}, 0);
 
     event_queue_.emplace(action.get());
     actions_.emplace_back(std::move(action));

init/devices.h

@@ -84,9 +84,9 @@ class Subsystem {
     };
 
     Subsystem() {}
-    Subsystem(const std::string& name) : name_(name) {}
+    Subsystem(std::string name) : name_(std::move(name)) {}
-    Subsystem(const std::string& name, DevnameSource source, const std::string& dir_name)
+    Subsystem(std::string name, DevnameSource source, std::string dir_name)
-        : name_(name), devname_source_(source), dir_name_(dir_name) {}
+        : name_(std::move(name)), devname_source_(source), dir_name_(std::move(dir_name)) {}
 
     // Returns the full path for a uevent of a device that is a member of this subsystem,
     // according to the rules parsed from ueventd.rc

init/devices_test.cpp

@@ -30,7 +30,7 @@ namespace init {
 class DeviceHandlerTester {
   public:
     void TestGetSymlinks(const std::string& platform_device, const Uevent& uevent,
-                         const std::vector<std::string> expected_links) {
+                         const std::vector<std::string>& expected_links) {
         TemporaryDir fake_sys_root;
         device_handler_.sysfs_mount_point_ = fake_sys_root.path;
 

init/keychords.cpp

@@ -285,7 +285,7 @@ void Keychords::Register(const std::vector<int>& keycodes) {
 
 void Keychords::Start(Epoll* epoll, std::function<void(const std::vector<int>&)> handler) {
     epoll_ = epoll;
-    handler_ = handler;
+    handler_ = std::move(handler);
     if (entries_.size()) GeteventOpenDevice();
 }
 

init/mount_handler.cpp

@@ -140,11 +140,11 @@ void MountHandler::MountHandlerFunction() {
         }
     }
     free(buf);
-    for (auto entry : untouched) {
+    for (auto& entry : untouched) {
         SetMountProperty(entry, false);
         mounts_.erase(entry);
     }
-    for (auto entry : touched) {
+    for (auto& entry : touched) {
         SetMountProperty(entry, true);
         mounts_.emplace(std::move(entry));
     }

init/parser.cpp

@@ -37,7 +37,7 @@ void Parser::AddSectionParser(const std::string& name, std::unique_ptr<SectionPa
 }
 
 void Parser::AddSingleLineParser(const std::string& prefix, LineCallback callback) {
-    line_callbacks_.emplace_back(prefix, callback);
+    line_callbacks_.emplace_back(prefix, std::move(callback));
 }
 
 void Parser::ParseData(const std::string& filename, std::string* data) {

init/security.cpp

@@ -83,7 +83,7 @@ Result<void> MixHwrngIntoLinuxRngAction(const BuiltinArguments&) {
     return {};
 }
 
-static bool SetHighestAvailableOptionValue(std::string path, int min, int max) {
+static bool SetHighestAvailableOptionValue(const std::string& path, int min, int max) {
     std::ifstream inf(path, std::fstream::in);
     if (!inf) {
         LOG(ERROR) << "Cannot open for reading: " << path;

init/test_function_map.h

@@ -30,17 +30,17 @@ class TestFunctionMap : public KeywordFunctionMap {
   public:
     // Helper for argument-less functions
     using BuiltinFunctionNoArgs = std::function<void(void)>;
-    void Add(const std::string& name, const BuiltinFunctionNoArgs function) {
+    void Add(const std::string& name, BuiltinFunctionNoArgs function) {
-        Add(name, 0, 0, false, [function](const BuiltinArguments&) {
+        Add(name, 0, 0, false, [f = std::move(function)](const BuiltinArguments&) {
-            function();
+            f();
             return Result<void>{};
         });
     }
 
     void Add(const std::string& name, std::size_t min_parameters, std::size_t max_parameters,
-             bool run_in_subcontext, const BuiltinFunction function) {
+             bool run_in_subcontext, BuiltinFunction function) {
-        builtin_functions_[name] =
+        builtin_functions_[name] = make_tuple(min_parameters, max_parameters,
-            make_tuple(min_parameters, max_parameters, make_pair(run_in_subcontext, function));
+                                              make_pair(run_in_subcontext, std::move(function)));
     }
 
   private:

init/ueventd.cpp

@@ -146,7 +146,7 @@ void ColdBoot::UeventHandlerMain(unsigned int process_num, unsigned int total_pr
 
 void ColdBoot::RegenerateUevents() {
     uevent_listener_.RegenerateUevents([this](const Uevent& uevent) {
-        uevent_queue_.emplace_back(std::move(uevent));
+        uevent_queue_.emplace_back(uevent);
         return ListenerAction::kContinue;
     });
 }