1 files changed, 22 insertions, 15 deletions

diff --git a/lib/mempool.c b/lib/mempool.c
index 8f300b81..c75f1f5b 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -37,16 +37,17 @@ const int lp_chunk_size = sizeof(struct lp_chunk);
 struct linpool {
   resource r;
   byte *ptr, *end;
-  pool *p;
   struct lp_chunk *first, *current;		/* Normal (reusable) chunks */
   struct lp_chunk *first_large;			/* Large chunks */
   uint chunk_size, threshold, total:31, use_pages:1, total_large;
 };
 
+_Thread_local linpool *tmp_linpool;
+
 static void lp_free(resource *);
 static void lp_dump(resource *);
 static resource *lp_lookup(resource *, unsigned long);
-static size_t lp_memsize(resource *r);
+static struct resmem lp_memsize(resource *r);
 
 static struct resclass lp_class = {
   "LinPool",
@@ -70,7 +71,6 @@ linpool
 *lp_new(pool *p, uint blk)
 {
   linpool *m = ralloc(p, &lp_class);
-  m->p = p;
   if (!blk)
   {
     m->use_pages = 1;
@@ -130,7 +130,7 @@ lp_alloc(linpool *m, uint size)
 	    {
 	      /* Need to allocate a new chunk */
 	      if (m->use_pages)
-		c = alloc_page(m->p);
+		c = alloc_page();
 	      else
 		c = xmalloc(sizeof(struct lp_chunk) + m->chunk_size);
 
@@ -271,7 +271,7 @@ lp_free(resource *r)
     {
       c = d->next;
       if (m->use_pages)
-	free_page(m->p, d);
+	free_page(d);
       else
 	xfree(d);
     }
@@ -302,21 +302,28 @@ lp_dump(resource *r)
 	m->total_large);
 }
 
-static size_t
+static struct resmem
 lp_memsize(resource *r)
 {
   linpool *m = (linpool *) r;
-  struct lp_chunk *c;
-  int cnt = 0;
+  struct resmem sz = {
+    .overhead = sizeof(struct linpool) + ALLOC_OVERHEAD,
+  };
 
-  for(c=m->first; c; c=c->next)
-    cnt++;
-  for(c=m->first_large; c; c=c->next)
-    cnt++;
+  for (struct lp_chunk *c = m->first_large; c; c = c->next)
+  {
+    sz.effective += c->size;
+    sz.overhead += lp_chunk_size + ALLOC_OVERHEAD;
+  }
+
+  uint regular = 0;
+  for (struct lp_chunk *c = m->first; c; c = c->next)
+    regular++;
+
+  sz.effective += m->chunk_size * regular;
+  sz.overhead += (lp_chunk_size + ALLOC_OVERHEAD) * regular;
 
-  return ALLOC_OVERHEAD + sizeof(struct linpool) +
-    cnt * (ALLOC_OVERHEAD + sizeof(struct lp_chunk)) +
-    m->total + m->total_large;
+  return sz;
 }