commit b857c3bfb92297996a8c0e97acdf29654e665342
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 26 20:22:44 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 26 20:22:44 2016 +0000
tree a7a097590fc5d1423d9109563b4b38e5830fe824
parent 3e318825748197e728618fedc56a156e2981e78c
parent 6fb276b5e6ac92a25edde51a6f5f4c70eb3e2cf8

Merge "Fix a race condition on GC timing logger data."

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 9e454ca..4d16b6e 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -880,12 +880,12 @@
   bool has_waited = false;
   uint64_t wait_start = NanoTime();
   if (thread_flip_running_) {
-    TimingLogger::ScopedTiming split("IncrementDisableThreadFlip",
-                                     GetCurrentGcIteration()->GetTimings());
+    ATRACE_BEGIN("IncrementDisableThreadFlip");
     while (thread_flip_running_) {
       has_waited = true;
       thread_flip_cond_->Wait(self);
     }
+    ATRACE_END();
   }
   ++disable_thread_flip_count_;
   if (has_waited) {