Remove some unnecessary code from dlmalloc_space/rosalloc_space.
Removed GetTotalBytesAllocated(), GetTotalObjectsAllocated(), and
InternalAllocationSize().
No performance improvement observed.
Change-Id: Ie20433a0fd328fc7f61d4afd54d18fbdc4aa4a17
diff --git a/runtime/gc/space/rosalloc_space.cc b/runtime/gc/space/rosalloc_space.cc
index 1f8e324..9ddc14b 100644
--- a/runtime/gc/space/rosalloc_space.cc
+++ b/runtime/gc/space/rosalloc_space.cc
@@ -146,9 +146,7 @@
CHECK(ptr != NULL);
CHECK(Contains(ptr)) << "Free (" << ptr << ") not in bounds of heap " << *this;
}
- const size_t bytes_freed = InternalAllocationSize(ptr);
- total_bytes_freed_atomic_.fetch_add(bytes_freed);
- ++total_objects_freed_atomic_;
+ const size_t bytes_freed = AllocationSizeNonvirtual(ptr);
if (kRecentFreeCount > 0) {
MutexLock mu(self, lock_);
RegisterRecentFree(ptr);
@@ -168,7 +166,7 @@
if (kPrefetchDuringRosAllocFreeList && i + look_ahead < num_ptrs) {
__builtin_prefetch(reinterpret_cast<char*>(ptrs[i + look_ahead]));
}
- bytes_freed += InternalAllocationSize(ptr);
+ bytes_freed += AllocationSizeNonvirtual(ptr);
}
if (kRecentFreeCount > 0) {
@@ -193,8 +191,6 @@
}
rosalloc_->BulkFree(self, reinterpret_cast<void**>(ptrs), num_ptrs);
- total_bytes_freed_atomic_.fetch_add(bytes_freed);
- total_objects_freed_atomic_.fetch_add(num_ptrs);
return bytes_freed;
}
@@ -206,13 +202,8 @@
return heap->GetNonMovingSpace()->MoreCore(increment);
}
-// Virtual functions can't get inlined.
-inline size_t RosAllocSpace::InternalAllocationSize(const mirror::Object* obj) {
- return AllocationSizeNonvirtual(obj);
-}
-
size_t RosAllocSpace::AllocationSize(const mirror::Object* obj) {
- return InternalAllocationSize(obj);
+ return AllocationSizeNonvirtual(obj);
}
size_t RosAllocSpace::Trim() {