Switch art over to the new bionic dlmalloc 2.8.5 callback
Change-Id: I1314e87a51553fd358dbf9c44f804a7eb2de3a7d
diff --git a/src/space.cc b/src/space.cc
index f0f9323..324b495 100644
--- a/src/space.cc
+++ b/src/space.cc
@@ -319,7 +319,11 @@
return mspace_usable_size(const_cast<void*>(reinterpret_cast<const void*>(obj))) + kChunkOverhead;
}
-void MspaceMadviseCallback(void* start, void* end, void* /*arg*/) {
+void MspaceMadviseCallback(void* start, void* end, size_t used_bytes, void* /* arg */) {
+ // Is this chunk in use?
+ if (used_bytes != 0) {
+ return;
+ }
// Do we have any whole pages to give back?
start = reinterpret_cast<void*>(RoundUp(reinterpret_cast<uintptr_t>(start), kPageSize));
end = reinterpret_cast<void*>(RoundDown(reinterpret_cast<uintptr_t>(end), kPageSize));
@@ -329,14 +333,6 @@
}
}
-void MspaceMadviseCallback(void* start, void* end, size_t used_bytes, void* arg) {
- // Is this chunk in use?
- if (used_bytes != 0) {
- return;
- }
- return MspaceMadviseCallback(start, end, arg);
-}
-
void AllocSpace::Trim() {
MutexLock mu(lock_);
// Trim to release memory at the end of the space.