Skip to content

Commit 7c7ff6e

Browse files
unicornxmysterywolf
unicornx
authored and
mysterywolf
committed
kernel: cleanup debug APIs
- `dbg_log` is a “NOT RECOMMENDED API”, convert the calling of this API to LOG_x and remove this API. - `dbg_here`/`dbg_enter`/`dbg_exit`: no one use these APIs, remove them directly. Signed-off-by: Chen Wang <[email protected]>
1 parent 6a7e797 commit 7c7ff6e

File tree

6 files changed

+47
-83
lines changed

6 files changed

+47
-83
lines changed

‎bsp/nxp/imx/imxrt/libraries/drivers/drv_eth.c‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void _enet_rx_callback(struct rt_imxrt_eth *eth)
151151

152152
void _enet_tx_callback(struct rt_imxrt_eth *eth)
153153
{
154-
dbg_log(DBG_LOG, "_enet_tx_callback\n");
154+
LOG_D("_enet_tx_callback\n");
155155
if (eth->tx_is_waiting == RT_TRUE)
156156
{
157157
eth->tx_is_waiting = RT_FALSE;
@@ -181,23 +181,23 @@ static void _enet_callback(ENET_Type *base,
181181
break;
182182

183183
case kENET_ErrEvent:
184-
dbg_log(DBG_LOG, "kENET_ErrEvent\n");
184+
LOG_D("kENET_ErrEvent\n");
185185
break;
186186

187187
case kENET_WakeUpEvent:
188-
dbg_log(DBG_LOG, "kENET_WakeUpEvent\n");
188+
LOG_D("kENET_WakeUpEvent\n");
189189
break;
190190

191191
case kENET_TimeStampEvent:
192-
dbg_log(DBG_LOG, "kENET_TimeStampEvent\n");
192+
LOG_D("kENET_TimeStampEvent\n");
193193
break;
194194

195195
case kENET_TimeStampAvailEvent:
196-
dbg_log(DBG_LOG, "kENET_TimeStampAvailEvent \n");
196+
LOG_D("kENET_TimeStampAvailEvent \n");
197197
break;
198198

199199
default:
200-
dbg_log(DBG_LOG, "unknow error\n");
200+
LOG_D("unknow error\n");
201201
break;
202202
}
203203
}
@@ -255,7 +255,7 @@ static void *_enet_rx_alloc(ENET_Type *base, void *userData, uint8_t ringId)
255255
void *buffer = NULL;
256256
int i;
257257

258-
// dbg_log(DBG_LOG, "get buff_wait sem in %d\r\n", __LINE__);
258+
// LOG_D("get buff_wait sem in %d\r\n", __LINE__);
259259
rt_sem_take(&imxrt_eth_device.buff_wait, RT_WAITING_FOREVER);
260260

261261
for (i = 0; i < ENET_RXBUFF_NUM; i++)
@@ -269,7 +269,7 @@ static void *_enet_rx_alloc(ENET_Type *base, void *userData, uint8_t ringId)
269269
}
270270

271271
rt_sem_release(&imxrt_eth_device.buff_wait);
272-
// dbg_log(DBG_LOG, "release buff_wait sem in %d\r\n", __LINE__);
272+
// LOG_D("release buff_wait sem in %d\r\n", __LINE__);
273273

274274
return buffer;
275275
}
@@ -282,15 +282,15 @@ static void _enet_rx_free(ENET_Type *base, void *buffer, void *userData, uint8_t
282282
LOG_E("Freed buffer out of range\r\n");
283283
}
284284

