OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
091f954
)
Pass the real capacity to CreateRosAlloc.
author
Hiroshi Yamauchi
<yamauchi@google.com>
Sat, 20 Dec 2014 00:02:07 +0000
(16:02 -0800)
committer
Hiroshi Yamauchi
<yamauchi@google.com>
Sat, 20 Dec 2014 00:02:07 +0000
(16:02 -0800)
(cherrypick commit
94c41dfcaf4bc131964ddd3013432841b07c3839
)
Bug:
18808732
Change-Id: Id65469c3deb70c9f750f89cf0e7606849b801a21
runtime/gc/space/rosalloc_space.cc
patch
|
blob
|
history
diff --git
a/runtime/gc/space/rosalloc_space.cc
b/runtime/gc/space/rosalloc_space.cc
index
92c6f53
..
518e8c0
100644
(file)
--- a/
runtime/gc/space/rosalloc_space.cc
+++ b/
runtime/gc/space/rosalloc_space.cc
@@
-351,8
+351,8
@@
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_);
+ rosalloc_ = CreateRosAlloc(mem_map_->Begin(), starting_size_, initial_size_,
+
NonGrowthLimitCapacity(),
low_memory_mode_);
SetFootprintLimit(footprint_limit);
}