summaryrefslogtreecommitdiffstats
path: root/runtime/monitor.cc
diff options
context:
space:
mode:
authorXin Guan <a18772@motorola.com>2014-08-22 11:55:37 -0500
committerIan Rogers <irogers@google.com>2014-08-22 13:46:11 -0700
commitb894a19dfd668b6779de939cf5265b7e409d8809 (patch)
treedcb74361c213660a7bfb82a754e967833a474d79 /runtime/monitor.cc
parent574758ef03b0930ebd1cb8d9afe741cb374419a1 (diff)
downloadart-b894a19dfd668b6779de939cf5265b7e409d8809.tar.gz
art-b894a19dfd668b6779de939cf5265b7e409d8809.tar.bz2
art-b894a19dfd668b6779de939cf5265b7e409d8809.zip
Using the correct time for wait_start_ms when lock contention logging is enabled
Bug: 17208457 Change-Id: I35555e0acf3b37bb3776a62c64d59ae93403b237
Diffstat (limited to 'runtime/monitor.cc')
-rw-r--r--runtime/monitor.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc
index 107efd702e..0b6e3b25f5 100644
--- a/runtime/monitor.cc
+++ b/runtime/monitor.cc
@@ -246,7 +246,7 @@ void Monitor::Lock(Thread* self) {
}
// Contended.
const bool log_contention = (lock_profiling_threshold_ != 0);
- uint64_t wait_start_ms = log_contention ? 0 : MilliTime();
+ uint64_t wait_start_ms = log_contention ? MilliTime() : 0;
mirror::ArtMethod* owners_method = locking_method_;
uint32_t owners_dex_pc = locking_dex_pc_;
// Do this before releasing the lock so that we don't get deflated.