Skip to content

[ulog][rtc][time][bug] solve the interference when enable the ulog timestamp #5687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BernardXiong merged 3 commits into from
Mar 21, 2022
Merged

[ulog][rtc][time][bug] solve the interference when enable the ulog timestamp #5687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
601af1b
[ulog] 解决ulog开启时间戳后与libc time以及rtc驱动相关函数干涉的问题
mysterywolf Mar 18, 2022
34c57cf
ulog：当发生递归输出时，后续递归想要输出的内容可能会因为防范递归的判断而无法输出
mysterywolf Mar 18, 2022
e1d09b2
[ulog] size_t->rt_size_t NULL->RT_NULL
mysterywolf Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bsp/stm32/libraries/HAL_Drivers/drv_rtc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static rt_err_t stm32_rtc_get_secs(void *args)
struct timeval tv;
get_rtc_timeval(&tv);
*(rt_uint32_t *) args = tv.tv_sec;
LOG_D("RTC: get rtc_time %x\n", *(rt_uint32_t *)args);
LOG_D("RTC: get rtc_time %x", *(rt_uint32_t *)args);

return RT_EOK;
}
Expand All @@ -262,7 +262,7 @@ static rt_err_t stm32_rtc_set_secs(void *args)
{
result = -RT_ERROR;
}
LOG_D("RTC: set rtc_time %x\n", *(rt_uint32_t *)args);
LOG_D("RTC: set rtc_time %x", *(rt_uint32_t *)args);

return result;
}
Expand Down
6 changes: 2 additions & 4 deletions components/libc/compilers/common/time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,14 @@ static rt_err_t get_timeval(struct timeval *tv)
}
else
{
/* LOG_W will cause a recursive printing if ulog timestamp function is enabled */
rt_kprintf(_WARNING_NO_RTC);
LOG_W(_WARNING_NO_RTC);
return -RT_ENOSYS;
}

return rst;

#else
/* LOG_W will cause a recursive printing if ulog timestamp function is enabled */
rt_kprintf(_WARNING_NO_RTC);
LOG_W(_WARNING_NO_RTC);
return -RT_ENOSYS;
#endif /* RT_USING_RTC */
}
Expand Down
4 changes: 2 additions & 2 deletions components/utilities/ulog/backend/console_be.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006-2021, RT-Thread Development Team
* Copyright (c) 2006-2022, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
Expand All @@ -20,7 +20,7 @@
static struct ulog_backend console = { 0 };

void ulog_console_backend_output(struct ulog_backend *backend, rt_uint32_t level, const char *tag, rt_bool_t is_raw,
const char *log, size_t len)
const char *log, rt_size_t len)
{
#ifdef RT_USING_DEVICE
rt_device_t dev = rt_console_get_device();
Expand Down
4 changes: 2 additions & 2 deletions components/utilities/ulog/syslog/syslog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006-2021, RT-Thread Development Team
* Copyright (c) 2006-2022, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down Expand Up @@ -170,7 +170,7 @@ static const char *get_month_str(uint8_t month)

RT_WEAK rt_size_t syslog_formater(char *log_buf, int level, const char *tag, rt_bool_t newline, const char *format, va_list args)
{
extern size_t ulog_strcpy(size_t cur_len, char *dst, const char *src);
extern rt_size_t ulog_strcpy(rt_size_t cur_len, char *dst, const char *src);

rt_size_t log_len = 0, newline_len = rt_strlen(ULOG_NEWLINE_SIGN);
int fmt_result;
Expand Down
Loading