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

Bug 1401099 - Move arena_malloc_small to a method of arena_t. r=njn

Browse Source 
--HG--
extra : rebase_source : 7df0043060caf4cd14fc48428296428acf1771c7
This commit is contained in:
Mike Hommey 2017-09-15 19:11:52 +09:00
parent 2c4099f29f
commit 3576cd2578
1 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
memory/build/mozjemalloc.cpp
View File

@ -791,14 +791,16 @@ public:
void TrimRunTail(arena_chunk_t* aChunk, arena_run_t* aRun, size_t aOldSize, size_t aNewSize, bool dirty);
private:
inline void* MallocBinEasy(arena_bin_t* aBin, arena_run_t* aRun);
void* MallocBinHard(arena_bin_t* aBin);
private:
arena_run_t* GetNonFullBinRun(arena_bin_t* aBin);
public:
inline void* MallocSmall(size_t aSize, bool aZero);
void Purge(bool aAll);
void HardPurge();
@ -3225,61 +3227,62 @@ arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size)
return (good_run_size);
}
static inline void *
arena_malloc_small(arena_t *arena, size_t size, bool zero)
void*
arena_t::MallocSmall(size_t aSize, bool aZero)
{
void *ret;
arena_bin_t *bin;
arena_run_t *run;
void* ret;
arena_bin_t* bin;
arena_run_t* run;
if (size < small_min) {
/* Tiny. */
size = pow2_ceil(size);
bin = &arena->mBins[ffs((int)(size >> (TINY_MIN_2POW +
1)))];
/*
* Bin calculation is always correct, but we may need
* to fix size for the purposes of assertions and/or
* stats accuracy.
*/
if (size < (1U << TINY_MIN_2POW))
size = (1U << TINY_MIN_2POW);
} else if (size <= small_max) {
/* Quantum-spaced. */
size = QUANTUM_CEILING(size);
bin = &arena->mBins[ntbins + (size >> opt_quantum_2pow)
- 1];
} else {
/* Sub-page. */
size = pow2_ceil(size);
bin = &arena->mBins[ntbins + nqbins
+ (ffs((int)(size >> opt_small_max_2pow)) - 2)];
}
MOZ_DIAGNOSTIC_ASSERT(size == bin->reg_size);
if (aSize < small_min) {
/* Tiny. */
aSize = pow2_ceil(aSize);
bin = &mBins[ffs((int)(aSize >> (TINY_MIN_2POW + 1)))];
/*
* Bin calculation is always correct, but we may need
* to fix size for the purposes of assertions and/or
* stats accuracy.
*/
if (aSize < (1U << TINY_MIN_2POW)) {
aSize = 1U << TINY_MIN_2POW;
}
} else if (aSize <= small_max) {
/* Quantum-spaced. */
aSize = QUANTUM_CEILING(aSize);
bin = &mBins[ntbins + (aSize >> opt_quantum_2pow) - 1];
} else {
/* Sub-page. */
aSize = pow2_ceil(aSize);
bin = &mBins[ntbins + nqbins
+ (ffs((int)(aSize >> opt_small_max_2pow)) - 2)];
}
MOZ_DIAGNOSTIC_ASSERT(aSize == bin->reg_size);
malloc_spin_lock(&arena->mLock);
if ((run = bin->runcur) && run->nfree > 0)
ret = arena->MallocBinEasy(bin, run);
else
ret = arena->MallocBinHard(bin);
malloc_spin_lock(&mLock);
if ((run = bin->runcur) && run->nfree > 0) {
ret = MallocBinEasy(bin, run);
} else {
ret = MallocBinHard(bin);
}
if (!ret) {
malloc_spin_unlock(&arena->mLock);
return nullptr;
}
if (!ret) {
malloc_spin_unlock(&mLock);
return nullptr;
}
arena->mStats.allocated_small += size;
malloc_spin_unlock(&arena->mLock);
mStats.allocated_small += aSize;
malloc_spin_unlock(&mLock);
if (zero == false) {
if (opt_junk)
memset(ret, kAllocJunk, size);
else if (opt_zero)
memset(ret, 0, size);
} else
memset(ret, 0, size);
if (aZero == false) {
if (opt_junk) {
memset(ret, kAllocJunk, aSize);
} else if (opt_zero) {
memset(ret, 0, aSize);
}
} else
memset(ret, 0, aSize);
return (ret);
return ret;
}
static void *
@ -3318,7 +3321,7 @@ arena_malloc(arena_t *arena, size_t size, bool zero)
MOZ_ASSERT(QUANTUM_CEILING(size) <= arena_maxclass);
if (size <= bin_maxclass) {
return (arena_malloc_small(arena, size, zero));
return arena->MallocSmall(size, zero);
} else
return (arena_malloc_large(arena, size, zero));
}
@ -4890,13 +4893,13 @@ MozJemalloc::malloc_good_size(size_t aSize)
{
/*
* This duplicates the logic in imalloc(), arena_malloc() and
* arena_malloc_small().
* arena_t::MallocSmall().
*/
if (aSize < small_min) {
/* Small (tiny). */
aSize = pow2_ceil(aSize);
/*
* We omit the #ifdefs from arena_malloc_small() --
* We omit the #ifdefs from arena_t::MallocSmall() --
* it can be inaccurate with its size in some cases, but this
* function must be accurate.
*/