ART: Fix valgrind
Allow ValgrindMallocSpace wrapper for RosAlloc.Requires refactoring,
as ValgrindMallocSpace was bound to the signature of DlMallocSpace.
Also turn of native stack dumping when running under Valgrind to
work around b/18119146.
Ritzperf before and after
Mean 3190.725 3082.475
Standard Error 11.68407 10.37911
Mode 3069 2980
Median 3182.5 3051.5
Variance 16382.117 12927.125
Standard Deviation 127.99264 113.69751
Kurtosis 1.1065632 0.3657799
Skewness 0.9013805 0.9117792
Range 644 528
Minimum 2991 2928
Maximum 3635 3456
Count 120 120
Bug: 18119146
Change-Id: I25558ea7cb578406011dede9d3d0bdbfee4ff4d5
diff --git a/runtime/gc/space/dlmalloc_space.cc b/runtime/gc/space/dlmalloc_space.cc
index 3072c23..b8a9dd6 100644
--- a/runtime/gc/space/dlmalloc_space.cc
+++ b/runtime/gc/space/dlmalloc_space.cc
@@ -33,12 +33,9 @@
static constexpr bool kPrefetchDuringDlMallocFreeList = true;
-template class ValgrindMallocSpace<DlMallocSpace, void*>;
-
-DlMallocSpace::DlMallocSpace(const std::string& name, MemMap* mem_map, void* mspace, uint8_t* begin,
- uint8_t* end, uint8_t* limit, size_t growth_limit,
- bool can_move_objects, size_t starting_size,
- size_t initial_size)
+DlMallocSpace::DlMallocSpace(MemMap* mem_map, size_t initial_size, const std::string& name,
+ void* mspace, uint8_t* begin, uint8_t* end, uint8_t* limit,
+ size_t growth_limit, bool can_move_objects, size_t starting_size)
: MallocSpace(name, mem_map, begin, end, limit, growth_limit, true, can_move_objects,
starting_size, initial_size),
mspace_(mspace) {
@@ -65,12 +62,12 @@
// Everything is set so record in immutable structure and leave
uint8_t* begin = mem_map->Begin();
if (Runtime::Current()->RunningOnValgrind()) {
- return new ValgrindMallocSpace<DlMallocSpace, void*>(
- name, mem_map, mspace, begin, end, begin + capacity, growth_limit, initial_size,
+ return new ValgrindMallocSpace<DlMallocSpace, kDefaultValgrindRedZoneBytes, true, false>(
+ mem_map, initial_size, name, mspace, begin, end, begin + capacity, growth_limit,
can_move_objects, starting_size);
} else {
- return new DlMallocSpace(name, mem_map, mspace, begin, end, begin + capacity, growth_limit,
- can_move_objects, starting_size, initial_size);
+ return new DlMallocSpace(mem_map, initial_size, name, mspace, begin, end, begin + capacity,
+ growth_limit, can_move_objects, starting_size);
}
}
@@ -148,12 +145,18 @@
return result;
}
-MallocSpace* DlMallocSpace::CreateInstance(const std::string& name, MemMap* mem_map,
+MallocSpace* DlMallocSpace::CreateInstance(MemMap* mem_map, const std::string& name,
void* allocator, uint8_t* begin, uint8_t* end,
uint8_t* limit, size_t growth_limit,
bool can_move_objects) {
- return new DlMallocSpace(name, mem_map, allocator, begin, end, limit, growth_limit,
- can_move_objects, starting_size_, initial_size_);
+ if (Runtime::Current()->RunningOnValgrind()) {
+ return new ValgrindMallocSpace<DlMallocSpace, kDefaultValgrindRedZoneBytes, true, false>(
+ mem_map, initial_size_, name, allocator, begin, end, limit, growth_limit,
+ can_move_objects, starting_size_);
+ } else {
+ return new DlMallocSpace(mem_map, initial_size_, name, allocator, begin, end, limit,
+ growth_limit, can_move_objects, starting_size_);
+ }
}
size_t DlMallocSpace::Free(Thread* self, mirror::Object* ptr) {