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
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index 322d3aa..a36e5b1 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -26,6 +26,7 @@
#include <vector>
#include "arch/instruction_set_features.h"
+#include "art_field-inl.h"
#include "base/unix_file/fd_file.h"
#include "class_linker.h"
#include "class_linker-inl.h"
@@ -40,7 +41,6 @@
#include "image.h"
#include "indenter.h"
#include "mapping_table.h"
-#include "mirror/art_field-inl.h"
#include "mirror/art_method-inl.h"
#include "mirror/array-inl.h"
#include "mirror/class-inl.h"
@@ -1549,9 +1549,6 @@
} else if (type->IsClassClass()) {
mirror::Class* klass = value->AsClass();
os << StringPrintf("%p Class: %s\n", klass, PrettyDescriptor(klass).c_str());
- } else if (type->IsArtFieldClass()) {
- mirror::ArtField* field = value->AsArtField();
- os << StringPrintf("%p Field: %s\n", field, PrettyField(field).c_str());
} else if (type->IsArtMethodClass()) {
mirror::ArtMethod* method = value->AsArtMethod();
os << StringPrintf("%p Method: %s\n", method, PrettyMethod(method).c_str());
@@ -1560,7 +1557,7 @@
}
}
- static void PrintField(std::ostream& os, mirror::ArtField* field, mirror::Object* obj)
+ static void PrintField(std::ostream& os, ArtField* field, mirror::Object* obj)
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
os << StringPrintf("%s: ", field->GetName());
switch (field->GetTypeAsPrimitiveType()) {
@@ -1619,12 +1616,9 @@
if (super != nullptr) {
DumpFields(os, obj, super);
}
- mirror::ObjectArray<mirror::ArtField>* fields = klass->GetIFields();
- if (fields != nullptr) {
- for (int32_t i = 0; i < fields->GetLength(); i++) {
- mirror::ArtField* field = fields->Get(i);
- PrintField(os, field, obj);
- }
+ ArtField* fields = klass->GetIFields();
+ for (size_t i = 0, count = klass->NumInstanceFields(); i < count; i++) {
+ PrintField(os, &fields[i], obj);
}
}
@@ -1686,9 +1680,6 @@
mirror::Class* klass = obj->AsClass();
os << StringPrintf("%p: java.lang.Class \"%s\" (", obj, PrettyDescriptor(klass).c_str())
<< klass->GetStatus() << ")\n";
- } else if (obj->IsArtField()) {
- os << StringPrintf("%p: java.lang.reflect.ArtField %s\n", obj,
- PrettyField(obj->AsArtField()).c_str());
} else if (obj->IsArtMethod()) {
os << StringPrintf("%p: java.lang.reflect.ArtMethod %s\n", obj,
PrettyMethod(obj->AsArtMethod()).c_str());
@@ -1725,14 +1716,15 @@
PrettyObjectValue(indent_os, value_class, value);
}
} else if (obj->IsClass()) {
- mirror::ObjectArray<mirror::ArtField>* sfields = obj->AsClass()->GetSFields();
- if (sfields != nullptr) {
+ mirror::Class* klass = obj->AsClass();
+ ArtField* sfields = klass->GetSFields();
+ const size_t num_fields = klass->NumStaticFields();
+ if (num_fields != 0) {
indent_os << "STATICS:\n";
Indenter indent2_filter(indent_os.rdbuf(), kIndentChar, kIndentBy1Count);
std::ostream indent2_os(&indent2_filter);
- for (int32_t i = 0; i < sfields->GetLength(); i++) {
- mirror::ArtField* field = sfields->Get(i);
- PrintField(indent2_os, field, field->GetDeclaringClass());
+ for (size_t i = 0; i < num_fields; i++) {
+ PrintField(indent2_os, &sfields[i], sfields[i].GetDeclaringClass());
}
}
} else if (obj->IsArtMethod()) {