mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Check that segment classes override sets of related methods.

Browse source 
Add missing finish functions amcSegFinish, mrgLinkSegFinish, mrgRefSegFinish, sncSegFinish.
Check all class constructor results.

Copied from Perforce
 Change: 193055
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2017-03-30 11:37:41 +01:00
parent ab554bc110
commit d02a8f277e
23 changed files with 115 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mps/code/arena.c
View file

@ -107,6 +107,7 @@ static void ArenaNoDestroy(Arena arena)
DEFINE_CLASS(Inst, ArenaClass, klass)
{
INHERIT_CLASS(klass, ArenaClass, InstClass);
AVERT(InstClass, klass);
}
@ -132,6 +133,7 @@ DEFINE_CLASS(Arena, AbstractArena, klass)
klass->pagesMarkAllocated = ArenaNoPagesMarkAllocated;
klass->chunkPageMapped = ArenaNoChunkPageMapped;
klass->sig = ArenaClassSig;
AVERT(ArenaClass, klass);
}

1
mps/code/arenacl.c
View file

@ -458,6 +458,7 @@ DEFINE_CLASS(Arena, ClientArena, klass)
klass->chunkInit = ClientChunkInit;
klass->chunkFinish = ClientChunkFinish;
klass->chunkPageMapped = ClientChunkPageMapped;
AVERT(ArenaClass, klass);
}

1
mps/code/arenavm.c
View file

@ -1219,6 +1219,7 @@ DEFINE_CLASS(Arena, VMArena, klass)
klass->compact = VMCompact;
klass->pagesMarkAllocated = VMPagesMarkAllocated;
klass->chunkPageMapped = VMChunkPageMapped;
AVERT(ArenaClass, klass);
}

4
mps/code/buffer.c
View file

@ -1026,6 +1026,7 @@ Bool BufferClassCheck(BufferClass klass)
DEFINE_CLASS(Inst, BufferClass, klass)
{
INHERIT_CLASS(klass, BufferClass, InstClass);
AVERT(InstClass, klass);
}
DEFINE_CLASS(Buffer, Buffer, klass)
@ -1043,6 +1044,7 @@ DEFINE_CLASS(Buffer, Buffer, klass)
klass->setRankSet = bufferNoSetRankSet;
klass->reassignSeg = bufferNoReassignSeg;
klass->sig = BufferClassSig;
AVERT(BufferClass, klass);
}
@ -1248,6 +1250,7 @@ DEFINE_CLASS(Buffer, SegBuf, klass)
klass->rankSet = segBufRankSet;
klass->setRankSet = segBufSetRankSet;
klass->reassignSeg = segBufReassignSeg;
AVERT(BufferClass, klass);
}
@ -1304,6 +1307,7 @@ DEFINE_CLASS(Buffer, RankBuf, klass)
INHERIT_CLASS(klass, RankBuf, SegBuf);
klass->varargs = rankBufVarargs;
klass->init = rankBufInit;
AVERT(BufferClass, klass);
}

3
mps/code/cbs.c
View file

@ -1151,18 +1151,21 @@ DEFINE_CLASS(Land, CBS, klass)
klass->findLast = cbsFindLast;
klass->findLargest = cbsFindLargest;
klass->findInZones = cbsFindInZones;
AVERT(LandClass, klass);
}
DEFINE_CLASS(Land, CBSFast, klass)
{
INHERIT_CLASS(klass, CBSFast, CBS);
klass->init = cbsInitFast;
AVERT(LandClass, klass);
}
DEFINE_CLASS(Land, CBSZoned, klass)
{
INHERIT_CLASS(klass, CBSZoned, CBSFast);
klass->init = cbsInitZoned;
AVERT(LandClass, klass);
}

1
mps/code/failover.c
View file

