Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Linpools may use pages instead of xmalloc

Browse source
This commit is contained in:
Maria Matejka 2021-09-03 19:48:38 +02:00
parent bea582cbb5
commit e5a8eec6d7
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/mempool.c
View file

@ -37,9 +37,10 @@ const int lp_chunk_size = sizeof(struct lp_chunk);
struct linpool { struct linpool {
resource r; resource r;
byte *ptr, *end; byte *ptr, *end;
pool *p;
struct lp_chunk *first, *current; /* Normal (reusable) chunks */ struct lp_chunk *first, *current; /* Normal (reusable) chunks */
struct lp_chunk *first_large; /* Large chunks */ struct lp_chunk *first_large; /* Large chunks */
uint chunk_size, threshold, total, total_large; uint chunk_size, threshold, total:31, use_pages:1, total_large;
}; };
static void lp_free(resource *); static void lp_free(resource *);
@ -69,6 +70,13 @@ linpool
*lp_new(pool *p, uint blk) *lp_new(pool *p, uint blk)
{ {
linpool *m = ralloc(p, &lp_class); linpool *m = ralloc(p, &lp_class);
m->p = p;
if (!blk)
{
m->use_pages = 1;
blk = page_size - lp_chunk_size;
}
m->chunk_size = blk; m->chunk_size = blk;
m->threshold = 3*blk/4; m->threshold = 3*blk/4;
return m; return m;
@ -121,7 +129,11 @@ lp_alloc(linpool *m, uint size)
else else
{ {
/* Need to allocate a new chunk */ /* Need to allocate a new chunk */
if (m->use_pages)
c = alloc_page(m->p);
else
c = xmalloc(sizeof(struct lp_chunk) + m->chunk_size); c = xmalloc(sizeof(struct lp_chunk) + m->chunk_size);
m->total += m->chunk_size; m->total += m->chunk_size;
c->next = NULL; c->next = NULL;
c->size = m->chunk_size; c->size = m->chunk_size;
@ -258,6 +270,9 @@ lp_free(resource *r)
for(d=m->first; d; d = c) for(d=m->first; d; d = c)
{ {
c = d->next; c = d->next;
if (m->use_pages)
free_page(m->p, d);
else
xfree(d); xfree(d);
} }
for(d=m->first_large; d; d = c) for(d=m->first_large; d; d = c)

2
lib/resource.h
View file

@ -76,7 +76,7 @@ void lp_restore(linpool *m, lp_state *p); /* Restore state */
extern const int lp_chunk_size; extern const int lp_chunk_size;
#define LP_GAS 1024 #define LP_GAS 1024
#define LP_GOOD_SIZE(x) (((x + LP_GAS - 1) & (~(LP_GAS - 1))) - lp_chunk_size) #define LP_GOOD_SIZE(x) (((x + LP_GAS - 1) & (~(LP_GAS - 1))) - lp_chunk_size)
#define lp_new_default(p) lp_new(p, LP_GOOD_SIZE(LP_GAS*4)) #define lp_new_default(p) lp_new(p, 0)
/* Slabs */ /* Slabs */