package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-06 01:26:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[osal]: add runtime log to mpp_mem

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1131 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-07-30 08:56:41 +00:00
parent 76af3c56e6
commit d101052f9b
2 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
osal/mpp_mem.cpp
View File

@@ -29,17 +29,14 @@
#include "os_mem.h" #include "os_mem.h"
// export configure for script detection // mpp_mem_flag bit mask
#define CONFIG_OSAL_MEM_LIST "osal_mem_list" #define OSAL_MEM_LIST_EN (0x00000001)
#define OSAL_MEM_RUNTIME_LOG (0x00000002)
// default memory align size is set to 32 // default memory align size is set to 32
#define RK_OSAL_MEM_ALIGN 32 #define RK_OSAL_MEM_ALIGN 32
// osal_mem_flag bit mask static RK_U32 mpp_mem_flag = 0;
#define OSAL_MEM_LIST_EN (0x00000001)
#define OSAL_MEM_STUFF_EN (0x00000002)
static RK_S32 osal_mem_flag = -1;
static RK_U64 osal_mem_index = 0; static RK_U64 osal_mem_index = 0;
static struct list_head mem_list; static struct list_head mem_list;
static pthread_mutex_t mem_list_lock; static pthread_mutex_t mem_list_lock;
@@ -56,14 +53,9 @@ struct mem_node {
static void get_osal_mem_flag() static void get_osal_mem_flag()
{ {
if (osal_mem_flag < 0) { static RK_U32 once = 1;
RK_U32 val; if (once) {
mpp_env_get_u32("mpp_mem_flag", &mpp_mem_flag, 0);
osal_mem_flag = 0;
mpp_env_get_u32(CONFIG_OSAL_MEM_LIST, &val, 0);
if (val) {
osal_mem_flag |= OSAL_MEM_LIST_EN;
}
INIT_LIST_HEAD(&mem_list); INIT_LIST_HEAD(&mem_list);
@@ -72,16 +64,22 @@ static void get_osal_mem_flag()
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&mem_list_lock, &attr); pthread_mutex_init(&mem_list_lock, &attr);
pthread_mutexattr_destroy(&attr); pthread_mutexattr_destroy(&attr);
once = 0;
} }
} }
void *mpp_osal_malloc(const char *tag, size_t size) void *mpp_osal_malloc(const char *tag, size_t size)
{ {
void *ptr; void *ptr;
get_osal_mem_flag(); get_osal_mem_flag();
if (MPP_OK == os_malloc(&ptr, RK_OSAL_MEM_ALIGN, size)) { os_malloc(&ptr, RK_OSAL_MEM_ALIGN, size);
if (osal_mem_flag & OSAL_MEM_LIST_EN) {
if (mpp_mem_flag & OSAL_MEM_RUNTIME_LOG)
mpp_log("mpp_malloc tag %-16s size %-8u ret %p\n", tag, size, ptr);
if ((mpp_mem_flag & OSAL_MEM_LIST_EN) && ptr) {
struct mem_node *node = (struct mem_node *)malloc(sizeof(struct mem_node)); struct mem_node *node = (struct mem_node *)malloc(sizeof(struct mem_node));
mpp_assert(node); mpp_assert(node);
INIT_LIST_HEAD(&node->list); INIT_LIST_HEAD(&node->list);
@@ -96,8 +94,6 @@ void *mpp_osal_malloc(const char *tag, size_t size)
} }
return ptr; return ptr;
} else
return NULL;
} }
void *mpp_osal_calloc(const char *tag, size_t size) void *mpp_osal_calloc(const char *tag, size_t size)
@@ -120,7 +116,7 @@ void *mpp_osal_realloc(const char *tag, void *ptr, size_t size)
get_osal_mem_flag(); get_osal_mem_flag();
if (osal_mem_flag & OSAL_MEM_LIST_EN) { if (mpp_mem_flag & OSAL_MEM_LIST_EN) {
struct mem_node *pos, *n; struct mem_node *pos, *n;
ret = NULL; ret = NULL;
@@ -143,8 +139,11 @@ void *mpp_osal_realloc(const char *tag, void *ptr, size_t size)
os_realloc(ptr, &ret, RK_OSAL_MEM_ALIGN, size); os_realloc(ptr, &ret, RK_OSAL_MEM_ALIGN, size);
} }
if (mpp_mem_flag & OSAL_MEM_RUNTIME_LOG)
mpp_log("mpp_realloc tag %-16s size %-8u ptr %p ret %p\n", tag, size, ptr, ret);
if (NULL == ret) if (NULL == ret)
mpp_err("mpp_realloc ptr 0x%p to size %d failed\n", ptr, size); mpp_err("mpp_realloc ptr %p to size %d failed\n", ptr, size);
return ret; return ret;
} }
@@ -156,7 +155,7 @@ void mpp_osal_free(void *ptr)
get_osal_mem_flag(); get_osal_mem_flag();
if (osal_mem_flag & OSAL_MEM_LIST_EN) { if (mpp_mem_flag & OSAL_MEM_LIST_EN) {
struct mem_node *pos, *n; struct mem_node *pos, *n;
RK_U32 found_match = 0; RK_U32 found_match = 0;
@@ -175,6 +174,9 @@ void mpp_osal_free(void *ptr)
mpp_err_f("can not found match on free %p\n", ptr); mpp_err_f("can not found match on free %p\n", ptr);
} }
if (mpp_mem_flag & OSAL_MEM_RUNTIME_LOG)
mpp_log("mpp_free %p\n", ptr);
os_free(ptr); os_free(ptr);
} }

2
osal/test/mpp_mem_test.c
View File

@@ -26,7 +26,7 @@ int main()
{ {
void *tmp = NULL; void *tmp = NULL;
mpp_env_set_u32("osal_mem_list", 1); mpp_env_set_u32("mpp_mem_flag", 0x3);
tmp = mpp_calloc(int, 100); tmp = mpp_calloc(int, 100);
if (tmp) { if (tmp) {
mpp_log("calloc success ptr 0x%p\n", tmp); mpp_log("calloc success ptr 0x%p\n", tmp);