mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-21 13:31:37 -07:00
Code Issues Projects Releases Wiki Activity

Handle partial allocation failure by marking allocated pages spare and purging, as suggested by rb in review.

Browse source 
Copied from Perforce
 Change: 195997
This commit is contained in:
Gareth Rees 2019-02-07 13:48:00 +00:00 • committed by Gareth Rees
parent 71b05de30f
commit 6a965b5ff0
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mps/code/arenavm.c
View file

@ -88,6 +88,7 @@ typedef struct VMArenaStruct { /* VM arena structure */
/* Forward declarations */
static void VMFree(Addr base, Size size, Pool pool);
static Size VMPurgeSpare(Arena arena, Size size);
static Size vmArenaUnmapSpare(Arena arena, Size size, Chunk filter);
DECLARE_CLASS(Arena, VMArena, AbstractArena);
@ -984,15 +985,11 @@ static Res pagesMarkAllocated(VMArena vmArena, VMChunk vmChunk,
failVMMap:
pageDescUnmap(vmChunk, j, k);
failSAMap:
/* region from basePI to j needs deallocating */
/* TODO: Consider making pages spare instead, then purging. */
/* Region from basePI to j was allocated but can't be used */
if (basePI < j) {
vmArenaUnmap(vmArena, VMChunkVM(vmChunk),
PageIndexBase(chunk, basePI),
PageIndexBase(chunk, j));
for (i = basePI; i < j; ++i)
PageFree(chunk, i);
pageDescUnmap(vmChunk, basePI, j);
VMFree(PageIndexBase(chunk, basePI),
ChunkPagesToSize(chunk, j - basePI),
pool);
}
return res;
}