From 68c6012d097707641fd74c8b8dfd7f628b42f7d2 Mon Sep 17 00:00:00 2001
From: ChenHengming <ChenHengming@6e48237b-75ef-9749-8fc9-41990f28c85a>
Date: Thu, 6 Aug 2015 02:56:20 +0000
Subject: [PATCH] [rk_malloc]: add mem_list feature to rk_malloc module

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@41 6e48237b-75ef-9749-8fc9-41990f28c85a
---
 osal/rk_malloc.cpp         | 41 ++++++++++++++++++++++++++++++++++++--
 osal/test/rk_malloc_test.c |  2 ++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/osal/rk_malloc.cpp b/osal/rk_malloc.cpp
index 7a951b91..d604c562 100644
--- a/osal/rk_malloc.cpp
+++ b/osal/rk_malloc.cpp
@@ -42,12 +42,16 @@ struct mem_node {
     struct list_head list;
     void *ptr;
     size_t size;
+
+    /* memory node extra information */
+    char tag[32];
 };
 
 static void get_osal_mem_flag()
 {
     if (osal_mem_flag < 0) {
         RK_U32 val;
+        osal_mem_flag = 0;
         rk_get_env_u32(CONFIG_OSAL_MEM_LIST, &val, 0);
         if (val) {
             osal_mem_flag |= OSAL_MEM_LIST_EN;
@@ -64,15 +68,48 @@ void *rk_mpp_malloc(char *tag, size_t size)
 {
     void *ptr;
     get_osal_mem_flag();
-    if (0 == os_malloc(&ptr, RK_OSAL_MEM_ALIGN, size))
+
+    if (0 == os_malloc(&ptr, RK_OSAL_MEM_ALIGN, size)) {
+        if (osal_mem_flag & OSAL_MEM_LIST_EN) {
+            struct mem_node *node = new struct mem_node;
+            INIT_LIST_HEAD(&node->list);
+            list_add_tail(&node->list, &mem_list);
+            node->ptr   = ptr;
+            node->size  = size;
+            strncpy(node->tag, tag, sizeof(node->tag));
+        }
+
         return ptr;
-    else
+    } else
         return NULL;
 }
 
 void rk_mpp_free(void *ptr)
 {
+    if (NULL == ptr)
+        return;
+
     get_osal_mem_flag();
+
+    if (osal_mem_flag & OSAL_MEM_LIST_EN) {
+        struct mem_node *pos, *n;
+        list_for_each_entry_safe(pos, n, &mem_list, struct mem_node, list) {
+            if (ptr == pos->ptr) {
+                list_del_init(&pos->list);
+                free(pos);
+                break;
+            }
+        }
+    }
+
     os_free(ptr);
 }
 
+/*
+ * dump memory status
+ * this function need MODULE_TAG statistic information
+ */
+void rk_mpp_show_mem_status()
+{
+}
+
diff --git a/osal/test/rk_malloc_test.c b/osal/test/rk_malloc_test.c
index 44f8600c..aa8cc3c4 100644
--- a/osal/test/rk_malloc_test.c
+++ b/osal/test/rk_malloc_test.c
@@ -16,10 +16,12 @@
 
 #define MODULE_TAG "rk_malloc_test"
 #include "rk_log.h"
+#include "rk_env.h"
 #include "rk_malloc.h"
 
 int main()
 {
+    rk_set_env_u32("osal_mem_list", 1);
     void *tmp = rk_malloc(int, 100);
     if (tmp) {
         rk_log("malloc success\n");