285-
// dbg_log(DBG_LOG, "get buff_wait sem in %d\r\n", __LINE__);
285+
// LOG_D("get buff_wait sem in %d\r\n", __LINE__);
286286
rt_sem_take(&imxrt_eth_device.buff_wait, RT_WAITING_FOREVER);
287287
if (!(imxrt_eth_device.RxPbufs[idx].buffer_used))
288288
{
289289
LOG_E("_enet_rx_free: freeing unallocated buffer\r\n");
290290
}
291291
imxrt_eth_device.RxPbufs[idx].buffer_used = false;
292292
rt_sem_release(&imxrt_eth_device.buff_wait);
293-
// dbg_log(DBG_LOG, "release buff_wait sem in %d\r\n", __LINE__);
293+
// LOG_D("release buff_wait sem in %d\r\n", __LINE__);
294294
}
295295

296296
/**
@@ -356,13 +356,13 @@ static void _enet_config(void)
356356
// /* Set SMI to get PHY link status. */
357357
// sysClock = CLOCK_GetFreq(kCLOCK_IpgClk);
358358
//
359-
// dbg_log(DBG_LOG, "deinit\n");
359+
// LOG_D("deinit\n");
360360
// ENET_Deinit(imxrt_eth_device.enet_base);
361-
// dbg_log(DBG_LOG, "init\n");
361+
// LOG_D("init\n");
362362
// ENET_Init(imxrt_eth_device.enet_base, &imxrt_eth_device.enet_handle, &config, &buffConfig[0], &imxrt_eth_device.dev_addr[0], sysClock);
363-
//// dbg_log(DBG_LOG, "set call back\n");
363+
//// LOG_D("set call back\n");
364364
//// ENET_SetCallback(&imxrt_eth_device.enet_handle, _enet_callback, &imxrt_eth_device);
365-
// dbg_log(DBG_LOG, "active read\n");
365+
// LOG_D("active read\n");
366366
// ENET_ActiveRead(imxrt_eth_device.enet_base);
367367
//#else
368368
int i;
@@ -423,13 +423,13 @@ static void _enet_config(void)
423423
imxrt_eth_device.RxPbufs[i].buffer_used = false;
424424
}
425425

426-
// dbg_log(DBG_LOG, "deinit\n");
426+
// LOG_D("deinit\n");
427427
// ENET_Deinit(imxrt_eth_device.enet_base);
428-
dbg_log(DBG_LOG, "init\n");
428+
LOG_D("init\n");
429429
ENET_Init(imxrt_eth_device.enet_base, &imxrt_eth_device.enet_handle, &config, &buffConfig[0], &imxrt_eth_device.dev_addr[0], sysClock);
430-
// dbg_log(DBG_LOG, "set call back\n");
430+
// LOG_D("set call back\n");
431431
// ENET_SetCallback(&imxrt_eth_device.enet_handle, _enet_callback, &imxrt_eth_device);
432-
dbg_log(DBG_LOG, "active read\n");
432+
LOG_D("active read\n");
433433
ENET_ActiveRead(imxrt_eth_device.enet_base);
434434
//#endif
435435
}
@@ -474,41 +474,41 @@ static void packet_dump(const char *msg, const struct pbuf *p)
474474
/* initialize the interface */
475475
static rt_err_t rt_imxrt_eth_init(rt_device_t dev)
476476
{
477-
dbg_log(DBG_LOG, "rt_imxrt_eth_init...\n");
477+
LOG_D("rt_imxrt_eth_init...\n");
478478
_enet_config();
479479

480480
return RT_EOK;
481481
}
482482

483483
static rt_err_t rt_imxrt_eth_open(rt_device_t dev, rt_uint16_t oflag)
484484
{
485-
dbg_log(DBG_LOG, "rt_imxrt_eth_open...\n");
485+
LOG_D("rt_imxrt_eth_open...\n");
486486
return RT_EOK;
487487
}
488488

489489
static rt_err_t rt_imxrt_eth_close(rt_device_t dev)
490490
{
491-
dbg_log(DBG_LOG, "rt_imxrt_eth_close...\n");
491+
LOG_D("rt_imxrt_eth_close...\n");
492492
return RT_EOK;
493493
}
494494

