diff options
| author | Ian Rogers <irogers@google.com> | 2014-08-22 22:06:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 22:06:47 +0000 |
| commit | 88ffa4933bab329e8225537be4f7a2333209e0b5 (patch) | |
| tree | a831fbb6d95b6d3532314a28661acf9038e405f5 /runtime/monitor.cc | |
| parent | 5b984216c879db9cfebfe8a6b4a44efa3d7090e7 (diff) | |
| parent | 1d4b6eff25aa29cbbf4d216d65349e1ad38f962e (diff) | |
| download | art-88ffa4933bab329e8225537be4f7a2333209e0b5.tar.gz art-88ffa4933bab329e8225537be4f7a2333209e0b5.tar.bz2 art-88ffa4933bab329e8225537be4f7a2333209e0b5.zip | |
am 1d4b6eff: am 1e4fbd8b: Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev
* commit '1d4b6eff25aa29cbbf4d216d65349e1ad38f962e':
Using the correct time for wait_start_ms when lock contention logging is enabled
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. |