From 237bbfd9688b4ea0329047a85165323b99961345 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sat, 8 Jul 2023 19:09:51 -0400 Subject: [debug] remove RT_DEBUG_xxx remove RT_DEBUG_THREAD RT_DEBUG_SCHEDULER RT_DEBUG_IPC RT_DEBUG_TIMER RT_DEBUG_IRQ RT_DEBUG_MEM RT_DEBUG_SLAB RT_DEBUG_MEMHEAP --- src/Kconfig | 36 ------------------------------------ src/ipc.c | 6 +----- src/irq.c | 6 +----- src/mem.c | 9 +-------- src/memheap.c | 6 +----- src/scheduler_mp.c | 6 +----- src/scheduler_up.c | 6 +----- src/slab.c | 14 +++++--------- src/thread.c | 6 +----- src/timer.c | 10 +++------- 10 files changed, 15 insertions(+), 90 deletions(-) (limited to 'src') diff --git a/src/Kconfig b/src/Kconfig index bcb58f1dee..ed280c0020 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -211,48 +211,12 @@ if RT_DEBUG bool "Enable debugging of components initialization" default n - config RT_DEBUG_THREAD - bool "Enable debugging of Thread State Changes" - default n - - config RT_DEBUG_SCHEDULER - bool "Enable debugging of Scheduler" - default n - - config RT_DEBUG_IPC - bool "Enable debugging of IPC" - default n - - config RT_DEBUG_TIMER - bool "Enable debugging of Timer" - default n - - config RT_DEBUG_IRQ - bool "Enable debugging of IRQ(Interrupt Request)" - default n - - config RT_DEBUG_MEM - bool "Enable debugging of Small Memory Algorithm" - default n - - config RT_DEBUG_SLAB - bool "Enable debugging of SLAB Memory Algorithm" - default n - - config RT_DEBUG_MEMHEAP - bool "Enable debugging of Memory Heap Algorithm" - default n - if ARCH_MM_MMU config RT_DEBUG_PAGE_LEAK bool "Enable page leaking tracer" default n endif - config RT_DEBUG_MODULE - bool "Enable debugging of Application Module" - default n - endif menu "Inter-Thread communication" diff --git a/src/ipc.c b/src/ipc.c index b6bf08770d..220c9bc173 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -51,11 +51,7 @@ #include #define DBG_TAG "kernel.ipc" -#ifdef RT_DEBUG_IPC -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_IPC) */ +#define DBG_LVL DBG_INFO #include #ifndef __on_rt_object_trytake_hook diff --git a/src/irq.c b/src/irq.c index b0b0c7a182..e38f10e6f4 100644 --- a/src/irq.c +++ b/src/irq.c @@ -18,11 +18,7 @@ #include #define DBG_TAG "kernel.irq" -#ifdef RT_DEBUG_IRQ -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_IRQ) */ +#define DBG_LVL DBG_INFO #include #ifndef __on_rt_interrupt_enter_hook diff --git a/src/mem.c b/src/mem.c index 8160d9ea58..ae04e0dd8d 100644 --- a/src/mem.c +++ b/src/mem.c @@ -51,16 +51,9 @@ #include #if defined (RT_USING_SMALL_MEM) - /** - * memory item on the small mem - */ #define DBG_TAG "kernel.mem" -#ifdef RT_DEBUG_MEM -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_MEM) */ +#define DBG_LVL DBG_INFO #include struct rt_small_mem_item diff --git a/src/memheap.c b/src/memheap.c index 067523bb93..bb14e4aa40 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -27,11 +27,7 @@ #ifdef RT_USING_MEMHEAP #define DBG_TAG "kernel.memheap" -#ifdef RT_DEBUG_MEMHEAP -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_MEM) */ +#define DBG_LVL DBG_INFO #include /* dynamic pool magic and mask */ diff --git a/src/scheduler_mp.c b/src/scheduler_mp.c index a1f9912193..bbf5474929 100644 --- a/src/scheduler_mp.c +++ b/src/scheduler_mp.c @@ -35,11 +35,7 @@ #include #define DBG_TAG "kernel.scheduler" -#ifdef RT_DEBUG_SCHEDULER -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_SCHEDULER) */ +#define DBG_LVL DBG_INFO #include rt_list_t rt_thread_priority_table[RT_THREAD_PRIORITY_MAX]; diff --git a/src/scheduler_up.c b/src/scheduler_up.c index ab4c0e977a..ef8c36dc88 100644 --- a/src/scheduler_up.c +++ b/src/scheduler_up.c @@ -35,11 +35,7 @@ #include #define DBG_TAG "kernel.scheduler" -#ifdef RT_DEBUG_SCHEDULER -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_SCHEDULER) */ +#define DBG_LVL DBG_INFO #include rt_list_t rt_thread_priority_table[RT_THREAD_PRIORITY_MAX]; diff --git a/src/slab.c b/src/slab.c index c026dde982..18f3048b65 100644 --- a/src/slab.c +++ b/src/slab.c @@ -55,14 +55,10 @@ #include #include -#if defined (RT_USING_SLAB) +#ifdef RT_USING_SLAB #define DBG_TAG "kernel.slab" -#ifdef RT_DEBUG_SLAB -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_SLAB) */ +#define DBG_LVL DBG_INFO #include /* @@ -751,7 +747,7 @@ void rt_slab_free(rt_slab_t m, void *ptr) return ; /* get memory usage */ -#ifdef RT_DEBUG_SLAB +#if (DBG_LVL == DBG_LOG) { rt_ubase_t addr = ((rt_ubase_t)ptr & ~RT_MM_PAGE_MASK); LOG_D("free a memory 0x%x and align to 0x%x, kup index %d", @@ -759,7 +755,7 @@ void rt_slab_free(rt_slab_t m, void *ptr) (rt_ubase_t)addr, ((rt_ubase_t)(addr) - slab->heap_start) >> RT_MM_PAGE_BITS); } -#endif /* RT_DEBUG_SLAB */ +#endif /* DBG_LVL == DBG_LOG */ kup = btokup((rt_ubase_t)ptr & ~RT_MM_PAGE_MASK); /* release large allocation */ @@ -857,4 +853,4 @@ void rt_slab_free(rt_slab_t m, void *ptr) } RTM_EXPORT(rt_slab_free); -#endif /* defined (RT_USING_SLAB) */ +#endif /* RT_USING_SLAB */ diff --git a/src/thread.c b/src/thread.c index 57b922894b..61f3e289f9 100644 --- a/src/thread.c +++ b/src/thread.c @@ -39,11 +39,7 @@ #include #define DBG_TAG "kernel.thread" -#ifdef RT_DEBUG_THREAD -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_THREAD) */ +#define DBG_LVL DBG_INFO #include #ifndef __on_rt_thread_inited_hook diff --git a/src/timer.c b/src/timer.c index 04e4a91b13..6a077f7575 100644 --- a/src/timer.c +++ b/src/timer.c @@ -25,11 +25,7 @@ #include #define DBG_TAG "kernel.timer" -#ifdef RT_DEBUG_TIMER -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_TIMER) */ +#define DBG_LVL DBG_INFO #include /* hard timer list */ @@ -203,7 +199,7 @@ rt_inline void _timer_remove(rt_timer_t timer) } } -#ifdef RT_DEBUG_TIMER +#if (DBG_LVL == DBG_LOG) /** * @brief The number of timer * @@ -242,7 +238,7 @@ void rt_timer_dump(rt_list_t timer_heads[]) } rt_kprintf("\n"); } -#endif /* RT_DEBUG_TIMER */ +#endif /* (DBG_LVL == DBG_LOG) */ /** * @addtogroup Clock -- cgit v1.3.1