495495
static rt_ssize_t rt_imxrt_eth_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
496496
{
497-
dbg_log(DBG_LOG, "rt_imxrt_eth_read...\n");
497+
LOG_D("rt_imxrt_eth_read...\n");
498498
rt_set_errno(-RT_ENOSYS);
499499
return 0;
500500
}
501501

502502
static rt_ssize_t rt_imxrt_eth_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
503503
{
504-
dbg_log(DBG_LOG, "rt_imxrt_eth_write...\n");
504+
LOG_D("rt_imxrt_eth_write...\n");
505505
rt_set_errno(-RT_ENOSYS);
506506
return 0;
507507
}
508508

509509
static rt_err_t rt_imxrt_eth_control(rt_device_t dev, int cmd, void *args)
510510
{
511-
dbg_log(DBG_LOG, "rt_imxrt_eth_control...\n");
511+
LOG_D("rt_imxrt_eth_control...\n");
512512
switch (cmd)
513513
{
514514
case NIOCTL_GADDR:
@@ -807,7 +807,7 @@ rt_err_t rt_imxrt_eth_tx(rt_device_t dev, struct pbuf *p)
807807
RT_ASSERT(p != NULL);
808808
RT_ASSERT(enet_handle != RT_NULL);
809809

810-
dbg_log(DBG_LOG, "rt_imxrt_eth_tx: %d\n", p->len);
810+
LOG_D("rt_imxrt_eth_tx: %d\n", p->len);
811811

812812
#ifdef ETH_TX_DUMP
813813
packet_dump("send", p);
@@ -861,18 +861,18 @@ struct pbuf *rt_imxrt_eth_rx(rt_device_t dev)
861861
}
862862
else
863863
{
864-
dbg_log(DBG_LOG, " A frame read failed\n");
864+
LOG_D(" A frame read failed\n");
865865
pbuf_free(p);
866866
}
867867
}
868868
else
869869
{
870-
dbg_log(DBG_LOG, " pbuf_alloc faild\n");
870+
LOG_D(" pbuf_alloc faild\n");
871871
}
872872
}
873873
else if (status == kStatus_ENET_RxFrameError)
874874
{
875-
dbg_log(DBG_WARNING, "ENET_GetRxFrameSize: kStatus_ENET_RxFrameError\n");
875+
LOG_W("ENET_GetRxFrameSize: kStatus_ENET_RxFrameError\n");
876876
/* Update the received buffer when error happened. */
877877

878878
/* Get the error information of the received g_frame. */
@@ -956,44 +956,44 @@ static void phy_monitor_thread_entry(void *parameter)
956956

957957
if (PHY_SPEED_10M == speed)
958958
{
959-
dbg_log(DBG_LOG, "10M\n");
959+
LOG_D("10M\n");
960960
}
961961
else if (PHY_SPEED_100M == speed)
962962
{
963-
dbg_log(DBG_LOG, "100M\n");
963+
LOG_D("100M\n");
964964
}
965965
else
966966
{
967-
dbg_log(DBG_LOG, "1000M\n");
967+
LOG_D("1000M\n");
968968
}
969969

970970
if (PHY_HALF_DUPLEX == duplex)
971971
{
972-
dbg_log(DBG_LOG, "half dumplex\n");
972+
LOG_D("half dumplex\n");
973973
}
974974
else
975975
{
976-
dbg_log(DBG_LOG, "full dumplex\n");
976+
LOG_D("full dumplex\n");
977977
}
978978

979979
if ((imxrt_eth_device.speed != (enet_mii_speed_t)speed) || (imxrt_eth_device.duplex != (enet_mii_duplex_t)duplex))
980980
{
981981
imxrt_eth_device.speed = (enet_mii_speed_t)speed;
982982
imxrt_eth_device.duplex = (enet_mii_duplex_t)duplex;
983983

984-
dbg_log(DBG_LOG, "link up, and update eth mode.\n");
984+
LOG_D("link up, and update eth mode.\n");
985985
rt_imxrt_eth_init((rt_device_t)&imxrt_eth_device);
986986
}
987987
else
988988
{
989-
dbg_log(DBG_LOG, "link up, eth not need re-config.\n");
989+
LOG_D("link up, eth not need re-config.\n");
990990
}
991-
dbg_log(DBG_LOG, "link up.\n");
991+
LOG_D("link up.\n");
992992
eth_device_linkchange(&imxrt_eth_device.parent, RT_TRUE);
993993
}
994994
else
995995
{
996-
dbg_log(DBG_LOG, "link down.\n");
996+
LOG_D("link down.\n");
997997
eth_device_linkchange(&imxrt_eth_device.parent, RT_FALSE);
998998
}
999999
}
@@ -1050,24 +1050,24 @@ static int rt_hw_imxrt_eth_init(void)
10501050
imxrt_eth_device.parent.eth_rx = rt_imxrt_eth_rx;
10511051
imxrt_eth_device.parent.eth_tx = rt_imxrt_eth_tx;
10521052

