commit dba6d44376a3301acfb8fd7e7c5159b25736b09e
author Peter Collingbourne <pcc@google.com> Wed Mar 20 21:09:46 2019 -0700
committer Suren Baghdasaryan <surenb@google.com> Thu Mar 21 17:00:48 2019 +0000
tree 52c1f2e309a511bd2cfd8ec053d5530926f64e2c
parent c3e96512c0e6243531f092e706ba002fd77997c6

libprocessgroup: Deliberately leak TaskProfiles and CgroupMap instances.

This avoids a race between destruction on process exit and concurrent
access from another thread.

Bug: 129023204
Change-Id: Iecafa67a78e2cce53687156e7f91547b4a23ec13

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() {