Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adding unzoned arena tests back, now that there is a method of asking for them.

Browse source 
Copied from Perforce
 Change: 184602
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 2014-02-28 13:46:36 +00:00
parent 53bdfaab23
commit fcd691aaa3
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mps/code/apss.c
View file

@ -199,12 +199,15 @@ int main(int argc, char *argv[])
testInArena(arena, &fenceOptions);
mps_arena_destroy(arena);
#if 0 /* FIXME: Restore when arena can take an option */
die(mps_arena_create(&arena, mps_arena_class_vmnz(), 2*testArenaSIZE),
"mps_arena_create");
MPS_ARGS_BEGIN(args) {
MPS_ARGS_ADD(args, MPS_KEY_ARENA_SIZE, 2 * testArenaSIZE);
MPS_ARGS_ADD(args, MPS_KEY_ARENA_ZONED, FALSE);
MPS_ARGS_DONE(args);
die(mps_arena_create_k(&arena, mps_arena_class_vm(), args),
"mps_arena_create");
} MPS_ARGS_END(args);
testInArena(arena, bothOptions);
mps_arena_destroy(arena);
#endif
die(mps_arena_create(&arena, mps_arena_class_cl(),
testArenaSIZE, malloc(testArenaSIZE)),

2
mps/code/arena.c
View file

@ -889,7 +889,7 @@ static Res arenaAllocFromCBS(Tract *tractReturn, ZoneSet zones, Bool high,
return ResOK;
failMark:
NOTREACHED; /* FIXME */
NOTREACHED; /* FIXME: error path */
{
Res insertRes = CBSInsert(&oldRange, ArenaZonedCBS(arena), &range);
AVER(insertRes == ResOK); /* We only just deleted it. */

12
mps/code/arenacv.c
View file

@ -335,7 +335,7 @@ static void testAllocAndIterate(Arena arena, Pool pool,
}
static void testPageTable(ArenaClass class, Size size, Addr addr)
static void testPageTable(ArenaClass class, Size size, Addr addr, Bool zoned)
{
Arena arena; Pool pool;
Size pageSize;
@ -344,6 +344,7 @@ static void testPageTable(ArenaClass class, Size size, Addr addr)
MPS_ARGS_BEGIN(args) {
MPS_ARGS_ADD(args, MPS_KEY_ARENA_SIZE, size);
MPS_ARGS_ADD(args, MPS_KEY_ARENA_CL_BASE, addr);
MPS_ARGS_ADD(args, MPS_KEY_ARENA_ZONED, zoned);
MPS_ARGS_DONE(args);
die(ArenaCreate(&arena, class, args), "ArenaCreate");
} MPS_ARGS_END(args);
@ -402,14 +403,13 @@ int main(int argc, char *argv[])
void *block;
testlib_unused(argc);
testPageTable((ArenaClass)mps_arena_class_vm(), TEST_ARENA_SIZE, 0);
#if 0 /* FIXME: Restore when arena can take an option */
testPageTable((ArenaClass)mps_arena_class_vmnz(), TEST_ARENA_SIZE, 0);
#endif
testPageTable((ArenaClass)mps_arena_class_vm(), TEST_ARENA_SIZE, 0, TRUE);
testPageTable((ArenaClass)mps_arena_class_vm(), TEST_ARENA_SIZE, 0, FALSE);
block = malloc(TEST_ARENA_SIZE);
cdie(block != NULL, "malloc");
testPageTable((ArenaClass)mps_arena_class_cl(), TEST_ARENA_SIZE, block);
testPageTable((ArenaClass)mps_arena_class_cl(), TEST_ARENA_SIZE, block, TRUE);
testPageTable((ArenaClass)mps_arena_class_cl(), TEST_ARENA_SIZE, block, FALSE);
testSize(TEST_ARENA_SIZE);