ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer"

Browse Source
This commit is contained in:
Jeff Brown 2011-12-16 14:35:16 -08:00 committed by Android (Google) Code Review
commit a621e426ff
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/binder/MemoryDealer.cpp
View File

@ -180,7 +180,6 @@ Allocation::~Allocation()
/* NOTE: it's VERY important to not free allocations of size 0 because /* NOTE: it's VERY important to not free allocations of size 0 because
* they're special as they don't have any record in the allocator * they're special as they don't have any record in the allocator
* and could alias some real allocation (their offset is zero). */ * and could alias some real allocation (their offset is zero). */
mDealer->deallocate(freedOffset);
// keep the size to unmap in excess // keep the size to unmap in excess
size_t pagesize = getpagesize(); size_t pagesize = getpagesize();
@ -216,6 +215,11 @@ Allocation::~Allocation()
} }
#endif #endif
} }
// This should be done after madvise(MADV_REMOVE), otherwise madvise()
// might kick out the memory region that's allocated and/or written
// right after the deallocation.
mDealer->deallocate(freedOffset);
} }
} }