More space refactoring.
Add common interface, AllocSpace.
Renamed the old AllocSpace to DLMallocSpace.
Added an new option enforce_target_size_, which when enabled, doesn't let
the heap grow past ideal heap size calculated during last Gc.
Removed redundant AllocationSize calls.
Moved large object space to its own file instead of being in space.h/cc.
Change-Id: I15e60531114bf213800599737cbd66ef44b46b15
diff --git a/src/mem_map.cc b/src/mem_map.cc
index 9e86772..653eb3f 100644
--- a/src/mem_map.cc
+++ b/src/mem_map.cc
@@ -91,7 +91,7 @@
<< ", " << prot << ", " << flags << ", " << fd.get() << ", 0) failed for " << name;
return NULL;
}
- return new MemMap(actual, byte_count, actual, page_aligned_byte_count, prot);
+ return new MemMap(name, actual, byte_count, actual, page_aligned_byte_count, prot);
}
MemMap* MemMap::MapFileAtAddress(byte* addr, size_t byte_count, int prot, int flags, int fd, off_t start) {
@@ -113,7 +113,8 @@
PLOG(ERROR) << "mmap failed";
return NULL;
}
- return new MemMap(actual + page_offset, byte_count, actual, page_aligned_byte_count, prot);
+ return new MemMap("file", actual + page_offset, byte_count, actual, page_aligned_byte_count,
+ prot);
}
MemMap::~MemMap() {
@@ -126,8 +127,10 @@
}
}
-MemMap::MemMap(byte* begin, size_t size, void* base_begin, size_t base_size, int prot)
- : begin_(begin), size_(size), base_begin_(base_begin), base_size_(base_size), prot_(prot) {
+MemMap::MemMap(const std::string& name, byte* begin, size_t size, void* base_begin,
+ size_t base_size, int prot)
+ : name_(name), begin_(begin), size_(size), base_begin_(base_begin), base_size_(base_size),
+ prot_(prot) {
CHECK(begin_ != NULL);
CHECK_NE(size_, 0U);
CHECK(base_begin_ != NULL);