From: Changgyu Choi Date: Tue, 29 Sep 2020 03:33:04 +0000 (+0900) Subject: Refactor coding style X-Git-Tag: submit/tizen/20201006.012903~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b527c120dcfa939426befa5bfe1dd9b0784ff7e9;p=platform%2Fcore%2Fappfw%2Flaunchpad.git Refactor coding style - Fix some coding style - Change to make_shared instead of constructor - Use std::move() Change-Id: I8e2991eb98e68666cc880a5271204aaa548a41f0 Signed-off-by: Changgyu Choi --- diff --git a/src/app-defined-loader/src/app-defined-loader.cc b/src/app-defined-loader/src/app-defined-loader.cc index 7cc0a88..da8e3c6 100644 --- a/src/app-defined-loader/src/app-defined-loader.cc +++ b/src/app-defined-loader/src/app-defined-loader.cc @@ -42,36 +42,34 @@ namespace launchpad { -static const char PATH_CONF[] = "/usr/share/aul/app-defined-loader.conf"; -static const char SECTION_MEMORY[] = "Memory"; -static const char KEY_THRESHOLD[] = "Threshold"; -static uint32_t DEFAULT_THRESHOLD = 25600; // kB +namespace { +const char PATH_CONF[] = "/usr/share/aul/app-defined-loader.conf"; +const char SECTION_MEMORY[] = "Memory"; +const char KEY_THRESHOLD[] = "Threshold"; +const uint32_t DEFAULT_THRESHOLD = 25600; // kB +} // namespace class AppDefinedLoader { public: - AppDefinedLoader(int argc, char** argv) - : argc_(argc), argv_(argv) { - lifecycle_cb_ = std::shared_ptr( - new loader_lifecycle_callback_s()); + AppDefinedLoader(int argc, char** argv) : argc_(argc), argv_(argv) { + lifecycle_cb_ = std::make_shared(); lifecycle_cb_->create = OnCreate; lifecycle_cb_->launch = OnLaunch; lifecycle_cb_->terminate = OnTerminate; - adapter_ = std::shared_ptr(new loader_adapter_s()); + adapter_ = std::make_shared(); adapter_->loop_begin = OnLoopBegin; adapter_->loop_quit = OnLoopQuit; adapter_->add_fd = OnAddFd; adapter_->remove_fd = OnRemoveFd; - proc_ = std::unique_ptr(new Proc(getpid())); - + proc_ = std::make_unique(getpid()); Config conf(PATH_CONF); int threshold = conf.GetIntValue(SECTION_MEMORY, KEY_THRESHOLD); - if (threshold > 0) { + if (threshold > 0) threshold_ = static_cast(threshold); - } else { + else _W("Failed to get threshold"); - } } ~AppDefinedLoader() { @@ -192,7 +190,7 @@ class AppDefinedLoader { strerror_r(errno, err_str, sizeof(err_str))); } else { SECURE_LOGD("[candidate] Exec application (%s)", - argv_[LOADER_ARG_PATH]); + argv_[LOADER_ARG_PATH]); _close_all_fds(); if (!libdir.empty()) setenv("LD_LIBRARY_PATH", libdir.c_str(), 1); @@ -207,8 +205,7 @@ class AppDefinedLoader { } int DoDlOpen(bool restore, std::string old_cwd, std::string libdir) { - std::string hwc_message = "" + std::to_string(getpid()) + - "|lib loading start"; + std::string hwc_message = std::to_string(getpid()) + "|lib loading start"; prctl(PR_TASK_PERF_USER_TRACE, hwc_message.c_str(), hwc_message.size()); _W("dlopen(%s) ++", argv_[LOADER_ARG_PATH]); void* handle = dlopen(argv_[LOADER_ARG_PATH], @@ -220,13 +217,13 @@ class AppDefinedLoader { return -1; } - hwc_message = "" + std::to_string(getpid()) + "|lib loading end"; + hwc_message = std::to_string(getpid()) + "|lib loading end"; prctl(PR_TASK_PERF_USER_TRACE, hwc_message.c_str(), hwc_message.size()); if (restore && chdir(old_cwd.c_str())) _E("failed to chdir: %d", errno); - auto dl_main = reinterpret_cast( + auto dl_main = reinterpret_cast( dlsym(handle, "main")); if (dl_main == nullptr) { _E("dlsym not founded(%s). Please export 'main' function", dlerror()); diff --git a/src/app-defined-loader/src/config.hh b/src/app-defined-loader/src/config.hh index 3e12bdf..4188329 100644 --- a/src/app-defined-loader/src/config.hh +++ b/src/app-defined-loader/src/config.hh @@ -28,7 +28,6 @@ class Config { Config(const std::string& path); virtual ~Config(); - public: int GetIntValue(const std::string& section, const std::string& key) const; private: diff --git a/src/launchpad-parser/launchpad_parser_plugin.cc b/src/launchpad-parser/launchpad_parser_plugin.cc index 28f2b73..8ccee30 100644 --- a/src/launchpad-parser/launchpad_parser_plugin.cc +++ b/src/launchpad-parser/launchpad_parser_plugin.cc @@ -27,14 +27,13 @@ #define LOADERS_DIRECTORY_PATH "/opt/share/loaders/" -using namespace std; namespace launchpad_parser_plugin { -string LaunchpadParser::GetFilePath(string id) { +std::string LaunchpadParser::GetFilePath(std::string id) { return "/opt/share/loaders/" + id + ".loader"; } -int LaunchpadParser::WriteToFile(string pkgid) { +int LaunchpadParser::WriteToFile(std::string pkgid) { if (access(LOADERS_DIRECTORY_PATH, F_OK) != 0) mkdir(LOADERS_DIRECTORY_PATH, 0644); @@ -49,7 +48,7 @@ int LaunchpadParser::WriteToFile(string pkgid) { out_file << "APP_TYPE capp|c++app \n"; out_file << "DETECTION_METHOD TIMEOUT|VISIBILITY \n"; out_file << "TIMEOUT 5000 \n"; - out_file << "TTL " + to_string(i->GetTimeToLive()) + "\n"; + out_file << "TTL " + std::to_string(i->GetTimeToLive()) + "\n"; out_file << "OWNER " + pkgid + "\n"; out_file << "EXTRA loader_type common-loader \n"; if (i->GetPreloadLib().size() > 0) { @@ -63,18 +62,18 @@ int LaunchpadParser::WriteToFile(string pkgid) { return 0; } -bool LaunchpadParser::IsValidId(string loader_id, string pkgid) { +bool LaunchpadParser::IsValidId(std::string loader_id, std::string pkgid) { std::string needle("../"); - std::size_t found = loader_id.find(needle); + size_t found = loader_id.find(needle); if (found != std::string::npos) { _E("Invalid loader_id(%s)", loader_id.c_str()); return false; } - ifstream in_file(GetFilePath(loader_id).c_str()); + std::ifstream in_file(GetFilePath(loader_id).c_str()); if (!in_file.good()) return true; - string key, val; + std::string key, val; in_file >> key; while (in_file >> key >> val) { if (key == "OWNER") { @@ -86,7 +85,7 @@ bool LaunchpadParser::IsValidId(string loader_id, string pkgid) { return false; } -int LaunchpadParser::Install(xmlDocPtr doc, string pkgid) { +int LaunchpadParser::Install(xmlDocPtr doc, std::string pkgid) { pkgmgr_privilege_level level; pkgmgr_installer_info_get_privilege_level(&level); if (level != PM_PRIVILEGE_PLATFORM) { @@ -99,28 +98,32 @@ int LaunchpadParser::Install(xmlDocPtr doc, string pkgid) { if (!node->name) continue; - string name = string((char*)node->name); + std::string name = std::string(reinterpret_cast(node->name)); if (name != "provides-appdefined-loader") continue; - xmlChar* val = xmlGetProp(node, (const xmlChar *)"id"); - shared_ptr info = make_shared(string((char*)val)); + xmlChar* val = xmlGetProp(node, reinterpret_cast("id")); + std::shared_ptr info = + std::make_shared(std::string(reinterpret_cast(val))); if (!IsValidId(info->GetId(), pkgid)) return -1; - xmlChar* ttl = xmlGetProp(node, (const xmlChar *)"time-to-live"); + xmlChar* ttl = xmlGetProp(node, + reinterpret_cast("time-to-live")); if (ttl) - info->SetTimeToLive(stoi(string((char*)ttl))); + info->SetTimeToLive(std::stoi(std::string(reinterpret_cast(ttl)))); for (xmlNode* iter = node->children; iter; iter = iter->next) { if (!iter->name) continue; - string child_name = string((char*)iter->name); + std::string child_name = + std::string(reinterpret_cast(iter->name)); if (child_name == "preload-library") { - xmlChar* libname = xmlGetProp(iter, (const xmlChar *)"name"); + xmlChar* libname = xmlGetProp(iter, + reinterpret_cast("name")); if (!libname) continue; - info->AddPreloadLib(string((char*)libname)); + info->AddPreloadLib(std::string(reinterpret_cast(libname))); } } loader_list_.push_back(info); @@ -143,17 +146,17 @@ int LaunchpadParser::UnInstall(xmlDocPtr doc, std::string pkgid) { if (!node->name) continue; - string name = string((char*)node->name); + std::string name = std::string(reinterpret_cast(node->name)); if (name != "provides-appdefined-loader") continue; - xmlChar* val = xmlGetProp(node, (const xmlChar *)"id"); + xmlChar* val = xmlGetProp(node, reinterpret_cast("id")); if (!val) return -1; - string id = string((char*)val); + std::string id = std::string(reinterpret_cast(val)); if (!IsValidId(id, pkgid)) - return -1; + return -1; remove(GetFilePath(id).c_str()); } return 0; diff --git a/src/launchpad-parser/loader_info.cc b/src/launchpad-parser/loader_info.cc index 2f8ffcc..5a41e47 100644 --- a/src/launchpad-parser/loader_info.cc +++ b/src/launchpad-parser/loader_info.cc @@ -16,13 +16,12 @@ #include "launchpad-parser/loader_info.hh" -using namespace std; namespace launchpad_parser_plugin { -LoaderInfo::LoaderInfo(std::string id) : id_(id), time_to_live_(0) { +LoaderInfo::LoaderInfo(std::string id) : id_(std::move(id)), time_to_live_(0) { } -string LoaderInfo::GetId() { +std::string LoaderInfo::GetId() { return id_; } @@ -39,12 +38,12 @@ void LoaderInfo::SetTimeToLive(int time) { time_to_live_ = time; } -list LoaderInfo::GetPreloadLib() { +const std::list& LoaderInfo::GetPreloadLib() { return preload_lib_list_; } -void LoaderInfo::AddPreloadLib(string lib_name) { - preload_lib_list_.push_back(lib_name); +void LoaderInfo::AddPreloadLib(std::string lib_name) { + preload_lib_list_.push_back(std::move(lib_name)); } } // namspace launchpad_parser_plugin diff --git a/src/launchpad-parser/loader_info.hh b/src/launchpad-parser/loader_info.hh index f175591..d02af17 100644 --- a/src/launchpad-parser/loader_info.hh +++ b/src/launchpad-parser/loader_info.hh @@ -28,7 +28,7 @@ class LoaderInfo { std::string GetId(); int GetTimeToLive(); void SetTimeToLive(int time); - std::list GetPreloadLib(); + const std::list& GetPreloadLib(); void AddPreloadLib(std::string lib_name); private: