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

Merge "libprocessgroup: Deliberately leak TaskProfiles and CgroupMap instances." am: b552c4ad9a

Browse source 
am: a7da5b4a23

Change-Id: I49fe37e8c99e31f3bc5d1cd687fcdd17a1eeafc7
This commit is contained in:
Suren Baghdasaryan 2019-03-22 09:24:28 -07:00 • committed by android-build-merger
commit 815494c769
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libprocessgroup/cgroup_map.cpp
View file

@ -336,8 +336,10 @@ CgroupMap::~CgroupMap() {
}
CgroupMap& CgroupMap::GetInstance() {
static CgroupMap instance;
return instance;
// Deliberately leak this object to avoid a race between destruction on
// process exit and concurrent access from another thread.
static auto* instance = new CgroupMap;
return *instance;
}
bool CgroupMap::LoadRcFile() {

6
libprocessgroup/task_profiles.cpp
View file

@ -284,8 +284,10 @@ bool TaskProfile::ExecuteForTask(int tid) const {
}
TaskProfiles& TaskProfiles::GetInstance() {
static TaskProfiles instance;
return instance;
// Deliberately leak this object to avoid a race between destruction on
// process exit and concurrent access from another thread.
static auto* instance = new TaskProfiles;
return *instance;
}
TaskProfiles::TaskProfiles() {