Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1409294 - Make arena_t::Init return whether initialization succeeded. r=njn

Browse Source 
--HG--
extra : rebase_source : efd32943313cef9a680fc38b0c2182e3c175c27e
This commit is contained in:
Mike Hommey 2017-10-17 17:37:50 +09:00
parent 316e4cb704
commit 4bc374f630
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
memory/build/mozjemalloc.cpp
View File

@ -3891,6 +3891,7 @@ iralloc(void* aPtr, size_t aSize, arena_t* aArena)
: huge_ralloc(aPtr, aSize, oldsize);
}
// Returns whether initialization succeeded.
bool
arena_t::Init()
{
@ -3898,8 +3899,9 @@ arena_t::Init()
arena_bin_t* bin;
size_t prev_run_size;
if (!mLock.Init())
return true;
if (!mLock.Init()) {
return false;
}
memset(&mLink, 0, sizeof(mLink));
memset(&mStats, 0, sizeof(arena_stats_t));
@ -3964,7 +3966,7 @@ arena_t::Init()
mMagic = ARENA_MAGIC;
#endif
return false;
return true;
}
static inline arena_t *
@ -3991,9 +3993,9 @@ arenas_extend()
arena_t* ret;
/* Allocate enough space for trailing bins. */
ret = (arena_t *)base_alloc(sizeof(arena_t)
+ (sizeof(arena_bin_t) * (ntbins + nqbins + nsbins - 1)));
if (!ret || ret->Init()) {
ret = (arena_t*)base_alloc(sizeof(arena_t) +
(sizeof(arena_bin_t) * (ntbins + nqbins + nsbins - 1)));
if (!ret || !ret->Init()) {
return arenas_fallback();
}