[mpp_mem_pool]: Add debug flag

Change-Id: I562ccfe062546c9f4a20711fa1d3553ab100c7ce
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2021-09-24 10:15:42 +08:00
parent 31814aea59
commit 5598a015a7
2 changed files with 39 additions and 9 deletions

View File

@@ -27,11 +27,17 @@ typedef void* MppMemPool;
extern "C" { extern "C" {
#endif #endif
MppMemPool mpp_mem_pool_init(size_t size); #define mpp_mem_pool_init(size) mpp_mem_pool_init_f(__FUNCTION__, size)
void mpp_mem_pool_deinit(MppMemPool pool); #define mpp_mem_pool_deinit(pool) mpp_mem_pool_deinit_f(__FUNCTION__, pool);
void *mpp_mem_pool_get(MppMemPool pool); #define mpp_mem_pool_get(pool) mpp_mem_pool_get_f(__FUNCTION__, pool)
void mpp_mem_pool_put(MppMemPool pool, void *p); #define mpp_mem_pool_put(pool, p) mpp_mem_pool_put_f(__FUNCTION__, pool, p)
MppMemPool mpp_mem_pool_init_f(const char *caller, size_t size);
void mpp_mem_pool_deinit_f(const char *caller, MppMemPool pool);
void *mpp_mem_pool_get_f(const char *caller, MppMemPool pool);
void mpp_mem_pool_put_f(const char *caller, MppMemPool pool, void *p);
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@@ -19,12 +19,22 @@
#include <string.h> #include <string.h>
#include "mpp_err.h" #include "mpp_err.h"
#include "mpp_env.h"
#include "mpp_log.h" #include "mpp_log.h"
#include "mpp_mem.h" #include "mpp_mem.h"
#include "mpp_list.h" #include "mpp_list.h"
#include "mpp_mem_pool.h" #include "mpp_mem_pool.h"
#define MPP_MEM_POOL_DBG_FLOW (0x00000001)
#define mem_pool_dbg(flag, fmt, ...) _mpp_dbg(mpp_mem_pool_debug, flag, fmt, ## __VA_ARGS__)
#define mem_pool_dbg_f(flag, fmt, ...) _mpp_dbg_f(mpp_mem_pool_debug, flag, fmt, ## __VA_ARGS__)
#define mem_pool_dbg_flow(fmt, ...) mem_pool_dbg(MPP_MEM_POOL_DBG_FLOW, fmt, ## __VA_ARGS__)
RK_U32 mpp_mem_pool_debug = 0;
typedef struct MppMemPoolNode_t { typedef struct MppMemPoolNode_t {
void *check; void *check;
struct list_head list; struct list_head list;
@@ -69,6 +79,8 @@ private:
MppMemPoolService::MppMemPoolService() MppMemPoolService::MppMemPoolService()
{ {
INIT_LIST_HEAD(&mLink); INIT_LIST_HEAD(&mLink);
mpp_env_get_u32("mpp_mem_pool_debug", &mpp_mem_pool_debug, 0);
} }
MppMemPoolService::~MppMemPoolService() MppMemPoolService::~MppMemPoolService()
@@ -145,17 +157,23 @@ void MppMemPoolService::put_pool(MppMemPoolImpl *impl)
mpp_free(impl); mpp_free(impl);
} }
MppMemPool mpp_mem_pool_init(size_t size) MppMemPool mpp_mem_pool_init_f(const char *caller, size_t size)
{ {
mem_pool_dbg_flow("pool %d init from %s", size, caller);
return (MppMemPool)MppMemPoolService::getInstance()->get_pool(size); return (MppMemPool)MppMemPoolService::getInstance()->get_pool(size);
} }
void mpp_mem_pool_deinit(MppMemPool pool) void mpp_mem_pool_deinit_f(const char *caller, MppMemPool pool)
{ {
MppMemPoolService::getInstance()->put_pool((MppMemPoolImpl *)pool); MppMemPoolImpl *impl = (MppMemPoolImpl *)pool;
mem_pool_dbg_flow("pool %d deinit from %s", impl->size, caller);
MppMemPoolService::getInstance()->put_pool(impl);
} }
void *mpp_mem_pool_get(MppMemPool pool) void *mpp_mem_pool_get_f(const char *caller, MppMemPool pool)
{ {
MppMemPoolImpl *impl = (MppMemPoolImpl *)pool; MppMemPoolImpl *impl = (MppMemPoolImpl *)pool;
MppMemPoolNode *node = NULL; MppMemPoolNode *node = NULL;
@@ -163,6 +181,9 @@ void *mpp_mem_pool_get(MppMemPool pool)
pthread_mutex_lock(&impl->lock); pthread_mutex_lock(&impl->lock);
mem_pool_dbg_flow("pool %d get used:unused [%d:%d] from %s", impl->size,
impl->used_count, impl->unused_count, caller);
if (!list_empty(&impl->unused)) { if (!list_empty(&impl->unused)) {
node = list_first_entry(&impl->unused, MppMemPoolNode, list); node = list_first_entry(&impl->unused, MppMemPoolNode, list);
if (node) { if (node) {
@@ -196,7 +217,7 @@ DONE:
return ptr; return ptr;
} }
void mpp_mem_pool_put(MppMemPool pool, void *p) void mpp_mem_pool_put_f(const char *caller, MppMemPool pool, void *p)
{ {
MppMemPoolImpl *impl = (MppMemPoolImpl *)pool; MppMemPoolImpl *impl = (MppMemPoolImpl *)pool;
MppMemPoolNode *node = (MppMemPoolNode *)((RK_U8 *)p - sizeof(MppMemPoolNode)); MppMemPoolNode *node = (MppMemPoolNode *)((RK_U8 *)p - sizeof(MppMemPoolNode));
@@ -214,6 +235,9 @@ void mpp_mem_pool_put(MppMemPool pool, void *p)
pthread_mutex_lock(&impl->lock); pthread_mutex_lock(&impl->lock);
mem_pool_dbg_flow("pool %d put used:unused [%d:%d] from %s", impl->size,
impl->used_count, impl->unused_count, caller);
list_del_init(&node->list); list_del_init(&node->list);
list_add(&node->list, &impl->unused); list_add(&node->list, &impl->unused);
impl->used_count--; impl->used_count--;