diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-09-03 10:30:11 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-09-03 21:35:32 -0700 |
| commit | 8ec31f9835a8d1513be9be7f9fa236fe4715750d (patch) | |
| tree | 2b161b3683e559c66ae1926250583165499862e9 /runtime/gc/heap.h | |
| parent | badae981ada1fa279e54360df177ab6f40c299b9 (diff) | |
| download | art-8ec31f9835a8d1513be9be7f9fa236fe4715750d.tar.gz art-8ec31f9835a8d1513be9be7f9fa236fe4715750d.tar.bz2 art-8ec31f9835a8d1513be9be7f9fa236fe4715750d.zip | |
Fix native allocation watermark clamping.
The main issue causing the test to fail is that
native_footprint_gc_watermark_ becoming > growth_limit_ due to no
clamping.
Temporary runFinalization fix is calling runFinalization 2x.
Bug: 17371542
(cherry picked from commit 4c7fc5950853b0c368e2148db77ced7c4d3c303c)
Change-Id: I05b85e95560c32c33d53bc96abf87d5262007395
Diffstat (limited to 'runtime/gc/heap.h')
| -rw-r--r-- | runtime/gc/heap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h index a230f44635..9742277b26 100644 --- a/runtime/gc/heap.h +++ b/runtime/gc/heap.h @@ -212,8 +212,8 @@ class Heap { void CheckPreconditionsForAllocObject(mirror::Class* c, size_t byte_count) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void RegisterNativeAllocation(JNIEnv* env, int bytes); - void RegisterNativeFree(JNIEnv* env, int bytes); + void RegisterNativeAllocation(JNIEnv* env, size_t bytes); + void RegisterNativeFree(JNIEnv* env, size_t bytes); // Change the allocator, updates entrypoints. void ChangeAllocator(AllocatorType allocator) |