From 2af4f2d1be4bfa9016795c45871d7eb89485f1ba Mon Sep 17 00:00:00 2001
From: Pekka Pirinen <pekka@harlequin.com>
Date: Wed, 14 Mar 2001 20:05:29 +0000
Subject: [PATCH] You need a poolgen as well

Copied from Perforce
 Change: 21744
 ServerID: perforce.ravenbrook.com
---
 mps/src/poolawl.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mps/src/poolawl.c b/mps/src/poolawl.c
index a25b0b63865..cb8eb887618 100644
--- a/mps/src/poolawl.c
+++ b/mps/src/poolawl.c
@@ -1,6 +1,6 @@
 /* impl.c.poolawl: AUTOMATIC WEAK LINKED POOL CLASS
  *
- * $HopeName: MMsrc!poolawl.c(trunk.67) $
+ * $HopeName: MMsrc!poolawl.c(trunk.68) $
  * Copyright (C) 2001 Harlequin Limited.  All rights reserved.
  *
  *
@@ -44,7 +44,7 @@
 #include "chain.h"
 
 
-SRCID(poolawl, "$HopeName: MMsrc!poolawl.c(trunk.67) $");
+SRCID(poolawl, "$HopeName: MMsrc!poolawl.c(trunk.68) $");
 
 
 #define AWLSig  ((Sig)0x519b7a37)       /* SIGPooLAWL */
@@ -85,6 +85,7 @@ typedef struct AWLStruct {
   PoolStruct poolStruct;
   Shift alignShift;
   Chain chain;              /* dummy chain */
+  PoolGenStruct pgen;       /* generation representing the pool */
   Size size;                /* allocated size in bytes */
   Serial gen;               /* associated generation (for SegAlloc) */
   Count succAccesses;       /* number of successive single accesses */
@@ -513,6 +514,11 @@ static Res AWLInit(Pool pool, va_list arg)
   if (res != ResOK)
     return res;
   awl->chain = chain;
+  /* .gen: This must be the nursery in the chain, because it's the only */
+  /* generation.  awl->gen is just a hack for segment placement. */
+  res = PoolGenInit(&awl->pgen, chain, 0 /* .gen */, pool);
+  if (res != ResOK)
+    goto failGenInit;
 
   awl->alignShift = SizeLog2(pool->alignment);
   awl->gen = AWLGen;
@@ -525,6 +531,10 @@ static Res AWLInit(Pool pool, va_list arg)
   AVERT(AWL, awl);
   EVENT_PP(PoolInitAWL, pool, format);
   return ResOK;
+
+failGenInit:
+  ChainDestroy(chain);
+  return res;
 }
 
 
@@ -547,6 +557,7 @@ static void AWLFinish(Pool pool)
     SegFree(seg);
   }
   awl->sig = SigInvalid;
+  PoolGenFinish(&awl->pgen);
   ChainDestroy(awl->chain);
 }