From 764d72e7c59f887d1288799633e9eff19f2e5ac4 Mon Sep 17 00:00:00 2001
From: ChenHengming <ChenHengming@6e48237b-75ef-9749-8fc9-41990f28c85a>
Date: Wed, 5 Aug 2015 10:04:45 +0000
Subject: [PATCH] [inc]: change LOG_TAG to MODULE_TAG for more general usage

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@38 6e48237b-75ef-9749-8fc9-41990f28c85a
---
 inc/rk_type.h              |  4 ++++
 osal/inc/rk_log.h          | 10 +++-------
 osal/inc/rk_malloc.h       |  5 +++--
 osal/rk_list.cpp           |  2 +-
 osal/rk_malloc.cpp         | 15 +++++++++++++--
 osal/test/rk_env_test.c    |  2 +-
 osal/test/rk_log_test.c    |  2 +-
 osal/test/rk_malloc_test.c |  2 +-
 osal/test/rk_thread_test.c |  2 +-
 9 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/inc/rk_type.h b/inc/rk_type.h
index b9e7bd01..3b961406 100644
--- a/inc/rk_type.h
+++ b/inc/rk_type.h
@@ -53,4 +53,8 @@ typedef signed long long int    RK_S64;
 
 #endif
 
+#ifndef MODULE_TAG
+#define MODULE_TAG              "rk_mpp"
+#endif
+
 #endif /*__RK_TYPE_H__*/
diff --git a/osal/inc/rk_log.h b/osal/inc/rk_log.h
index 4eabe433..476ee0d9 100644
--- a/osal/inc/rk_log.h
+++ b/osal/inc/rk_log.h
@@ -26,20 +26,16 @@
 extern "C" {
 #endif
 
-#ifndef LOG_TAG
-#define LOG_TAG                     "rk_log"
-#endif
-
 void rk_set_log_flag(RK_U32 flag);
 RK_U32 rk_get_log_flag();
 
-#define rk_log(fmt, ...) _rk_log(LOG_TAG, fmt, ## __VA_ARGS__)
-#define rk_err(fmt, ...) _rk_err(LOG_TAG, fmt, ## __VA_ARGS__)
+#define rk_log(fmt, ...) _rk_log(MODULE_TAG, fmt, ## __VA_ARGS__)
+#define rk_err(fmt, ...) _rk_err(MODULE_TAG, fmt, ## __VA_ARGS__)
 
 #define rk_dbg(debug, flag, fmt, ...)   \
     do {                                            \
         if (debug & flag) {                         \
-            _rk_log(LOG_TAG, fmt, ## __VA_ARGS__);  \
+            _rk_log(MODULE_TAG, fmt, ## __VA_ARGS__);  \
         }                                           \
     } while(0)
 
diff --git a/osal/inc/rk_malloc.h b/osal/inc/rk_malloc.h
index da6e8571..1986b5f7 100644
--- a/osal/inc/rk_malloc.h
+++ b/osal/inc/rk_malloc.h
@@ -18,8 +18,9 @@
 #define __RK_MALLOC_H__
 
 #include <stdlib.h>
+#include "rk_type.h"
 
-#define rk_malloc(type, count)      (type*)rk_mpp_malloc(sizeof(type) * (count))
+#define rk_malloc(type, count)      (type*)rk_mpp_malloc(MODULE_TAG, sizeof(type) * (count))
 #define rk_free(ptr)                rk_mpp_free(ptr)
 
 #ifdef __cplusplus
@@ -27,7 +28,7 @@ extern "C" {
 #endif
 
 void rk_mpp_show_mem_status();
-void *rk_mpp_malloc(size_t size);
+void *rk_mpp_malloc(char *tag, size_t size);
 void rk_mpp_free(void *ptr);
 
 #ifdef __cplusplus
diff --git a/osal/rk_list.cpp b/osal/rk_list.cpp
index 5896e784..0fca76f9 100644
--- a/osal/rk_list.cpp
+++ b/osal/rk_list.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "rk_list"
+#define MODULE_TAG "rk_list"
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/osal/rk_malloc.cpp b/osal/rk_malloc.cpp
index 67b250e7..7a951b91 100644
--- a/osal/rk_malloc.cpp
+++ b/osal/rk_malloc.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "rk_malloc"
+#define MODULE_TAG "rk_malloc"
 #include "rk_type.h"
 #include "rk_log.h"
 #include "rk_env.h"
 #include "rk_malloc.h"
+#include "rk_list.h"
 
 #include "os_malloc.h"
 
@@ -35,6 +36,13 @@
 #define OSAL_MEM_STUFF_EN       (0x00000002)
 
 static RK_S32 osal_mem_flag = -1;
+static struct list_head mem_list;
+
+struct mem_node {
+    struct list_head list;
+    void *ptr;
+    size_t size;
+};
 
 static void get_osal_mem_flag()
 {
@@ -48,12 +56,14 @@ static void get_osal_mem_flag()
         if (val) {
             osal_mem_flag |= OSAL_MEM_STUFF_EN;
         }
+        INIT_LIST_HEAD(&mem_list);
     }
 }
 
-void *rk_mpp_malloc(size_t size)
+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))
         return ptr;
     else
@@ -62,6 +72,7 @@ void *rk_mpp_malloc(size_t size)
 
 void rk_mpp_free(void *ptr)
 {
+    get_osal_mem_flag();
     os_free(ptr);
 }
 
diff --git a/osal/test/rk_env_test.c b/osal/test/rk_env_test.c
index 1b7b5107..65e3377f 100644
--- a/osal/test/rk_env_test.c
+++ b/osal/test/rk_env_test.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG     "rk_env_test"
+#define MODULE_TAG "rk_env_test"
 #include "rk_env.h"
 #include "rk_log.h"
 
diff --git a/osal/test/rk_log_test.c b/osal/test/rk_log_test.c
index 31d9b820..e19a8670 100644
--- a/osal/test/rk_log_test.c
+++ b/osal/test/rk_log_test.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG     "rk_log_test"
+#define MODULE_TAG "rk_log_test"
 #include "rk_log.h"
 
 
diff --git a/osal/test/rk_malloc_test.c b/osal/test/rk_malloc_test.c
index f4397c9d..44f8600c 100644
--- a/osal/test/rk_malloc_test.c
+++ b/osal/test/rk_malloc_test.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG     "rk_malloc_test"
+#define MODULE_TAG "rk_malloc_test"
 #include "rk_log.h"
 #include "rk_malloc.h"
 
diff --git a/osal/test/rk_thread_test.c b/osal/test/rk_thread_test.c
index 87e14116..f97bf445 100644
--- a/osal/test/rk_thread_test.c
+++ b/osal/test/rk_thread_test.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG     "rk_thread_test"
+#define MODULE_TAG "rk_thread_test"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>