From 69dfccfd124562a34029f22aa514b1718247db98 Mon Sep 17 00:00:00 2001 From: Herman Chen Date: Thu, 23 Dec 2021 15:53:14 +0800 Subject: [PATCH] [osal]: Add log disable/enable function Change-Id: Iddd02b7c3d102a65a4c34a8fba89b7a28719e0a9 Signed-off-by: Herman Chen --- osal/inc/mpp_log.h | 4 ++-- osal/mpp_log.cpp | 17 +++++++++++------ osal/test/mpp_log_test.c | 25 ++++++------------------- 3 files changed, 19 insertions(+), 27 deletions(-) diff --git a/osal/inc/mpp_log.h b/osal/inc/mpp_log.h index 2fec0023..3c30942e 100644 --- a/osal/inc/mpp_log.h +++ b/osal/inc/mpp_log.h @@ -125,8 +125,8 @@ extern "C" { extern RK_U32 mpp_debug; -void mpp_log_set_flag(RK_U32 flag); -RK_U32 mpp_log_get_flag(void); +void mpp_log_enable(RK_S32 id); +void mpp_log_disable(RK_S32 id); void _mpp_log(const char *tag, const char *fmt, const char *func, ...); void _mpp_err(const char *tag, const char *fmt, const char *func, ...); diff --git a/osal/mpp_log.cpp b/osal/mpp_log.cpp index 53f2f13f..68b51c52 100644 --- a/osal/mpp_log.cpp +++ b/osal/mpp_log.cpp @@ -36,7 +36,7 @@ extern "C" { #endif RK_U32 mpp_debug = 0; -static RK_U32 mpp_log_flag = 0; +static RK_U32 mpp_log_enabled = 1; // TODO: add log timing information and switch flag static const char *msg_log_warning = "log message is long\n"; @@ -82,6 +82,10 @@ static void __mpp_log(mpp_log_callback func, const char *tag, const char *fmt, void _mpp_log(const char *tag, const char *fmt, const char *fname, ...) { va_list args; + + if (!mpp_log_enabled) + return; + va_start(args, fname); __mpp_log(os_log, tag, fmt, fname, args); va_end(args); @@ -95,15 +99,16 @@ void _mpp_err(const char *tag, const char *fmt, const char *fname, ...) va_end(args); } -void mpp_log_set_flag(RK_U32 flag) +void mpp_log_enable(RK_S32 id) { - mpp_log_flag = flag; - return ; + (void)id; + mpp_log_enabled = 1; } -RK_U32 mpp_log_get_flag() +void mpp_log_disable(RK_S32 id) { - return mpp_log_flag; + (void)id; + mpp_log_enabled = 0; } #ifdef __cplusplus diff --git a/osal/test/mpp_log_test.c b/osal/test/mpp_log_test.c index 71c7be17..65f0ab4c 100644 --- a/osal/test/mpp_log_test.c +++ b/osal/test/mpp_log_test.c @@ -20,35 +20,22 @@ int main() { - RK_U32 flag_dbg = 0x02; - RK_U32 flag_set = 0xffff; - RK_U32 flag_get = 0; mpp_err("mpp log test start\n"); mpp_err_f("log_f test\n"); - mpp_log("mpp log flag_set: %08x\n", mpp_log_get_flag()); + mpp_log("log disabled\n"); - mpp_log("set flag_set to %08x\n", flag_set); + mpp_log_disable(1); - mpp_log_set_flag(flag_set); + mpp_log("nothing should be show here\n"); - flag_get = mpp_log_get_flag(); + mpp_log_enable(1); - mpp_log("mpp log flag_get: %08x\n", flag_get); + mpp_log("log enabled\n"); - mpp_assert(flag_set == flag_get); - - mpp_log("try _mpp_dbg test 0 debug %x, flag %x", flag_get, flag_dbg); - _mpp_dbg(flag_get, flag_dbg, "mpp_dbg printing debug %x, flag %x", flag_get, flag_dbg); - - flag_dbg = 0; - - mpp_log("try _mpp_dbg test 0 debug %x, flag %x", flag_get, flag_dbg); - _mpp_dbg(flag_get, flag_dbg, "mpp_dbg printing debug %x, flag %x", flag_get, flag_dbg); - - mpp_err("mpp log log test done\n"); + mpp_err("mpp log test done\n"); return 0; }