ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix IsUsable to check for each controller separately

Browse source 
am: cb06c2b376

Change-Id: Id04ea4a5a208a307a7a2a3a6c801d38232921f36
This commit is contained in:
Suren Baghdasaryan 2019-06-26 15:49:23 -07:00 • committed by android-build-merger
commit 8e3b94c2e2
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libprocessgroup/cgroup_map.cpp
View file

@ -67,11 +67,14 @@ bool CgroupController::HasValue() const {
return controller_ != nullptr; return controller_ != nullptr;
} }
bool CgroupController::IsUsable() const { bool CgroupController::IsUsable() {
if (!HasValue()) return false; if (!HasValue()) return false;
static bool enabled = (access(GetProcsFilePath("", 0, 0).c_str(), F_OK) == 0); if (state_ == UNKNOWN) {
return enabled; state_ = access(GetProcsFilePath("", 0, 0).c_str(), F_OK) == 0 ? USABLE : MISSING;
}
return state_ == USABLE;
} }
std::string CgroupController::GetTasksFilePath(const std::string& rel_path) const { std::string CgroupController::GetTasksFilePath(const std::string& rel_path) const {

12
libprocessgroup/cgroup_map.h
View file

@ -31,20 +31,28 @@
class CgroupController { class CgroupController {
public: public:
// Does not own controller // Does not own controller
explicit CgroupController(const ACgroupController* controller) : controller_(controller) {} explicit CgroupController(const ACgroupController* controller)
: controller_(controller), state_(UNKNOWN) {}
uint32_t version() const; uint32_t version() const;
const char* name() const; const char* name() const;
const char* path() const; const char* path() const;
bool HasValue() const; bool HasValue() const;
bool IsUsable() const; bool IsUsable();
std::string GetTasksFilePath(const std::string& path) const; std::string GetTasksFilePath(const std::string& path) const;
std::string GetProcsFilePath(const std::string& path, uid_t uid, pid_t pid) const; std::string GetProcsFilePath(const std::string& path, uid_t uid, pid_t pid) const;
bool GetTaskGroup(int tid, std::string* group) const; bool GetTaskGroup(int tid, std::string* group) const;
private: private:
enum ControllerState {
UNKNOWN = 0,
USABLE = 1,
MISSING = 2,
};
const ACgroupController* controller_ = nullptr; const ACgroupController* controller_ = nullptr;
ControllerState state_;
}; };
class CgroupMap { class CgroupMap {