1053-
dbg_log(DBG_LOG, "sem init: tx_wait\r\n");
1053+
LOG_D("sem init: tx_wait\r\n");
10541054
/* init tx semaphore */
10551055
rt_sem_init(&imxrt_eth_device.tx_wait, "tx_wait", 0, RT_IPC_FLAG_FIFO);
10561056

1057-
dbg_log(DBG_LOG, "sem init: buff_wait\r\n");
1057+
LOG_D("sem init: buff_wait\r\n");
10581058
/* init tx semaphore */
10591059
rt_sem_init(&imxrt_eth_device.buff_wait, "buff_wait", 1, RT_IPC_FLAG_FIFO);
10601060

10611061
/* register eth device */
1062-
dbg_log(DBG_LOG, "eth_device_init start\r\n");
1062+
LOG_D("eth_device_init start\r\n");
10631063
state = eth_device_init(&(imxrt_eth_device.parent), "e0");
10641064
if (RT_EOK == state)
10651065
{
1066-
dbg_log(DBG_LOG, "eth_device_init success\r\n");
1066+
LOG_D("eth_device_init success\r\n");
10671067
}
10681068
else
10691069
{
1070-
dbg_log(DBG_LOG, "eth_device_init faild: %d\r\n", state);
1070+
LOG_D("eth_device_init faild: %d\r\n", state);
10711071
}
10721072

10731073
eth_device_linkchange(&imxrt_eth_device.parent, RT_FALSE);

