diff options
author | Mathieu Chartier <mathieuc@google.com> | 2014-10-03 21:17:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-03 21:17:36 +0000 |
commit | fdb97de88d92cad7698e1eda3062d0cee3d2d18b (patch) | |
tree | c80e2ed682efe2273e1d8ec39d4a34fdb8358f1e /runtime | |
parent | c9ed6e64f910a3fb3afa34df36c9f8f56691164c (diff) | |
parent | b9001abff3a45f1ae90536da7dd1ec28a6ae0174 (diff) | |
download | art-fdb97de88d92cad7698e1eda3062d0cee3d2d18b.tar.gz art-fdb97de88d92cad7698e1eda3062d0cee3d2d18b.tar.bz2 art-fdb97de88d92cad7698e1eda3062d0cee3d2d18b.zip |
am b9001abf: Add extra logging for lock contention
* commit 'b9001abff3a45f1ae90536da7dd1ec28a6ae0174':
Add extra logging for lock contention
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/monitor.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc index 6123934d3c..bf28166f9f 100644 --- a/runtime/monitor.cc +++ b/runtime/monitor.cc @@ -36,6 +36,8 @@ namespace art { +static constexpr uint64_t kLongWaitMs = 100; + /* * Every Object has a monitor associated with it, but not every Object is actually locked. Even * the ones that are locked do not need a full-fledged monitor until a) there is actual contention @@ -242,6 +244,7 @@ void Monitor::Lock(Thread* self) { 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. + size_t num_waiters = num_waiters_; ++num_waiters_; monitor_lock_.Unlock(self); // Let go of locks in order. self->SetMonitorEnterObject(GetObject()); @@ -263,6 +266,12 @@ void Monitor::Lock(Thread* self) { const char* owners_filename; uint32_t owners_line_number; TranslateLocation(owners_method, owners_dex_pc, &owners_filename, &owners_line_number); + if (wait_ms > kLongWaitMs && owners_method != nullptr) { + LOG(WARNING) << "Long monitor contention event with owner method=" + << PrettyMethod(owners_method) << " from " << owners_filename << ":" + << owners_line_number << " waiters=" << num_waiters << " for " + << PrettyDuration(MsToNs(wait_ms)); + } LogContentionEvent(self, wait_ms, sample_percent, owners_filename, owners_line_number); } } |