commit 825ab1c3f44fd84e5967f023c2dd8d36c6906f08
author Andreas Gampe <agampe@google.com> Tue May 17 10:13:10 2016 -0700
committer Andreas Gampe <agampe@google.com> Tue May 17 10:13:10 2016 -0700
tree 6428dea53a8e5373543be204e864298fa6d89740
parent cd38fb20995d8fa7fc6979335d038d7eaac24745

ART: Fix systrace monitor logging

Thinlock unlocking was incorrectly unconditionally ending a block.

Bug: 28423466
Change-Id: Ifaebd9e959041e157e292d4cba05675a37e9c700

runtime/monitor.cc

diff --git a/runtime/monitor.cc b/runtime/monitor.cc
index 3e1bc8f..0f56705 100644
--- a/runtime/monitor.cc
+++ b/runtime/monitor.cc
@@ -964,17 +964,13 @@
           if (!kUseReadBarrier) {
             DCHECK_EQ(new_lw.ReadBarrierState(), 0U);
             h_obj->SetLockWord(new_lw, true);
-            if (ATRACE_ENABLED()) {
-              ATRACE_END();
-            }
+            AtraceMonitorUnlock();
             // Success!
             return true;
           } else {
             // Use CAS to preserve the read barrier state.
             if (h_obj->CasLockWordWeakSequentiallyConsistent(lock_word, new_lw)) {
-              if (ATRACE_ENABLED()) {
-                ATRACE_END();
-              }
+              AtraceMonitorUnlock();
               // Success!
               return true;
             }