commit 4f2da9a923c01b4ea521d3fc0400b4136e6c596f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 16 16:17:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 16 16:17:45 2018 +0000
tree c6b49548ee35ffa25f02c6c74c07677c76b0c0da
parent 4d4ac41560ad78ea30ae9bfca415ed9b53f2d53b
parent c1d37d9ba7ccfe1e3d44e73a8eb2ae63ee012571

Merge "profiling: Remove unused dump path."

src/profiling/memory/client.cc

diff --git a/src/profiling/memory/client.cc b/src/profiling/memory/client.cc
index b802156..d019af9 100644
--- a/src/profiling/memory/client.cc
+++ b/src/profiling/memory/client.cc
@@ -227,7 +227,7 @@
   }
   PERFETTO_DCHECK(client_config_.interval >= 1);
   PERFETTO_DLOG("Initialized client.");
-  inited_ = true;
+  inited_.store(true, std::memory_order_release);
 }
 
 Client::Client(const std::string& sock_name, size_t conns)
@@ -259,7 +259,7 @@
 void Client::RecordMalloc(uint64_t alloc_size,
                           uint64_t total_size,
                           uint64_t alloc_address) {
-  if (!inited_)
+  if (!inited_.load(std::memory_order_acquire))
     return;
   AllocMetadata metadata;
   const char* stackbase = GetStackBase();
@@ -294,7 +294,7 @@
 }
 
 void Client::RecordFree(uint64_t alloc_address) {
-  if (!inited_)
+  if (!inited_.load(std::memory_order_acquire))
     return;
   free_page_.Add(alloc_address, ++sequence_number_, &socket_pool_);
 }
@@ -302,7 +302,7 @@
 size_t Client::ShouldSampleAlloc(uint64_t alloc_size,
                                  void* (*unhooked_malloc)(size_t),
                                  void (*unhooked_free)(void*)) {
-  if (!inited_)
+  if (!inited_.load(std::memory_order_acquire))
     return false;
   return SampleSize(pthread_key_.get(), alloc_size, client_config_.interval,
                     unhooked_malloc, unhooked_free);
@@ -320,7 +320,7 @@
 
 void Client::Shutdown() {
   socket_pool_.Shutdown();
-  inited_ = false;
+  inited_.store(false, std::memory_order_release);
 }
 
 }  // namespace profiling

src/profiling/memory/client.h

diff --git a/src/profiling/memory/client.h b/src/profiling/memory/client.h
index 3b6fe45..a32a2a3 100644
--- a/src/profiling/memory/client.h
+++ b/src/profiling/memory/client.h
@@ -150,7 +150,7 @@
                            void (*unhooked_free)(void*));
   const char* GetStackBase();
 
-  bool inited_ = false;
+  std::atomic<bool> inited_{false};
   ClientConfiguration client_config_;
   PThreadKey pthread_key_;
   SocketPool socket_pool_;