diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp index 4af4589da..a638fcac6 100644 --- a/libprocessgroup/task_profiles.cpp +++ b/libprocessgroup/task_profiles.cpp @@ -44,6 +44,11 @@ using android::base::WriteStringToFile; #define TASK_PROFILE_DB_FILE "/etc/task_profiles.json" #define TASK_PROFILE_DB_VENDOR_FILE "/vendor/etc/task_profiles.json" +void ProfileAttribute::Reset(const CgroupController& controller, const std::string& file_name) { + controller_ = controller; + file_name_ = file_name; +} + bool ProfileAttribute::GetPathForTask(int tid, std::string* path) const { std::string subgroup; if (!controller()->GetTaskGroup(tid, &subgroup)) { @@ -380,15 +385,16 @@ bool TaskProfiles::Load(const CgroupMap& cg_map, const std::string& file_name) { std::string controller_name = attr[i]["Controller"].asString(); std::string file_attr = attr[i]["File"].asString(); - if (attributes_.find(name) == attributes_.end()) { - auto controller = cg_map.FindController(controller_name); - if (controller.HasValue()) { + auto controller = cg_map.FindController(controller_name); + if (controller.HasValue()) { + auto iter = attributes_.find(name); + if (iter == attributes_.end()) { attributes_[name] = std::make_unique(controller, file_attr); } else { - LOG(WARNING) << "Controller " << controller_name << " is not found"; + iter->second->Reset(controller, file_attr); } } else { - LOG(WARNING) << "Attribute " << name << " is already defined"; + LOG(WARNING) << "Controller " << controller_name << " is not found"; } } diff --git a/libprocessgroup/task_profiles.h b/libprocessgroup/task_profiles.h index 28bc00c10..2983a09b3 100644 --- a/libprocessgroup/task_profiles.h +++ b/libprocessgroup/task_profiles.h @@ -33,6 +33,7 @@ class ProfileAttribute { const CgroupController* controller() const { return &controller_; } const std::string& file_name() const { return file_name_; } + void Reset(const CgroupController& controller, const std::string& file_name); bool GetPathForTask(int tid, std::string* path) const;