Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

mempool:Add mail_info support for multiple pools

Browse Source 
Signed-off-by: anjiahao <anjiahao@xiaomi.com>
This commit is contained in:
anjiahao
2023-06-02 16:12:27 +08:00
committed by Xiang Xiao
parent 6572081e07
commit 7732791cd6
17 changed files with 147 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/kmm_heap/kmm_mallinfo.c
+1 -3
View File
@@ -45,9 +45,7 @@
struct mallinfo kmm_mallinfo(void)
{
struct mallinfo info;
mm_mallinfo(g_kmmheap, &info);
return info;
return mm_mallinfo(g_kmmheap);
}
/****************************************************************************
mm/mempool/mempool_multiple.c
+79 -20
View File
@@ -63,17 +63,21 @@ struct mpool_chunk_s
struct mempool_multiple_s
{
FAR struct mempool_s *pools; /* The memory pool array */
size_t npools; /* The number of memory pool array elements */
size_t expandsize; /* The number not will use it to init erery
* pool expandsize
*/
size_t minpoolsize; /* The number is align for each memory pool */
FAR void *arg; /* This pointer is used to store the user's
* private data
*/
mempool_multiple_alloc_t alloc; /* The alloc function for mempool */
mempool_multiple_free_t free; /* The free function for mempool */
FAR struct mempool_s *pools; /* The memory pool array */
size_t npools; /* The number of memory pool array elements */
size_t expandsize; /* The number not will use it to init erery
* pool expandsize
*/
size_t minpoolsize; /* The number is align for each memory pool */
FAR void *arg; /* This pointer is used to store the user's
* private data
*/
mempool_multiple_alloc_t alloc; /* The alloc function for mempool */
mempool_multiple_alloc_size_t alloc_size; /* Get the address size of the
* alloc function
*/
mempool_multiple_free_t free; /* The free function for mempool */
size_t alloced; /* Total size of alloc */
/* This delta describes the relationship between the block size of each
* mempool in multiple mempool by user initialized. It is automatically
@@ -82,19 +86,19 @@ struct mempool_multiple_s
* arithmetic progressions, otherwise it is an increasing progressions.
*/
size_t delta;
size_t delta;
/* It is used to record the information recorded by the mempool during
* expansion, and find the mempool by adding an index
*/
mutex_t lock;
sq_queue_t chunk_queue;
size_t chunk_size;
size_t dict_used;
size_t dict_col_num_log2;
size_t dict_row_num;
FAR struct mpool_dict_s **dict;
mutex_t lock;
sq_queue_t chunk_queue;
size_t chunk_size;
size_t dict_used;
size_t dict_col_num_log2;
size_t dict_row_num;
FAR struct mpool_dict_s **dict;
};
/****************************************************************************
@@ -157,7 +161,13 @@ mempool_multiple_alloc_chunk(FAR struct mempool_multiple_s *mpool,
if (mpool->chunk_size < mpool->expandsize)
{
return mpool->alloc(mpool->arg, align, size);
ret = mpool->alloc(mpool->arg, align, size);
if (ret)
{
mpool->alloced += mpool->alloc_size(mpool->arg, ret);
}
return ret;
}
chunk = (FAR struct mpool_chunk_s *)sq_peek(&mpool->chunk_queue);
@@ -173,6 +183,7 @@ retry:
return NULL;
}
mpool->alloced += mpool->alloc_size(mpool->arg, tmp);
chunk = (FAR struct mpool_chunk_s *)(tmp + mpool->chunk_size);
chunk->end = tmp + mpool->chunk_size;
chunk->start = tmp;
@@ -345,6 +356,7 @@ mempool_multiple_get_dict(FAR struct mempool_multiple_s *mpool,
* poolsize - The block size array for pools in multiples pool.
* npools - How many pools in multiples pool.
* alloc - The alloc memory function for multiples pool.
* alloc_size - Get the address size of the alloc function.
* free - The free memory function for multiples pool.
* arg - The alloc & free memory fuctions used arg.
* chunksize - The multiples pool chunk size.
@@ -360,6 +372,7 @@ FAR struct mempool_multiple_s *
mempool_multiple_init(FAR const char *name,
FAR size_t *poolsize, size_t npools,
mempool_multiple_alloc_t alloc,
mempool_multiple_alloc_size_t alloc_size,
mempool_multiple_free_t free, FAR void *arg,
size_t chunksize, size_t expandsize,
size_t dict_expendsize)
@@ -397,11 +410,13 @@ mempool_multiple_init(FAR const char *name,
return NULL;
}
mpool->alloc_size = alloc_size;
mpool->expandsize = expandsize;
mpool->chunk_size = chunksize;
mpool->alloc = alloc;
mpool->free = free;
mpool->arg = arg;
mpool->alloced = alloc_size(arg, mpool);
sq_init(&mpool->chunk_queue);
pools = mempool_multiple_alloc_chunk(mpool, sizeof(uintptr_t),
npools * sizeof(struct mempool_s));
@@ -703,6 +718,50 @@ void mempool_multiple_foreach(FAR struct mempool_multiple_s *mpool,
}
}
/****************************************************************************
* Name: mempool_multiple_mallinfo
****************************************************************************/
struct mallinfo
mempool_multiple_mallinfo(FAR struct mempool_multiple_s *mpool)
{
struct mallinfo info;
size_t i;
memset(&info, 0, sizeof(struct mallinfo));
nxmutex_lock(&mpool->lock);
info.arena = mpool->alloced;
if (mpool->chunk_size >= mpool->expandsize)
{
FAR struct mpool_chunk_s *chunk;
chunk = (FAR struct mpool_chunk_s *)sq_peek(&mpool->chunk_queue);
info.fordblks += chunk->end - chunk->next;
}
nxmutex_unlock(&mpool->lock);
for (i = 0; i < mpool->npools; i++)
{
struct mempoolinfo_s poolinfo;
mempool_info(mpool->pools + i, &poolinfo);
info.fordblks += (poolinfo.ordblks + poolinfo.iordblks)
* poolinfo.sizeblks;
info.ordblks += poolinfo.ordblks + poolinfo.iordblks;
info.aordblks += poolinfo.aordblks;
if (info.mxordblk < poolinfo.sizeblks)
{
info.mxordblk = poolinfo.sizeblks;
}
}
info.uordblks += mpool->alloced - info.fordblks;
return info;
}
/****************************************************************************
* Name: mempool_multiple_info_task
****************************************************************************/
mm/mm_heap/mm_initialize.c
+1
View File
@@ -288,6 +288,7 @@ FAR struct mm_heap_s *mm_initialize(FAR const char *name,
heap->mm_mpool = mempool_multiple_init(name, poolsize, MEMPOOL_NPOOLS,
(mempool_multiple_alloc_t)mempool_memalign,
(mempool_multiple_alloc_size_t)mm_malloc_size,
(mempool_multiple_free_t)mm_free, heap,
CONFIG_MM_HEAP_MEMPOOL_CHUNK_SIZE,
CONFIG_MM_HEAP_MEMPOOL_EXPAND_SIZE,
mm/mm_heap/mm_mallinfo.c
+16 -8
View File
@@ -136,20 +136,28 @@ static void mallinfo_task_handler(FAR struct mm_allocnode_s *node,
*
****************************************************************************/
int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info)
struct mallinfo mm_mallinfo(FAR struct mm_heap_s *heap)
{
struct mallinfo info;
#if CONFIG_MM_HEAP_MEMPOOL_THRESHOLD != 0
struct mallinfo poolinfo;
#endif
#if CONFIG_MM_REGIONS > 1
int region = heap->mm_nregions;
#else
# define region 1
#endif
DEBUGASSERT(info);
memset(&info, 0, sizeof(info));
mm_foreach(heap, mallinfo_handler, &info);
info.arena = heap->mm_heapsize;
memset(info, 0, sizeof(*info));
mm_foreach(heap, mallinfo_handler, info);
#if CONFIG_MM_HEAP_MEMPOOL_THRESHOLD != 0
poolinfo = mempool_multiple_mallinfo(heap->mm_mpool);
info->arena = heap->mm_heapsize;
info.uordblks -= poolinfo.fordblks;
info.fordblks += poolinfo.fordblks;
#endif
/* Account for the heap->mm_heapend[region] node overhead and the
* heap->mm_heapstart[region]->preceding:
@@ -158,11 +166,11 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info)
* and SIZEOF_MM_ALLOCNODE = OVERHEAD_MM_ALLOCNODE + sizeof(mmsize_t).
*/
info->uordblks += region * SIZEOF_MM_ALLOCNODE;
info.uordblks += region * SIZEOF_MM_ALLOCNODE;
DEBUGASSERT((size_t)info->uordblks + info->fordblks == heap->mm_heapsize);
DEBUGASSERT((size_t)info.uordblks + info.fordblks == heap->mm_heapsize);
return OK;
return info;
}
/****************************************************************************
mm/mm_heap/mm_malloc.c
+1 -1
View File
@@ -282,7 +282,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
mwarn("WARNING: Allocation failed, size %zu\n", alignsize);
#ifdef CONFIG_MM_DUMP_ON_FAILURE
mm_mallinfo(heap, &minfo);
minfo = mm_mallinfo(heap);
mwarn("Total:%d, used:%d, free:%d, largest:%d, nused:%d, nfree:%d\n",
minfo.arena, minfo.uordblks, minfo.fordblks,
minfo.mxordblk, minfo.aordblks, minfo.ordblks);
mm/tlsf/mm_tlsf.c
+18 -8
View File
@@ -845,6 +845,7 @@ FAR struct mm_heap_s *mm_initialize(FAR const char *name,
heap->mm_mpool = mempool_multiple_init(name, poolsize, MEMPOOL_NPOOLS,
(mempool_multiple_alloc_t)mempool_memalign,
(mempool_multiple_alloc_size_t)mm_malloc_size,
(mempool_multiple_free_t)mm_free, heap,
CONFIG_MM_HEAP_MEMPOOL_CHUNK_SIZE,
CONFIG_MM_HEAP_MEMPOOL_EXPAND_SIZE,
@@ -862,17 +863,19 @@ FAR struct mm_heap_s *mm_initialize(FAR const char *name,
*
****************************************************************************/
int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info)
struct mallinfo mm_mallinfo(FAR struct mm_heap_s *heap)
{
struct mallinfo info;
#if CONFIG_MM_HEAP_MEMPOOL_THRESHOLD != 0
struct mallinfo poolinfo;
#endif
#if CONFIG_MM_REGIONS > 1
int region;
#else
# define region 0
#endif
DEBUGASSERT(info);
memset(info, 0, sizeof(struct mallinfo));
memset(&info, 0, sizeof(struct mallinfo));
/* Visit each region */
@@ -884,15 +887,22 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info)
DEBUGVERIFY(mm_lock(heap));
tlsf_walk_pool(heap->mm_heapstart[region],
mallinfo_handler, info);
mallinfo_handler, &info);
mm_unlock(heap);
}
#undef region
info->arena = heap->mm_heapsize;
info->uordblks = info->arena - info->fordblks;
info.arena = heap->mm_heapsize;
info.uordblks = info.arena - info.fordblks;
return OK;
#if CONFIG_MM_HEAP_MEMPOOL_THRESHOLD != 0
poolinfo = mempool_multiple_mallinfo(heap->mm_mpool);
info.uordblks -= poolinfo.fordblks;
info.fordblks += poolinfo.fordblks;
#endif
return info;
}
struct mallinfo_task mm_mallinfo_task(FAR struct mm_heap_s *heap,
mm/umm_heap/umm_mallinfo.c
+1 -3
View File
@@ -45,9 +45,7 @@
struct mallinfo mallinfo(void)
{
struct mallinfo info;
mm_mallinfo(USR_HEAP, &info);
return info;
return mm_mallinfo(USR_HEAP);
}
/****************************************************************************