@ -286,6 +286,7 @@ DEFINE_CLASS(Land, Failover, klass)
klass->findLast = failoverFindLast;
klass->findLargest = failoverFindLargest;
klass->findInZones = failoverFindInZones;
AVERT(LandClass, klass);
}

1
mps/code/freelist.c
View file

@ -794,6 +794,7 @@ DEFINE_CLASS(Land, Freelist, klass)
klass->findLast = freelistFindLast;
klass->findLargest = freelistFindLargest;
klass->findInZones = freelistFindInZones;
AVERT(LandClass, klass);
}

2
mps/code/land.c
View file

@ -528,6 +528,7 @@ static Res LandAbsDescribe(Inst inst, mps_lib_FILE *stream, Count depth)
DEFINE_CLASS(Inst, LandClass, klass)
{
INHERIT_CLASS(klass, LandClass, InstClass);
AVERT(InstClass, klass);
}
DEFINE_CLASS(Land, Land, klass)
@ -547,6 +548,7 @@ DEFINE_CLASS(Land, Land, klass)
klass->findLargest = landNoFind;
klass->findInZones = landNoFindInZones;
klass->sig = LandClassSig;
AVERT(LandClass, klass);
}

7
mps/code/pool.c
View file

@ -66,13 +66,6 @@ Bool PoolClassCheck(PoolClass klass)
(klass->framePop == PoolNoFramePop));
CHECKL((klass->rampBegin == PoolNoRampBegin) ==
(klass->rampEnd == PoolNoRampEnd));
/* Check that pool classes that set attributes also override the
methods they imply. */
if (klass != &CLASS_STATIC(AbstractCollectPool)) {
/* FIXME: AttrGC iff segments are GCSeg with whiten, scan, fix,
reclaim methods. */
}
CHECKS(PoolClass, klass);
return TRUE;

5
mps/code/poolabs.c
View file

@ -146,6 +146,7 @@ void PoolAbsFinish(Inst inst)
DEFINE_CLASS(Inst, PoolClass, klass)
{
INHERIT_CLASS(klass, PoolClass, InstClass);
AVERT(InstClass, klass);
}
DEFINE_CLASS(Pool, AbstractPool, klass)
@ -171,24 +172,28 @@ DEFINE_CLASS(Pool, AbstractPool, klass)
klass->totalSize = PoolNoSize;
klass->freeSize = PoolNoSize;
klass->sig = PoolClassSig;
AVERT(PoolClass, klass);
}
DEFINE_CLASS(Pool, AbstractBufferPool, klass)
{
INHERIT_CLASS(klass, AbstractBufferPool, AbstractPool);
PoolClassMixInBuffer(klass);
AVERT(PoolClass, klass);
}
DEFINE_CLASS(Pool, AbstractSegBufPool, klass)
{
INHERIT_CLASS(klass, AbstractSegBufPool, AbstractBufferPool);
klass->bufferClass = SegBufClassGet;
AVERT(PoolClass, klass);
}
DEFINE_CLASS(Pool, AbstractCollectPool, klass)
{
INHERIT_CLASS(klass, AbstractCollectPool, AbstractSegBufPool);
PoolClassMixInCollect(klass);
AVERT(PoolClass, klass);
}

19
mps/code/poolamc.c
View file

