diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-27 14:35:38 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-10 12:57:27 -0700 |
| commit | c785344b87221f5e4e6473e5b762e4e61fe65dcf (patch) | |
| tree | cd32ad2c2604596a18926f04d4c313dab255ecfd /runtime/jdwp | |
| parent | a29d93b380c9aeb8270e281aefbdd0c77a430d43 (diff) | |
| download | art-c785344b87221f5e4e6473e5b762e4e61fe65dcf.tar.gz art-c785344b87221f5e4e6473e5b762e4e61fe65dcf.tar.bz2 art-c785344b87221f5e4e6473e5b762e4e61fe65dcf.zip | |
Move ArtField to native
Add linear alloc. Moved ArtField to be native object. Changed image
writer to put ArtFields after the mirror section.
Savings:
2MB on low ram devices
4MB on normal devices
Total PSS measurements before (normal N5, 95s after shell start):
Image size: 7729152 bytes
23112 kB: .NonMoving
23212 kB: .NonMoving
22868 kB: .NonMoving
23072 kB: .NonMoving
22836 kB: .NonMoving
19618 kB: .Zygote
19850 kB: .Zygote
19623 kB: .Zygote
19924 kB: .Zygote
19612 kB: .Zygote
Avg: 42745.4 kB
After:
Image size: 7462912 bytes
17440 kB: .NonMoving
16776 kB: .NonMoving
16804 kB: .NonMoving
17812 kB: .NonMoving
16820 kB: .NonMoving
18788 kB: .Zygote
18856 kB: .Zygote
19064 kB: .Zygote
18841 kB: .Zygote
18629 kB: .Zygote
3499 kB: .LinearAlloc
3408 kB: .LinearAlloc
3424 kB: .LinearAlloc
3600 kB: .LinearAlloc
3436 kB: .LinearAlloc
Avg: 39439.4 kB
No reflection performance changes.
Bug: 19264997
Bug: 17643507
Change-Id: I10c73a37913332080aeb978c7c94713bdfe4fe1c
Diffstat (limited to 'runtime/jdwp')
| -rw-r--r-- | runtime/jdwp/jdwp.h | 4 | ||||
| -rw-r--r-- | runtime/jdwp/jdwp_event.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/runtime/jdwp/jdwp.h b/runtime/jdwp/jdwp.h index 31c9a0bb4e..a503b17e87 100644 --- a/runtime/jdwp/jdwp.h +++ b/runtime/jdwp/jdwp.h @@ -33,11 +33,11 @@ struct iovec; namespace art { +class ArtField; union JValue; class Thread; namespace mirror { - class ArtField; class ArtMethod; class Class; class Object; @@ -207,7 +207,7 @@ struct JdwpState { * "fieldValue" is non-null for field modification events only. * "is_modification" is true for field modification, false for field access. */ - void PostFieldEvent(const EventLocation* pLoc, mirror::ArtField* field, mirror::Object* thisPtr, + void PostFieldEvent(const EventLocation* pLoc, ArtField* field, mirror::Object* thisPtr, const JValue* fieldValue, bool is_modification) LOCKS_EXCLUDED(event_list_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); diff --git a/runtime/jdwp/jdwp_event.cc b/runtime/jdwp/jdwp_event.cc index c9a4483188..ccf8bffba3 100644 --- a/runtime/jdwp/jdwp_event.cc +++ b/runtime/jdwp/jdwp_event.cc @@ -21,6 +21,7 @@ #include <string.h> #include <unistd.h> +#include "art_field-inl.h" #include "base/logging.h" #include "base/stringprintf.h" #include "debugger.h" @@ -28,7 +29,6 @@ #include "jdwp/jdwp_expand_buf.h" #include "jdwp/jdwp_priv.h" #include "jdwp/object_registry.h" -#include "mirror/art_field-inl.h" #include "scoped_thread_state_change.h" #include "thread-inl.h" @@ -119,7 +119,7 @@ struct ModBasket { mirror::Class* locationClass; /* ClassOnly */ mirror::Class* exceptionClass; /* ExceptionOnly */ bool caught; /* ExceptionOnly */ - mirror::ArtField* field; /* FieldOnly */ + ArtField* field; /* FieldOnly */ mirror::Object* thisPtr; /* InstanceOnly */ /* nothing for StepOnly -- handled differently */ }; @@ -914,7 +914,7 @@ void JdwpState::PostLocationEvent(const EventLocation* pLoc, mirror::Object* thi SendRequestAndPossiblySuspend(pReq, suspend_policy, thread_id); } -void JdwpState::PostFieldEvent(const EventLocation* pLoc, mirror::ArtField* field, +void JdwpState::PostFieldEvent(const EventLocation* pLoc, ArtField* field, mirror::Object* this_object, const JValue* fieldValue, bool is_modification) { DCHECK(pLoc != nullptr); |