From aba45b93d527e53444d6b05d4c68bfc0ffdc6f46 Mon Sep 17 00:00:00 2001 From: Pekka Pirinen Date: Thu, 8 Mar 2001 20:02:06 +0000 Subject: [PATCH] Convert to chains Copied from Perforce Change: 21675 ServerID: perforce.ravenbrook.com --- mps/qa/function/27.c | 50 +++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/mps/qa/function/27.c b/mps/qa/function/27.c index 21c966c2c4e..62bf41a4166 100644 --- a/mps/qa/function/27.c +++ b/mps/qa/function/27.c @@ -1,6 +1,6 @@ /* TEST_HEADER - id = $HopeName: MMQA_test_function!27.c(trunk.3) $ + id = $HopeName: MMQA_test_function!27.c(trunk.4) $ summary = mutually referring objects should die language = c link = testlib.o newfmt.o @@ -9,9 +9,16 @@ END_HEADER #include "testlib.h" #include "mpscamc.h" +#include "mpsavm.h" #include "newfmt.h" +#define genCOUNT (3) + +static mps_gen_param_s testChain[genCOUNT] = { + { 6000, 0.90 }, { 8000, 0.65 }, { 16000, 0.50 } }; + + void *stackpointer; mps_ap_t ap; @@ -21,38 +28,36 @@ int nrefs; static void test(void) { - mps_space_t space; + mps_arena_t arena; mps_pool_t pool; mps_thr_t thread; mps_root_t root; mps_fmt_t format; + mps_chain_t chain; int h; mycell *p, *q, *r; - cdie(mps_space_create(&space), "create space"); + cdie(mps_arena_create(&arena, mps_arena_class_vm(), mmqaArenaSIZE), + "create arena"); - cdie(mps_thread_reg(&thread, space), "register thread"); + die(mps_thread_reg(&thread, arena), "register thread"); + die(mps_root_create_reg(&root, arena, MPS_RANK_AMBIG, 0, thread, + mps_stack_scan_ambig, stackpointer, 0), + "create root"); - cdie( - mps_root_create_reg(&root, space, MPS_RANK_AMBIG, 0, thread, - mps_stack_scan_ambig, stackpointer, 0), - "create root"); + die(mps_fmt_create_A(&format, arena, &fmtA), "create format"); + cdie(mps_chain_create(&chain, arena, genCOUNT, testChain), "chain_create"); - cdie( - mps_fmt_create_A(&format, space, &fmtA), - "create format"); - - cdie( - mps_pool_create(&pool, space, mps_class_amc(), format), - "create pool"); + cdie(mmqa_pool_create_chain(&pool, arena, mps_class_amc(), format, chain), + "create pool"); cdie(mps_ap_create(&ap, pool, MPS_RANK_EXACT), "create ap"); r = allocone(ap, 1000); - for (h=0; h<10000; h++) { + for (h = 0; h < 10000; h++) { if (h % 10 == 0) { report("iter", "%i", h); } @@ -68,19 +73,12 @@ static void test(void) mps_ap_destroy(ap); mps_pool_destroy(pool); - comment("Destroyed pool."); - + mps_chain_destroy(chain); mps_fmt_destroy(format); - comment("Destroyed format."); - mps_root_destroy(root); - comment("Destroyed root."); - mps_thread_dereg(thread); - comment("Deregistered thread."); - - mps_space_destroy(space); - comment("Destroyed space."); + mps_arena_destroy(arena); + comment("Destroyed arena."); }