mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-22 05:51:11 -07:00
Code Issues Projects Releases Wiki Activity

Improve formatting of poolgendescribe and tracedescribe.

Browse source 
Add ArenaDescribe calls to amcss and finalcv to get coverage of PoolGenDescribe, TraceDescribe, and MRGDescribe.

Copied from Perforce
 Change: 186010
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2014-05-11 21:13:55 +01:00
parent f55b7d4675
commit 8a84937edb
4 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mps/code/amcss.c
View file

@ -164,6 +164,9 @@ static void test(mps_arena_t arena, mps_class_t pool_class, size_t roots_count)
/* create an ap, and leave it busy */
die(mps_reserve(&busy_init, busy_ap, 64), "mps_reserve busy");
die(mps_arena_start_collect(arena), "mps_arena_start_collect");
die(ArenaDescribe(arena, mps_lib_get_stdout(), 0), "ArenaDescribe");
collections = 0;
rampSwitch = rampSIZE;
die(mps_ap_alloc_pattern_begin(ap, ramp), "pattern begin (ap)");
@ -275,9 +278,8 @@ static void test(mps_arena_t arena, mps_class_t pool_class, size_t roots_count)
++objs;
}
die(ArenaDescribe(arena, mps_lib_get_stdout(), 0), "PoolDescribe");
(void)mps_commit(busy_ap, busy_init, 64);
mps_arena_park(arena);
mps_ap_destroy(busy_ap);
mps_ap_destroy(ap);
mps_root_destroy(exactRoot);

13
mps/code/finalcv.c
View file

@ -18,14 +18,15 @@
* This code was created by first copying <code/weakcv.c>
*/
#include "testlib.h"
#include "mpslib.h"
#include "mps.h"
#include "mpscamc.h"
#include "mpsavm.h"
#include "fmtdy.h"
#include "fmtdytst.h"
#include "mpm.h"
#include "mps.h"
#include "mpsavm.h"
#include "mpscamc.h"
#include "mpslib.h"
#include "mpstd.h"
#include "testlib.h"
#include <stdio.h> /* printf */
@ -141,6 +142,8 @@ static void *test(void *arg, size_t s)
}
p = NULL;
die(ArenaDescribe(arena, mps_lib_get_stdout(), 0), "ArenaDescribe");
mps_message_type_enable(arena, mps_message_type_finalization());
/* <design/poolmrg/#test.promise.ut.churn> */

10
mps/code/locus.c
View file

@ -516,13 +516,13 @@ Res PoolGenDescribe(PoolGen pgen, mps_lib_FILE *stream, Count depth)
res = WriteF(stream, depth,
"PoolGen $P ($U) {\n", (WriteFP)pgen, (WriteFU)pgen->nr,
"pool $P ($U) \"$S\"\n",
" pool $P ($U) \"$S\"\n",
(WriteFP)pgen->pool, (WriteFU)pgen->pool->serial,
(WriteFS)pgen->pool->class->name,
"chain $P\n", (WriteFP)pgen->chain,
"totalSize $U\n", (WriteFU)pgen->totalSize,
"newSize $U\n", (WriteFU)pgen->newSize,
"newSizeAtCreate $U\n", (WriteFU)pgen->newSizeAtCreate,
" chain $P\n", (WriteFP)pgen->chain,
" totalSize $U\n", (WriteFU)pgen->totalSize,
" newSize $U\n", (WriteFU)pgen->newSize,
" newSizeAtCreate $U\n", (WriteFU)pgen->newSizeAtCreate,
"} PoolGen $P\n", (WriteFP)pgen,
NULL);
return res;

38
mps/code/trace.c
View file

@ -1943,28 +1943,26 @@ Res TraceDescribe(Trace trace, mps_lib_FILE *stream, Count depth)
res = WriteF(stream, depth,
"Trace $P ($U) {\n", (WriteFP)trace, (WriteFU)trace->ti,
"arena $P ($U)\n", (WriteFP)trace->arena,
" arena $P ($U)\n", (WriteFP)trace->arena,
(WriteFU)trace->arena->serial,
"why \"$S\"\n", (WriteFS)TraceStartWhyToString(trace->why),
"state $S\n", (WriteFS)state,
"band $U\n", (WriteFU)trace->band,
"white $B\n", (WriteFB)trace->white,
"mayMove $B\n", (WriteFB)trace->mayMove,
"chain $P\n", (WriteFP)trace->chain,
"condemned $U\n", (WriteFU)trace->condemned,
"notCondemned $U\n", (WriteFU)trace->notCondemned,
"foundation $U\n", (WriteFU)trace->foundation,
"rate $U\n", (WriteFU)trace->rate,
"rootScanSize $U\n", (WriteFU)trace->rootScanSize,
"rootCopiedSize $U\n", (WriteFU)trace->rootCopiedSize,
"segScanSize $U\n", (WriteFU)trace->segScanSize,
"segCopiedSize $U\n", (WriteFU)trace->segCopiedSize,
"forwardedSize $U\n", (WriteFU)trace->forwardedSize,
"preservedInPlaceSize $U\n", (WriteFU)trace->preservedInPlaceSize,
" why \"$S\"\n", (WriteFS)TraceStartWhyToString(trace->why),
" state $S\n", (WriteFS)state,
" band $U\n", (WriteFU)trace->band,
" white $B\n", (WriteFB)trace->white,
" mayMove $B\n", (WriteFB)trace->mayMove,
" chain $P\n", (WriteFP)trace->chain,
" condemned $U\n", (WriteFU)trace->condemned,
" notCondemned $U\n", (WriteFU)trace->notCondemned,
" foundation $U\n", (WriteFU)trace->foundation,
" rate $U\n", (WriteFU)trace->rate,
" rootScanSize $U\n", (WriteFU)trace->rootScanSize,
" rootCopiedSize $U\n", (WriteFU)trace->rootCopiedSize,
" segScanSize $U\n", (WriteFU)trace->segScanSize,
" segCopiedSize $U\n", (WriteFU)trace->segCopiedSize,
" forwardedSize $U\n", (WriteFU)trace->forwardedSize,
" preservedInPlaceSize $U\n", (WriteFU)trace->preservedInPlaceSize,
"} Trace $P\n", (WriteFP)trace,
NULL);
if (res != ResOK) return res;
res = WriteF(stream, depth, "} Trace $P\n", (WriteFP)trace, NULL);
return res;
}