diff --git a/bsp/efm32/rtconfig.h b/bsp/efm32/rtconfig.h index 408f695992..19dc011491 100644 --- a/bsp/efm32/rtconfig.h +++ b/bsp/efm32/rtconfig.h @@ -34,13 +34,6 @@ /* SECTION: RT_DEBUG */ #define RT_DEBUG #define RT_DEBUG_COLOR -//#define RT_DEBUG_MEM (1) -//#define RT_DEBUG_SCHEDULER (1) -//#define RT_DEBUG_IPC (1) -//#define THREAD_DEBUG -//#define IRQ_DEBUG -#define RT_USING_OVERFLOW_CHECK -//#define DFS_DEBUG #define RT_LWIP_DEBUG //#define RT_IRQHDL_DEBUG diff --git a/bsp/lpc43xx/M0/rtconfig.h b/bsp/lpc43xx/M0/rtconfig.h index 0c0db94c21..57a6300ec6 100644 --- a/bsp/lpc43xx/M0/rtconfig.h +++ b/bsp/lpc43xx/M0/rtconfig.h @@ -25,10 +25,6 @@ #define RT_DEBUG_COLOR // #define RT_DEBUG_INIT 0 -//#define RT_DEBUG_SCHEDULER 1 -// -// #define RT_THREAD_DEBUG -// #define RT_USING_OVERFLOW_CHECK // diff --git a/bsp/sep6200/rtconfig.h b/bsp/sep6200/rtconfig.h index c687dc3cb4..ac5e520ca9 100644 --- a/bsp/sep6200/rtconfig.h +++ b/bsp/sep6200/rtconfig.h @@ -2,17 +2,6 @@ #ifndef __RTTHREAD_CFG_H__ #define __RTTHREAD_CFG_H__ -/* #define RT_DEBUG_IRQ 1 */ -/* #define RT_DEBUG_TIMER 1 */ - -/* #define RT_DEBUG_MEM 1 */ -/* #define RT_DEBUG_MEMHEAP 1 */ -/* #define RT_DEBUG_MODULE 1 */ -/* #define RT_DEBUG_SCHEDULER 1 */ -/* #define RT_DEBUG_SLAB 1 */ -/* #define RT_DEBUG_THREAD 1 */ -/* #define RT_DEBUG_IPC 1 */ - /* RT_NAME_MAX*/ #define RT_NAME_MAX 8 diff --git a/bsp/simulator/drivers/module_win32.c b/bsp/simulator/drivers/module_win32.c index 590aad39bd..183497f5c6 100644 --- a/bsp/simulator/drivers/module_win32.c +++ b/bsp/simulator/drivers/module_win32.c @@ -13,6 +13,11 @@ #include #ifdef RT_USING_MODULE + +#define DBG_TAG "simulator.module.win32" +#define DBG_LVL DBG_INFO +#include + void rt_module_init_object_container(struct rt_module *module) { RT_ASSERT(module != RT_NULL); @@ -315,8 +320,7 @@ rt_module_t rt_module_open(const char *path) (void(*)(void *))module->module_entry, RT_NULL, 2048, RT_THREAD_PRIORITY_MAX - 2, 10); - RT_DEBUG_LOG(RT_DEBUG_MODULE, ("thread entry 0x%x\n", - module->module_entry)); + LOG_D("thread entry %#x", module->module_entry); /* set module id */ module->module_thread->parent.module_id = (void *)module; diff --git a/components/libc/posix/libdl/arch/arm.c b/components/libc/posix/libdl/arch/arm.c index a1ab506a55..2996f2e3c7 100644 --- a/components/libc/posix/libdl/arch/arm.c +++ b/components/libc/posix/libdl/arch/arm.c @@ -13,12 +13,8 @@ #ifdef __arm__ -#define DBG_TAG "kernel.module" -#ifdef RT_DEBUG_MODULE -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_MODULE) */ +#define DBG_TAG "posix.libdl.arch" +#define DBG_LVL DBG_INFO #include int dlmodule_relocate(struct rt_dlmodule *module, Elf32_Rel *rel, Elf32_Addr sym_val) @@ -126,4 +122,5 @@ int dlmodule_relocate(struct rt_dlmodule *module, Elf32_Rel *rel, Elf32_Addr sym return 0; } -#endif + +#endif /* __arm__ */ diff --git a/components/libc/posix/libdl/arch/riscv.c b/components/libc/posix/libdl/arch/riscv.c index cf0eb193af..8dd09789c5 100644 --- a/components/libc/posix/libdl/arch/riscv.c +++ b/components/libc/posix/libdl/arch/riscv.c @@ -26,12 +26,8 @@ #define R_RISCV_TLS_TPREL32 10 #define R_RISCV_TLS_TPREL64 11 -#define DBG_TAG "kernel.module" -#ifdef RT_DEBUG_MODULE -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_MODULE) */ +#define DBG_TAG "posix.libdl.arch" +#define DBG_LVL DBG_INFO #include int dlmodule_relocate(struct rt_dlmodule *module, Elf_Rel *rel, Elf_Addr sym_val) diff --git a/components/libc/posix/libdl/arch/x86.c b/components/libc/posix/libdl/arch/x86.c index b309ab8c13..1987d45508 100644 --- a/components/libc/posix/libdl/arch/x86.c +++ b/components/libc/posix/libdl/arch/x86.c @@ -13,12 +13,8 @@ #ifdef __i386__ -#define DBG_TAG "kernel.module" -#ifdef RT_DEBUG_MODULE -#define DBG_LVL DBG_LOG -#else -#define DBG_LVL DBG_WARNING -#endif /* defined (RT_DEBUG_MODULE) */ +#define DBG_TAG "posix.libdl.arch" +#define DBG_LVL DBG_INFO #include #define R_X86_64_GLOB_DAT 6 /* Create GOT entry */ @@ -55,4 +51,5 @@ int dlmodule_relocate(struct rt_dlmodule *module, Elf32_Rel *rel, Elf32_Addr sym return 0; } -#endif + +#endif /* __i386__ */ diff --git a/documentation/basic/basic.md b/documentation/basic/basic.md index f5e0e25d19..547eeab57f 100644 --- a/documentation/basic/basic.md +++ b/documentation/basic/basic.md @@ -580,9 +580,6 @@ Configuration is mainly done by modifying the file under project directory - rtc #define RT_DEBUG /* When debug mode is enabled: Define this macro to enable the print component initialization information, if not defined, close. */ #define RT_DEBUG_INIT -/* When debug mode is enabled: When the macro is defined as 0, the print thread switching information is turned off. When it is defined as 1, it is enabled. */ -/* When debug mode is enabled: Define this macro to enable the print thread switching information. */ -#define RT_DEBUG_THREAD /* Defining this macro means the use of the hook function is started, if not defined, close. */ #define RT_USING_HOOK diff --git a/libcpu/ti-dsp/c28x/cpuport.c b/libcpu/ti-dsp/c28x/cpuport.c index f282744dac..c1c1141413 100644 --- a/libcpu/ti-dsp/c28x/cpuport.c +++ b/libcpu/ti-dsp/c28x/cpuport.c @@ -13,12 +13,8 @@ #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_TAG "cpu.ti.c28x" +#define DBG_LVL DBG_INFO #include extern volatile rt_uint8_t rt_interrupt_nest; 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