diff options
| author | Xin Guan <a18772@motorola.com> | 2014-08-22 11:55:37 -0500 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-08-22 14:58:41 -0700 |
| commit | 65282b253b55bbdb7f0e246d8c78ea34f84d0ff5 (patch) | |
| tree | 713b938600814a62620abe5e2521f9dc267fabad /runtime/monitor.cc | |
| parent | 1dbc3a918612e9ce01f8b05b5ef5f4cbb34e74d0 (diff) | |
| download | art-65282b253b55bbdb7f0e246d8c78ea34f84d0ff5.tar.gz art-65282b253b55bbdb7f0e246d8c78ea34f84d0ff5.tar.bz2 art-65282b253b55bbdb7f0e246d8c78ea34f84d0ff5.zip | |
Using the correct time for wait_start_ms when lock contention logging is enabled
Bug: 17208457
Change-Id: I35555e0acf3b37bb3776a62c64d59ae93403b237
(cherry picked from commit b894a19dfd668b6779de939cf5265b7e409d8809)
Diffstat (limited to 'runtime/monitor.cc')
| -rw-r--r-- | runtime/monitor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc index 5dd16efa02..a87d7c1fee 100644 --- a/runtime/monitor.cc +++ b/runtime/monitor.cc @@ -238,7 +238,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. |