commit 791439696559d6f8628e3c5e6084ca3d2f2fb0ab
author Suren Baghdasaryan <surenb@google.com> Fri Mar 22 09:20:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 22 09:20:15 2019 -0700
tree 71a3cb0ef1236d42dc6606eed6cd6e757cfed7c0
parent 3cb0c937421880b276301e4dd9905575a1c45256
parent 40e5e416a609ec621193b7991e7f4ca112fba513

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

Change-Id: I62d7253f90ebe57b8bfa58aae3dcf6bdacaa21cc

libprocessgroup/cgroup_map.cpp

diff --git a/libprocessgroup/cgroup_map.cpp b/libprocessgroup/cgroup_map.cpp
index 9951621..b3b497f 100644
--- a/libprocessgroup/cgroup_map.cpp
+++ b/libprocessgroup/cgroup_map.cpp
@@ -336,8 +336,10 @@
 }
 
 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() {

libprocessgroup/task_profiles.cpp

diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp
index f1fbcde..9362c03 100644
--- a/libprocessgroup/task_profiles.cpp
+++ b/libprocessgroup/task_profiles.cpp
@@ -284,8 +284,10 @@
 }
 
 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() {