OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7463820
)
ART: Fix systrace monitor logging
author
Andreas Gampe
<agampe@google.com>
Tue, 17 May 2016 17:13:10 +0000
(10:13 -0700)
committer
Andreas Gampe
<agampe@google.com>
Wed, 18 May 2016 04:23:04 +0000
(21:23 -0700)
Thinlock unlocking was incorrectly unconditionally ending a block.
Bug:
28423466
(cherry picked from commit
825ab1c3f44fd84e5967f023c2dd8d36c6906f08
)
Change-Id: Ifaebd9e959041e157e292d4cba05675a37e9c700
runtime/monitor.cc
patch
|
blob
|
history
diff --git
a/runtime/monitor.cc
b/runtime/monitor.cc
index
f4bc222
..
71c866f
100644
(file)
--- a/
runtime/monitor.cc
+++ b/
runtime/monitor.cc
@@
-964,17
+964,13
@@
bool Monitor::MonitorExit(Thread* self, mirror::Object* obj) {
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;
}