Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-09 21:33:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1229384 - In SplitRun, adjust the set of available runs after committing pages. r=njn

Browse Source 
On its own, this change is unnecessary. But it prepares for pages_commit
becoming fallible in next commit, allowing a possibly early return while
leaving metadata in a consistent state: runs are still available for
future use even if they couldn't be committed immediately.

--HG--
extra : rebase_source : 971e5c49882409c00ac61ec641d469dcc94e5cc2
This commit is contained in:
Mike Hommey 2017-10-26 18:12:04 +09:00
parent 8fbdcde064
commit c77051041e
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
memory/build/mozjemalloc.cpp
View File

@ -2425,19 +2425,6 @@ arena_t::SplitRun(arena_run_t* aRun, size_t aSize, bool aLarge, bool aZero)
MOZ_ASSERT(need_pages <= total_pages);
rem_pages = total_pages - need_pages;
mRunsAvail.Remove(&chunk->map[run_ind]);
/* Keep track of trailing unused pages for later use. */
if (rem_pages > 0) {
chunk->map[run_ind+need_pages].bits = (rem_pages <<
pagesize_2pow) | (chunk->map[run_ind+need_pages].bits &
pagesize_mask);
chunk->map[run_ind+total_pages-1].bits = (rem_pages <<
pagesize_2pow) | (chunk->map[run_ind+total_pages-1].bits &
pagesize_mask);
mRunsAvail.Insert(&chunk->map[run_ind+need_pages]);
}
for (i = 0; i < need_pages; i++) {
/*
* Commit decommitted pages if necessary. If a decommitted
@ -2466,15 +2453,31 @@ arena_t::SplitRun(arena_run_t* aRun, size_t aSize, bool aLarge, bool aZero)
# ifdef MALLOC_DECOMMIT
pages_commit((void*)(uintptr_t(chunk) + ((run_ind + i) << pagesize_2pow)),
j << pagesize_2pow);
// pages_commit zeroes pages, so mark them as such. That's checked
// further below to avoid manually zeroing the pages.
for (size_t k = 0; k < j; k++) {
chunk->map[run_ind + i + k].bits |= CHUNK_MAP_ZEROED;
}
# endif
mStats.committed += j;
}
# ifdef MALLOC_DECOMMIT
else /* No need to zero since commit zeroes. */
# endif
}
mRunsAvail.Remove(&chunk->map[run_ind]);
/* Keep track of trailing unused pages for later use. */
if (rem_pages > 0) {
chunk->map[run_ind+need_pages].bits = (rem_pages <<
pagesize_2pow) | (chunk->map[run_ind+need_pages].bits &
pagesize_mask);
chunk->map[run_ind+total_pages-1].bits = (rem_pages <<
pagesize_2pow) | (chunk->map[run_ind+total_pages-1].bits &
pagesize_mask);
mRunsAvail.Insert(&chunk->map[run_ind+need_pages]);
}
for (i = 0; i < need_pages; i++) {
/* Zero if necessary. */
if (aZero) {
if ((chunk->map[run_ind + i].bits & CHUNK_MAP_ZEROED) == 0) {