From: Xin Guan <a18772@motorola.com>
Date: Fri, 22 Aug 2014 16:55:37 +0000 (-0500)
Subject: Using the correct time for wait_start_ms when lock contention logging is enabled
X-Git-Tag: android-x86-6.0-r1~145^2~2^2~280^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b894a19dfd668b6779de939cf5265b7e409d8809;p=android-x86%2Fart.git

Using the correct time for wait_start_ms when lock contention logging is enabled

Bug: 17208457
Change-Id: I35555e0acf3b37bb3776a62c64d59ae93403b237
---

diff --git a/runtime/monitor.cc b/runtime/monitor.cc
index 107efd702..0b6e3b25f 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.