@ -167,6 +167,20 @@ static Res AMCSegInit(Seg seg, Pool pool, Addr base, Size size, ArgList args)
}
/* amcSegFinish -- finish an AMC segment */
static void amcSegFinish(Inst inst)
{
Seg seg = MustBeA(Seg, inst);
amcSeg amcseg = MustBeA(amcSeg, seg);
amcseg->sig = SigInvalid;
/* finish the superclass fields last */
NextMethod(Inst, amcSeg, finish)(inst);
}
/* AMCSegSketch -- summarise the segment state for a human reader
*
* Write a short human-readable text representation of the segment
@ -339,6 +353,7 @@ DEFINE_CLASS(Seg, amcSeg, klass)
INHERIT_CLASS(klass, amcSeg, GCSeg);
SegClassMixInNoSplitMerge(klass); /* no support for this (yet) */
klass->instClassStruct.describe = AMCSegDescribe;
klass->instClassStruct.finish = amcSegFinish;
klass->size = sizeof(amcSegStruct);
klass->init = AMCSegInit;
klass->whiten = amcSegWhiten;
@ -347,6 +362,7 @@ DEFINE_CLASS(Seg, amcSeg, klass)
klass->fixEmergency = amcSegFixEmergency;
klass->reclaim = amcSegReclaim;
klass->walk = amcSegWalk;
AVERT(SegClass, klass);
}
@ -538,6 +554,7 @@ DEFINE_CLASS(Buffer, amcBuf, klass)
klass->instClassStruct.finish = AMCBufFinish;
klass->size = sizeof(amcBufStruct);
klass->init = AMCBufInit;
AVERT(BufferClass, klass);
}
@ -1999,6 +2016,7 @@ DEFINE_CLASS(Pool, AMCZPool, klass)
klass->bufferClass = amcBufClassGet;
klass->totalSize = AMCTotalSize;
klass->freeSize = AMCFreeSize;
AVERT(PoolClass, klass);
}
@ -2008,6 +2026,7 @@ DEFINE_CLASS(Pool, AMCPool, klass)
{
INHERIT_CLASS(klass, AMCPool, AMCZPool);
klass->init = AMCInit;
AVERT(PoolClass, klass);
}

1
mps/code/poolams.c
View file

@ -1793,6 +1793,7 @@ DEFINE_CLASS(Pool, AMSDebugPool, klass)
klass->size = sizeof(AMSDebugStruct);
klass->varargs = AMSDebugVarargs;
klass->debugMixin = AMSDebugMixin;
AVERT(PoolClass, klass);
}

2
mps/code/poolawl.c
View file

@ -302,6 +302,7 @@ DEFINE_CLASS(Seg, AWLSeg, klass)
klass->fixEmergency = awlSegFix;
klass->reclaim = awlSegReclaim;
klass->walk = awlSegWalk;
AVERT(SegClass, klass);
}
@ -1256,6 +1257,7 @@ DEFINE_CLASS(Pool, AWLPool, klass)
klass->bufferEmpty = AWLBufferEmpty;
klass->totalSize = AWLTotalSize;
klass->freeSize = AWLFreeSize;
AVERT(PoolClass, klass);
}

2
mps/code/poollo.c
View file

@ -83,6 +83,7 @@ DEFINE_CLASS(Seg, LOSeg, klass)
klass->fixEmergency = loSegFix;
klass->reclaim = loSegReclaim;
klass->walk = loSegWalk;
AVERT(SegClass, klass);
}
@ -792,6 +793,7 @@ DEFINE_CLASS(Pool, LOPool, klass)
klass->bufferEmpty = LOBufferEmpty;
klass->totalSize = LOTotalSize;
klass->freeSize = LOFreeSize;
AVERT(PoolClass, klass);
}

1
mps/code/poolmfs.c
View file

@ -349,6 +349,7 @@ DEFINE_CLASS(Pool, MFSPool, klass)
klass->free = MFSFree;
klass->totalSize = MFSTotalSize;
klass->freeSize = MFSFreeSize;
AVERT(PoolClass, klass);
}

34
mps/code/poolmrg.c
View file

