mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 14:30:43 -08:00
Code Issues Projects Releases Wiki Activity

Incorporating early commit limit checking into arena allocation policy.

Browse source 
Copied from Perforce
 Change: 184240
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 2014-01-28 19:15:41 +00:00
parent 973575140f
commit d75cfe191c
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mps/code/arena.c
View file

@ -697,7 +697,7 @@ failMark:
* can be maintained and adjusted.
*/
static Res arenaAllocPolicy(Tract *tractReturn, SegPref pref,
static Res arenaAllocPolicy(Tract *tractReturn, Arena arena, SegPref pref,
Size size, Pool pool)
{
Res res;
@ -708,6 +708,16 @@ static Res arenaAllocPolicy(Tract *tractReturn, SegPref pref,
AVER(size > (Size)0);
AVERT(Pool, pool);
/* Don't attempt to allocate if doing so would definitely exceed the
commit limit. */
if (arena->spareCommitted < size) {
Size necessaryCommitIncrease = size - arena->spareCommitted;
if (arena->committed + necessaryCommitIncrease > arena->commitLimit
|| arena->committed + necessaryCommitIncrease < arena->committed) {
return ResCOMMIT_LIMIT;
}
}
/* Plan A: allocate from the free CBS in the requested zones */
/* FIXME: Takes no account of other zones fields */
res = arenaAllocFromCBS(&tract, pref->zones, size, pool);
@ -754,7 +764,7 @@ Res ArenaAlloc(Addr *baseReturn, SegPref pref, Size size, Pool pool,
}
}
res = arenaAllocPolicy(&tract, pref, size, pool);
res = arenaAllocPolicy(&tract, arena, pref, size, pool);
if (res != ResOK) {
if (withReservoirPermit) {
Res resRes = ReservoirWithdraw(&base, &tract, reservoir, size, pool);