Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mm/mempool: optimize alloc/free performance

Browse Source 
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
This commit is contained in:
dongjiuzhu1
2022-09-09 16:01:49 +08:00
committed by Xiang Xiao
parent 8994c8efa2
commit 4e179e8a85
2 changed files with 54 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/mempool/mempool.c
+30 -41
View File
@@ -88,12 +88,10 @@ static inline void mempool_mfree(FAR struct mempool_s *pool, FAR void *addr)
int mempool_init(FAR struct mempool_s *pool, FAR const char *name)
{
FAR sq_entry_t *base;
size_t count;
if (pool == NULL || pool->bsize == 0)
{
return -EINVAL;
}
DEBUGASSERT(pool != NULL && pool->bsize != 0);
pool->nused = 0;
sq_init(&pool->list);
@@ -101,25 +99,20 @@ int mempool_init(FAR struct mempool_s *pool, FAR const char *name)
sq_init(&pool->elist);
count = pool->ninitial + pool->ninterrupt;
if (count != 0)
base = mempool_malloc(pool, sizeof(*base) +
pool->bsize * count);
if (base == NULL)
{
FAR sq_entry_t *base;
base = mempool_malloc(pool, sizeof(*base) +
pool->bsize * count);
if (base == NULL)
{
return -ENOMEM;
}
sq_addfirst(base, &pool->elist);
mempool_add_list(&pool->ilist, base + 1,
pool->ninterrupt, pool->bsize);
mempool_add_list(&pool->list, (FAR char *)(base + 1) +
pool->ninterrupt * pool->bsize,
pool->ninitial, pool->bsize);
return -ENOMEM;
}
sq_addfirst(base, &pool->elist);
mempool_add_list(&pool->ilist, base + 1,
pool->ninterrupt, pool->bsize);
mempool_add_list(&pool->list, (FAR char *)(base + 1) +
pool->ninterrupt * pool->bsize,
pool->ninitial, pool->bsize);
if (pool->wait && pool->nexpand == 0)
{
nxsem_init(&pool->waitsem, 0, 0);
@@ -154,10 +147,7 @@ FAR void *mempool_alloc(FAR struct mempool_s *pool)
FAR sq_entry_t *blk;
irqstate_t flags;
if (pool == NULL)
{
return NULL;
}
DEBUGASSERT(pool != NULL);
retry:
flags = spin_lock_irqsave(&pool->lock);
@@ -223,19 +213,24 @@ out_with_lock:
void mempool_free(FAR struct mempool_s *pool, FAR void *blk)
{
irqstate_t flags;
FAR char *base;
if (blk == NULL || pool == NULL)
{
return;
}
DEBUGASSERT(pool != NULL && blk != NULL);
flags = spin_lock_irqsave(&pool->lock);
base = (FAR char *)(sq_peek(&pool->elist) + 1);
if (pool->ninterrupt && (FAR char *)blk >= base &&
(FAR char *)blk < base + pool->ninterrupt * pool->bsize)
if (pool->ninterrupt)
{
sq_addfirst(blk, &pool->ilist);
FAR char *base;
base = (FAR char *)(sq_peek(&pool->elist) + 1);
if ((FAR char *)blk >= base &&
(FAR char *)blk < base + pool->ninterrupt * pool->bsize)
{
sq_addfirst(blk, &pool->ilist);
}
else
{
sq_addfirst(blk, &pool->list);
}
}
else
{
@@ -274,10 +269,7 @@ int mempool_info(FAR struct mempool_s *pool, FAR struct mempoolinfo_s *info)
{
irqstate_t flags;
if (pool == NULL || info == NULL)
{
return -EINVAL;
}
DEBUGASSERT(pool != NULL && info != NULL);
flags = spin_lock_irqsave(&pool->lock);
info->ordblks = sq_count(&pool->list);
@@ -315,10 +307,7 @@ int mempool_deinit(FAR struct mempool_s *pool)
{
FAR sq_entry_t *blk;
if (pool == NULL)
{
return -EINVAL;
}
DEBUGASSERT(pool != NULL);
if (pool->nused != 0)
{