This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit e3584fed5defabd7f91e3e197b6b81243f460854 Author: Bowen Wang <[email protected]> AuthorDate: Mon Nov 16 14:16:39 2026 +0800 !mm/mempool: update the macro MEMPOOL_REALBLOCKSIZE pass blocksize to MEMPOOL_REALBLOCKSIZE instead pool BREAKING CHANGE: MEMPOOL_REALBLOCKSIZE() takes a block size instead of a pool pointer. Quick fix: replace MEMPOOL_REALBLOCKSIZE(pool) with MEMPOOL_REALBLOCKSIZE(pool->blocksize). Signed-off-by: Bowen Wang <[email protected]> --- include/nuttx/mm/mempool.h | 8 ++++---- mm/mempool/mempool.c | 20 ++++++++++---------- mm/mempool/mempool_multiple.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/nuttx/mm/mempool.h b/include/nuttx/mm/mempool.h index d9e3ee47776..071d14722a0 100644 --- a/include/nuttx/mm/mempool.h +++ b/include/nuttx/mm/mempool.h @@ -43,11 +43,11 @@ ****************************************************************************/ #if CONFIG_MM_BACKTRACE >= 0 -# define MEMPOOL_REALBLOCKSIZE(pool) (ALIGN_UP((pool)->blocksize + \ - sizeof(struct mempool_backtrace_s), \ - MM_ALIGN)) +# define MEMPOOL_REALBLOCKSIZE(s) (ALIGN_UP((s) + \ + sizeof(struct mempool_backtrace_s), \ + MM_ALIGN)) #else -# define MEMPOOL_REALBLOCKSIZE(pool) ((pool)->blocksize) +# define MEMPOOL_REALBLOCKSIZE(s) (s) #endif /**************************************************************************** diff --git a/mm/mempool/mempool.c b/mm/mempool/mempool.c index 28deecfbc71..c4c548a8651 100644 --- a/mm/mempool/mempool.c +++ b/mm/mempool/mempool.c @@ -134,7 +134,7 @@ static void mempool_foreach(FAR struct mempool_s *pool, mempool_callback_t callback, FAR const void *input, FAR void *output) { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); FAR struct mempool_backtrace_s *buf; FAR sq_entry_t *entry; FAR char *base ; @@ -171,7 +171,7 @@ static void mempool_info_task_callback(FAR struct mempool_s *pool, FAR const void *input, FAR void *output) { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); FAR const struct malltask *task = input; FAR struct mallinfo_task *info = output; @@ -192,7 +192,7 @@ static void mempool_memdump_callback(FAR struct mempool_s *pool, FAR struct mempool_backtrace_s *buf, FAR const void *input, FAR void *output) { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); size_t overhead = blocksize - pool->blocksize; FAR const struct mm_memdump_s *dump = input; @@ -232,7 +232,7 @@ mempool_memdump_free_callback(FAR struct mempool_s *pool, FAR struct mempool_backtrace_s *buf, FAR const void *input, FAR void *output) { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); size_t overhead = blocksize - pool->blocksize; if (buf->magic == MEMPOOL_MAGIC_FREE) @@ -266,7 +266,7 @@ mempool_memdump_free_callback(FAR struct mempool_s *pool, int mempool_init(FAR struct mempool_s *pool) { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); sq_init(&pool->queue); sq_init(&pool->iqueue); @@ -390,7 +390,7 @@ retry: } else { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); spin_unlock_irqrestore(&pool->lock, flags); if (pool->expandsize >= blocksize + MEMPOOL_HEADER_SIZE) @@ -569,7 +569,7 @@ size_t mempool_navail(FAR struct mempool_s *pool) int mempool_info(FAR struct mempool_s *pool, FAR struct mempoolinfo_s *info) { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); irqstate_t flags; DEBUGASSERT(pool != NULL && info != NULL); @@ -606,7 +606,7 @@ struct mallinfo_task mempool_info_task(FAR struct mempool_s *pool, FAR const struct malltask *task) { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); struct mallinfo_task info = { 0, 0 @@ -669,7 +669,7 @@ void mempool_memdump(FAR struct mempool_s *pool, mempool_foreach(pool, mempool_memdump_callback, dump, NULL); } #else - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); size_t overhead = blocksize - pool->blocksize; /* Avoid race condition */ @@ -691,7 +691,7 @@ void mempool_memdump(FAR struct mempool_s *pool, int mempool_deinit(FAR struct mempool_s *pool) { - size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool); + size_t blocksize = MEMPOOL_REALBLOCKSIZE(pool->blocksize); FAR sq_entry_t *blk; size_t count = 0; diff --git a/mm/mempool/mempool_multiple.c b/mm/mempool/mempool_multiple.c index b826d55a307..5605b33c759 100644 --- a/mm/mempool/mempool_multiple.c +++ b/mm/mempool/mempool_multiple.c @@ -643,7 +643,7 @@ int mempool_multiple_free(FAR struct mempool_multiple_s *mpool, blk = (FAR char *)blk - (((FAR char *)kasan_clear_tag(blk) - ((FAR char *)kasan_clear_tag(dict->addr) + mpool->minpoolsize)) % - MEMPOOL_REALBLOCKSIZE(dict->pool)); + MEMPOOL_REALBLOCKSIZE(dict->pool->blocksize)); mempool_release(dict->pool, blk); return 0; }