@ -234,6 +234,20 @@ static Res MRGLinkSegInit(Seg seg, Pool pool, Addr base, Size size,
}
/* MRGLinkSegFinish -- finish a link segment */
static void mrgLinkSegFinish(Inst inst)
{
Seg seg = MustBeA(Seg, inst);
MRGLinkSeg linkseg = MustBeA(MRGLinkSeg, seg);
linkseg->sig = SigInvalid;
/* finish the superclass fields last */
NextMethod(Inst, MRGLinkSeg, finish)(inst);
}
/* MRGRefSegInit -- initialise a ref segment */
ARG_DEFINE_KEY(mrg_seg_link_seg, Pointer);
@ -282,14 +296,30 @@ static Res MRGRefSegInit(Seg seg, Pool pool, Addr base, Size size, ArgList args)
}
/* MRGRefSegFinish -- finish a ref segment */
static void mrgRefSegFinish(Inst inst)
{
Seg seg = MustBeA(Seg, inst);
MRGRefSeg refseg = MustBeA(MRGRefSeg, seg);
refseg->sig = SigInvalid;
/* finish the superclass fields last */
NextMethod(Inst, MRGRefSeg, finish)(inst);
}
/* MRGLinkSegClass -- Class definition */
DEFINE_CLASS(Seg, MRGLinkSeg, klass)
{
INHERIT_CLASS(klass, MRGLinkSeg, Seg);
SegClassMixInNoSplitMerge(klass); /* no support for this */
klass->instClassStruct.finish = mrgLinkSegFinish;
klass->size = sizeof(MRGLinkSegStruct);
klass->init = MRGLinkSegInit;
AVERT(SegClass, klass);
}
@ -299,9 +329,11 @@ DEFINE_CLASS(Seg, MRGRefSeg, klass)
{
INHERIT_CLASS(klass, MRGRefSeg, GCSeg);
SegClassMixInNoSplitMerge(klass); /* no support for this */
klass->instClassStruct.finish = mrgRefSegFinish;
klass->size = sizeof(MRGRefSegStruct);
klass->init = MRGRefSegInit;
klass->scan = mrgRefSegScan;
AVERT(SegClass, klass);
}
@ -472,7 +504,6 @@ static void MRGSegPairDestroy(MRGRefSeg refseg)
{
RingRemove(&refseg->mrgRing);
RingFinish(&refseg->mrgRing);
refseg->sig = SigInvalid;
SegFree(MustBeA(Seg, refseg->linkSeg));
SegFree(MustBeA(Seg, refseg));
}
@ -834,6 +865,7 @@ DEFINE_CLASS(Pool, MRGPool, klass)
klass->instClassStruct.finish = MRGFinish;
klass->size = sizeof(MRGStruct);
klass->init = MRGInit;
AVERT(PoolClass, klass);
}

2
mps/code/poolmv.c
View file

@ -873,6 +873,7 @@ DEFINE_CLASS(Pool, MVPool, klass)
klass->free = MVFree;
klass->totalSize = MVTotalSize;
klass->freeSize = MVFreeSize;
AVERT(PoolClass, klass);
}
@ -891,6 +892,7 @@ DEFINE_CLASS(Pool, MVDebugPool, klass)
klass->size = sizeof(MVDebugStruct);
klass->varargs = MVDebugVarargs;
klass->debugMixin = MVDebugMixin;
AVERT(PoolClass, klass);
}

1
mps/code/poolmv2.c
View file

@ -149,6 +149,7 @@ DEFINE_CLASS(Pool, MVTPool, klass)
klass->bufferEmpty = MVTBufferEmpty;
klass->totalSize = MVTTotalSize;
klass->freeSize = MVTFreeSize;
AVERT(PoolClass, klass);
}
/* Macros */

2
mps/code/poolmvff.c
View file

@ -741,6 +741,7 @@ DEFINE_CLASS(Pool, MVFFPool, klass)
klass->bufferEmpty = MVFFBufferEmpty;
klass->totalSize = MVFFTotalSize;
klass->freeSize = MVFFFreeSize;
AVERT(PoolClass, klass);
}
@ -759,6 +760,7 @@ DEFINE_CLASS(Pool, MVFFDebugPool, klass)
klass->size = sizeof(MVFFDebugStruct);
klass->varargs = MVFFDebugVarargs;
klass->debugMixin = MVFFDebugMixin;
AVERT(PoolClass, klass);
}

