diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-12-19 20:16:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-19 20:16:12 +0000 |
| commit | fa28ef0191e5f65bdf5932675f49d897bdc480b2 (patch) | |
| tree | b682f4d5c33d04424f255ca76628716a149fde46 /runtime | |
| parent | e1cb3301b9d3afc488a916b6c75bf7e2885eec81 (diff) | |
| parent | 94c41dfcaf4bc131964ddd3013432841b07c3839 (diff) | |
| download | art-fa28ef0191e5f65bdf5932675f49d897bdc480b2.zip art-fa28ef0191e5f65bdf5932675f49d897bdc480b2.tar.gz art-fa28ef0191e5f65bdf5932675f49d897bdc480b2.tar.bz2 | |
Merge "Pass the real capacity to CreateRosAlloc."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/gc/space/rosalloc_space.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/gc/space/rosalloc_space.cc b/runtime/gc/space/rosalloc_space.cc index 74d1a2b..ced25a4 100644 --- a/runtime/gc/space/rosalloc_space.cc +++ b/runtime/gc/space/rosalloc_space.cc @@ -365,8 +365,9 @@ void RosAllocSpace::Clear() { mark_bitmap_->Clear(); SetEnd(begin_ + starting_size_); delete rosalloc_; - rosalloc_ = CreateRosAlloc(mem_map_->Begin(), starting_size_, initial_size_, Capacity(), - low_memory_mode_, Runtime::Current()->RunningOnValgrind()); + rosalloc_ = CreateRosAlloc(mem_map_->Begin(), starting_size_, initial_size_, + NonGrowthLimitCapacity(), low_memory_mode_, + Runtime::Current()->RunningOnValgrind()); SetFootprintLimit(footprint_limit); } |