1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00

No need for poolclassmixinscan and abstractscanpool.

Copied from Perforce
 Change: 193045
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2017-03-30 10:23:15 +01:00
parent b295670a76
commit dd1b5b2f27
4 changed files with 5 additions and 25 deletions

View file

@ -259,16 +259,14 @@ extern Size PoolNoSize(Pool pool);
/* Abstract Pool Classes Interface -- see <code/poolabs.c> */
extern void PoolClassMixInBuffer(PoolClass klass);
extern void PoolClassMixInScan(PoolClass klass);
extern void PoolClassMixInCollect(PoolClass klass);
DECLARE_CLASS(Inst, PoolClass, InstClass);
DECLARE_CLASS(Pool, AbstractPool, Inst);
DECLARE_CLASS(Pool, AbstractBufferPool, AbstractPool);
DECLARE_CLASS(Pool, AbstractSegBufPool, AbstractBufferPool);
DECLARE_CLASS(Pool, AbstractScanPool, AbstractSegBufPool);
typedef Pool AbstractCollectPool;
#define AbstractCollectPoolCheck PoolCheck
DECLARE_CLASS(Pool, AbstractCollectPool, AbstractScanPool);
DECLARE_CLASS(Pool, AbstractCollectPool, AbstractSegBufPool);
/* Message Interface -- see <design/message/> */

View file

@ -20,8 +20,7 @@
* AbstractPoolClass - implements init, finish, describe
* AbstractBufferPoolClass - implements the buffer protocol
* AbstractSegBufPoolClass - uses SegBuf buffer class
* AbstractScanPoolClass - implements basic scanning
* AbstractCollectPoolClass - implements basic GC
* AbstractCollectPoolClass - implements basic GC
*/
#include "mpm.h"
@ -54,16 +53,6 @@ void PoolClassMixInBuffer(PoolClass klass)
}
/* PoolClassMixInScan -- mix in the protocol for scanning */
void PoolClassMixInScan(PoolClass klass)
{
/* Can't check klass because it's not initialized yet */
/* FIXME: check that segment class has access != NoAcess */
UNUSED(klass);
}
/* PoolClassMixInCollect -- mix in the protocol for GC */
void PoolClassMixInCollect(PoolClass klass)
@ -196,15 +185,9 @@ DEFINE_CLASS(Pool, AbstractSegBufPool, klass)
klass->bufferClass = SegBufClassGet;
}
DEFINE_CLASS(Pool, AbstractScanPool, klass)
{
INHERIT_CLASS(klass, AbstractScanPool, AbstractSegBufPool);
PoolClassMixInScan(klass);
}
DEFINE_CLASS(Pool, AbstractCollectPool, klass)
{
INHERIT_CLASS(klass, AbstractCollectPool, AbstractScanPool);
INHERIT_CLASS(klass, AbstractCollectPool, AbstractSegBufPool);
PoolClassMixInCollect(klass);
}

View file

@ -2007,7 +2007,6 @@ DEFINE_CLASS(Pool, AMCZPool, klass)
DEFINE_CLASS(Pool, AMCPool, klass)
{
INHERIT_CLASS(klass, AMCPool, AMCZPool);
PoolClassMixInScan(klass);
klass->init = AMCInit;
}

View file

@ -45,7 +45,7 @@ typedef struct SNCStruct {
typedef SNC SNCPool;
#define SNCPoolCheck SNCCheck
DECLARE_CLASS(Pool, SNCPool, AbstractScanPool);
DECLARE_CLASS(Pool, SNCPool, AbstractSegBufPool);
DECLARE_CLASS(Seg, SNCSeg, GCSeg);
DECLARE_CLASS(Buffer, SNCBuf, RankBuf);
@ -668,7 +668,7 @@ static Size SNCFreeSize(Pool pool)
DEFINE_CLASS(Pool, SNCPool, klass)
{
INHERIT_CLASS(klass, SNCPool, AbstractScanPool);
INHERIT_CLASS(klass, SNCPool, AbstractSegBufPool);
klass->instClassStruct.finish = SNCFinish;
klass->size = sizeof(SNCStruct);
klass->varargs = SNCVarargs;