ART: Move source owner data to LogContentionEvent
Change the signature of Monitor::LogContentionEvent to take the
owner's ArtMethod and dex pc instead of the derived data. Move the
decoding from monitor.cc to monitor_android.cc.
This change does not change functionality. It is only in preparation
for a later, actual change of what is being logged.
Bug: 62241642
Test: m test-art-host
Change-Id: I30f02eeecbc556f8eb7b637301ed8ac9b1e40a93
diff --git a/runtime/monitor.h b/runtime/monitor.h
index e80d31c..6dc706f 100644
--- a/runtime/monitor.h
+++ b/runtime/monitor.h
@@ -181,8 +181,11 @@
REQUIRES_SHARED(Locks::mutator_lock_)
NO_THREAD_SAFETY_ANALYSIS; // For m->Install(self)
- void LogContentionEvent(Thread* self, uint32_t wait_ms, uint32_t sample_percent,
- const char* owner_filename, int32_t owner_line_number)
+ void LogContentionEvent(Thread* self,
+ uint32_t wait_ms,
+ uint32_t sample_percent,
+ ArtMethod* owner_method,
+ uint32_t owner_dex_pc)
REQUIRES_SHARED(Locks::mutator_lock_);
static void FailedUnlock(mirror::Object* obj,