diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-30 01:26:50 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-08-13 18:09:46 -0700 |
| commit | ea46f950e7a51585db293cd7f047de190a482414 (patch) | |
| tree | 9dddc8073547a2dcb58a19e1728932a89cb149c3 /runtime/trace.h | |
| parent | 5e3572709b5a5d59957f835db4f73760ecef08da (diff) | |
| download | android_art-ea46f950e7a51585db293cd7f047de190a482414.tar.gz android_art-ea46f950e7a51585db293cd7f047de190a482414.tar.bz2 android_art-ea46f950e7a51585db293cd7f047de190a482414.zip | |
Refactor java.lang.reflect implementation
Cherry-picked from commit ed41d5c44299ec5d44b8514f6e17f802f48094d1.
Move to ArtMethod/Field instead of AbstractMethod/Field and have
java.lang.reflect APIs delegate to ArtMethod/ArtField.
Bug: 10014286.
Change-Id: Iafc1d8c5b62562c9af8fb9fd8c5e1d61270536e7
Diffstat (limited to 'runtime/trace.h')
| -rw-r--r-- | runtime/trace.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/runtime/trace.h b/runtime/trace.h index bd9c140d26..ae583cae2d 100644 --- a/runtime/trace.h +++ b/runtime/trace.h @@ -31,7 +31,7 @@ namespace art { namespace mirror { -class AbstractMethod; + class ArtMethod; } // namespace mirror class Thread; @@ -63,19 +63,19 @@ class Trace : public instrumentation::InstrumentationListener { bool UseThreadCpuClock(); virtual void MethodEntered(Thread* thread, mirror::Object* this_object, - const mirror::AbstractMethod* method, uint32_t dex_pc) + const mirror::ArtMethod* method, uint32_t dex_pc) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); virtual void MethodExited(Thread* thread, mirror::Object* this_object, - const mirror::AbstractMethod* method, uint32_t dex_pc, + const mirror::ArtMethod* method, uint32_t dex_pc, const JValue& return_value) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - virtual void MethodUnwind(Thread* thread, const mirror::AbstractMethod* method, uint32_t dex_pc) + virtual void MethodUnwind(Thread* thread, const mirror::ArtMethod* method, uint32_t dex_pc) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); virtual void DexPcMoved(Thread* thread, mirror::Object* this_object, - const mirror::AbstractMethod* method, uint32_t new_dex_pc) + const mirror::ArtMethod* method, uint32_t new_dex_pc) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); virtual void ExceptionCaught(Thread* thread, const ThrowLocation& throw_location, - mirror::AbstractMethod* catch_method, uint32_t catch_dex_pc, + mirror::ArtMethod* catch_method, uint32_t catch_dex_pc, mirror::Throwable* exception_object) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -84,12 +84,12 @@ class Trace : public instrumentation::InstrumentationListener { void FinishTracing() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void LogMethodTraceEvent(Thread* thread, const mirror::AbstractMethod* method, + void LogMethodTraceEvent(Thread* thread, const mirror::ArtMethod* method, instrumentation::Instrumentation::InstrumentationEvent event); // Methods to output traced methods and threads. - void GetVisitedMethods(size_t end_offset, std::set<mirror::AbstractMethod*>* visited_methods); - void DumpMethodList(std::ostream& os, const std::set<mirror::AbstractMethod*>& visited_methods) + void GetVisitedMethods(size_t end_offset, std::set<mirror::ArtMethod*>* visited_methods); + void DumpMethodList(std::ostream& os, const std::set<mirror::ArtMethod*>& visited_methods) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void DumpThreadList(std::ostream& os) LOCKS_EXCLUDED(Locks::thread_list_lock_); |