Upgrade to latest dlmalloc. Refactor Heap and related APIs to use STL like naming.
We fail assertions in the existing heap code, as does Dalvik. This refactoring
is to clean the heap and space APIs and to reduce duplication of data
and thereby solve a failing assertion in the card table.
This change also wires up clearing of soft references including before
out-of-memory errors are reported.
In doing this change it was made clear that mspaces are buggy (and
violating invariants with the garbage collector). This
change upgrades to an un-Android molested version of dlmalloc-2.8.5 and
implements a version of the mspace morecore routine under ART control.
run-test 061-out-of-memory is updated for current heap sizes.
Change-Id: I377e83ab2a8c78afb9b1881f03356929e2c9dc64
diff --git a/src/oat_file.h b/src/oat_file.h
index 07e235b..8415140 100644
--- a/src/oat_file.h
+++ b/src/oat_file.h
@@ -103,10 +103,10 @@
if (offset == 0) {
return NULL;
}
- return reinterpret_cast<T>(base_ + offset);
+ return reinterpret_cast<T>(begin_ + offset);
}
- const byte* base_;
+ const byte* begin_;
uint32_t code_offset_;
size_t frame_size_in_bytes_;
@@ -178,16 +178,16 @@
bool warn_if_not_found = true) const;
std::vector<const OatDexFile*> GetOatDexFiles() const;
- size_t GetSize() const {
- return GetLimit() - GetBase();
+ size_t Size() const {
+ return End() - Begin();
}
private:
explicit OatFile(const std::string& filename);
bool Read(const std::string& filename, byte* requested_base);
- const byte* GetBase() const;
- const byte* GetLimit() const;
+ const byte* Begin() const;
+ const byte* End() const;
// The oat file name.
//