18
mps/code/poolsnc.c
View file

@ -163,6 +163,7 @@ DEFINE_CLASS(Buffer, SNCBuf, klass)
klass->instClassStruct.finish = SNCBufFinish;
klass->size = sizeof(SNCBufStruct);
klass->init = SNCBufInit;
AVERT(BufferClass, klass);
}
@ -227,16 +228,32 @@ static Res sncSegInit(Seg seg, Pool pool, Addr base, Size size, ArgList args)
}
/* sncSegFinish -- finish an SNC segment */
static void sncSegFinish(Inst inst)
{
Seg seg = MustBeA(Seg, inst);
SNCSeg sncseg = MustBeA(SNCSeg, seg);
sncseg->sig = SigInvalid;
/* finish the superclass fields last */
NextMethod(Inst, SNCSeg, finish)(inst);
}
/* SNCSegClass -- Class definition for SNC segments */
DEFINE_CLASS(Seg, SNCSeg, klass)
{
INHERIT_CLASS(klass, SNCSeg, GCSeg);
SegClassMixInNoSplitMerge(klass); /* no support for this (yet) */
klass->instClassStruct.finish = sncSegFinish;
klass->size = sizeof(SNCSegStruct);
klass->init = sncSegInit;
klass->scan = sncSegScan;
klass->walk = sncSegWalk;
AVERT(SegClass, klass);
}
@ -680,6 +697,7 @@ DEFINE_CLASS(Pool, SNCPool, klass)
klass->bufferClass = SNCBufClassGet;
klass->totalSize = SNCTotalSize;
klass->freeSize = SNCFreeSize;
AVERT(PoolClass, klass);
}

2
mps/code/protocol.c
View file

@ -22,6 +22,7 @@ DEFINE_CLASS(Inst, Inst, klass)
{
InstClassInitInternal(klass);
klass->instStruct.klass = CLASS(InstClass);
AVERT(InstClass, klass);
}
DEFINE_CLASS(Inst, InstClass, klass)
@ -34,6 +35,7 @@ DEFINE_CLASS(Inst, InstClass, klass)
klass->name = "InstClass";
klass->level = ClassLevelInstClass;
klass->display[ClassLevelInstClass] = CLASS_ID(InstClass);
AVERT(InstClass, klass);
}
static void InstClassInitInternal(InstClass klass)

11
mps/code/seg.c
View file

@ -1991,6 +1991,16 @@ Bool SegClassCheck(SegClass klass)
CHECKL(FUNCHECK(klass->fixEmergency));
CHECKL(FUNCHECK(klass->reclaim));
CHECKL(FUNCHECK(klass->walk));
/* Check that segment classes override sets of related methods. */
AVER((klass->init == SegAbsInit)
== (klass->instClassStruct.finish == SegAbsFinish));
AVER((klass->init == gcSegInit)
== (klass->instClassStruct.finish == gcSegFinish));
AVER((klass->merge == segTrivMerge) == (klass->split == segTrivSplit));
AVER((klass->fix == segNoFix) == (klass->fixEmergency == segNoFix));
AVER((klass->fix == segNoFix) == (klass->reclaim == segNoReclaim));
CHECKS(SegClass, klass);
return TRUE;
}
@ -2001,6 +2011,7 @@ Bool SegClassCheck(SegClass klass)
DEFINE_CLASS(Inst, SegClass, klass)
{
INHERIT_CLASS(klass, SegClass, InstClass);
AVERT(InstClass, klass);
}
DEFINE_CLASS(Seg, Seg, klass)

1
mps/code/segsmss.c
View file

@ -655,6 +655,7 @@ DEFINE_CLASS(Pool, AMSTPool, klass)
klass->size = sizeof(AMSTStruct);
klass->init = AMSTInit;
klass->bufferFill = AMSTBufferFill;
AVERT(PoolClass, klass);
}