‎components/lwp/arch/x86/i386/lwp_arch.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ int arch_expand_user_stack(void *addr)
4848
else /* map failed, send signal SIGSEGV */
4949
{
5050
#ifdef RT_USING_SIGNALS
51-
dbg_log(DBG_ERROR, "[fault] thread %s mapped addr %p failed!\n", rt_thread_self()->parent.name, addr);
51+
LOG_E("[fault] thread %s mapped addr %p failed!\n", rt_thread_self()->parent.name, addr);
5252
lwp_thread_kill(rt_thread_self(), SIGSEGV);
5353
ret = 1; /* return 1, will return back to intr, then check exit */
5454
#endif
@@ -57,7 +57,7 @@ int arch_expand_user_stack(void *addr)
5757
else /* not stack, send signal SIGSEGV */
5858
{
5959
#ifdef RT_USING_SIGNALS
60-
dbg_log(DBG_ERROR, "[fault] thread %s access unmapped addr %p!\n", rt_thread_self()->parent.name, addr);
60+
LOG_E("[fault] thread %s access unmapped addr %p!\n", rt_thread_self()->parent.name, addr);
6161
lwp_thread_kill(rt_thread_self(), SIGSEGV);
6262
ret = 1; /* return 1, will return back to intr, then check exit */
6363
#endif

‎components/lwp/lwp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ pid_t lwp_execve(char *filename, int debug, int argc, char **argv, char **envp)
447447

448448
if (lwp == RT_NULL)
449449
{
450-
dbg_log(DBG_ERROR, "lwp struct out of memory!\n");
450+
LOG_E("lwp struct out of memory!\n");
451451
return -ENOMEM;
452452
}
453453
LOG_D("lwp malloc : %p, size: %d!", lwp, sizeof(struct rt_lwp));

‎components/lwp/lwp_syscall.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ sysret_t sys_unlink(const char *pathname)
821821
sysret_t sys_nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
822822
{
823823
int ret = 0;
824-
dbg_log(DBG_LOG, "sys_nanosleep\n");
824+
LOG_D("sys_nanosleep\n");
825825
if (!lwp_user_accessable((void *)rqtp, sizeof *rqtp))
826826
return -EFAULT;
827827

@@ -4759,7 +4759,7 @@ sysret_t sys_clock_gettime(clockid_t clk, struct timespec *ts)
47594759
sysret_t sys_clock_nanosleep(clockid_t clk, int flags, const struct timespec *rqtp, struct timespec *rmtp)
47604760
{
47614761
int ret = 0;
4762-
dbg_log(DBG_LOG, "sys_nanosleep\n");
4762+
LOG_D("sys_nanosleep\n");
47634763
if (!lwp_user_accessable((void *)rqtp, sizeof *rqtp))
47644764
return -EFAULT;
47654765

‎components/utilities/ulog/ulog_def.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,10 @@ extern "C" {
4343
#undef DBG_WARNING
4444
#undef DBG_INFO
4545
#undef DBG_LOG
46-
#undef dbg_log
4746
#define DBG_ERROR LOG_LVL_ERROR
4847
#define DBG_WARNING LOG_LVL_WARNING
4948
#define DBG_INFO LOG_LVL_INFO
5049
#define DBG_LOG LOG_LVL_DBG
51-
#define dbg_log(level, ...) \
52-
if ((level) <= LOG_LVL) \
53-
{ \
54-
ulog_output(level, LOG_TAG, RT_FALSE, __VA_ARGS__);\
55-
}
5650

5751
#if !defined(LOG_TAG)
5852
/* compatible for rtdbg */

‎include/rtdbg.h‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -113,32 +113,6 @@ extern "C" {
113113
rt_kprintf("\n")
114114
#endif /* DBG_COLOR */
115115

116-
/*
117-
* static debug routine
118-
* NOTE: This is a NOT RECOMMENDED API. Please using LOG_X API.
119-
* It will be DISCARDED later. Because it will take up more resources.
120-
*/
121-
#define dbg_log(level, fmt, ...) \
122-
if ((level) <= DBG_LEVEL) \
123-
{ \
124-
switch(level) \
125-
{ \
126-
case DBG_ERROR: _DBG_LOG_HDR("E", 31); break; \
127-
case DBG_WARNING: _DBG_LOG_HDR("W", 33); break; \
128-
case DBG_INFO: _DBG_LOG_HDR("I", 32); break; \
129-
case DBG_LOG: _DBG_LOG_HDR("D", 0); break; \
130-
default: break; \
131-
} \
132-
rt_kprintf(fmt, ##__VA_ARGS__); \
133-
_DBG_COLOR(0); \
134-
}
135-
136-
#define dbg_here \
137-
if ((DBG_LEVEL) <= DBG_LOG){ \
138-
rt_kprintf(DBG_SECTION_NAME " Here %s:%d\n", \
139-
__FUNCTION__, __LINE__); \
140-
}
141-
142116
#define dbg_log_line(lvl, color_n, fmt, ...) \
143117
do \
144118
{ \
@@ -151,10 +125,6 @@ extern "C" {
151125
#define dbg_raw(...) rt_kprintf(__VA_ARGS__);
152126

153127
#else
154-
#define dbg_log(level, fmt, ...)
155-
#define dbg_here
156-
#define dbg_enter
157-
#define dbg_exit
158128
#define dbg_log_line(lvl, color_n, fmt, ...)
159129
#define dbg_raw(...)
160130
#endif /* DBG_ENABLE */

0 commit comments

Comments
 (0)