diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-01-28 14:50:23 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-02-11 10:40:10 -0800 |
| commit | 83c8ee000d525017ead8753fce6bc1020249b96a (patch) | |
| tree | d5167ed15dee2629905ac3640b6ea0578d4ae312 /runtime/jni_internal.h | |
| parent | 7cba217ab0661d74deccbb97160cdf60b74d4ea3 (diff) | |
| download | android_art-83c8ee000d525017ead8753fce6bc1020249b96a.tar.gz android_art-83c8ee000d525017ead8753fce6bc1020249b96a.tar.bz2 android_art-83c8ee000d525017ead8753fce6bc1020249b96a.zip | |
Add root types and thread id to root visiting.
Enables us to pass the root type and thread id to hprof.
Bug: 12680863
Change-Id: I6a0f1f9e3aa8f9b4033d695818ae7ca3460d67cb
Diffstat (limited to 'runtime/jni_internal.h')
| -rw-r--r-- | runtime/jni_internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/jni_internal.h b/runtime/jni_internal.h index cd3c5cbb7f..26905c7a27 100644 --- a/runtime/jni_internal.h +++ b/runtime/jni_internal.h @@ -22,8 +22,8 @@ #include "base/macros.h" #include "base/mutex.h" #include "indirect_reference_table.h" +#include "object_callbacks.h" #include "reference_table.h" -#include "root_visitor.h" #include "runtime.h" #include "sirt_ref.h" @@ -91,7 +91,7 @@ class JavaVMExt : public JavaVM { void SetCheckJniEnabled(bool enabled); - void VisitRoots(RootVisitor*, void*); + void VisitRoots(RootCallback* callback, void* arg); void DisallowNewWeakGlobals() EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_); void AllowNewWeakGlobals() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -99,7 +99,7 @@ class JavaVMExt : public JavaVM { SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void DeleteWeakGlobalRef(Thread* self, jweak obj) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void SweepJniWeakGlobals(RootVisitor visitor, void* arg); + void SweepJniWeakGlobals(IsMarkedCallback* callback, void* arg); mirror::Object* DecodeWeakGlobal(Thread* self, IndirectRef ref); Runtime* runtime; |