libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4288 from Lawlieta/chenyong 

[utilities][ulog] Add LOG_RAW ringbuffer to fix printing line limit issue
This commit is contained in:
Bernard Xiong 2021-02-02 05:43:12 +08:00 committed by GitHub
parent bb35c5d627 cddf947863
commit 12dfa670ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
components/utilities/ulog/ulog.c
View File

@ -32,7 +32,7 @@
/* the number which is max stored line logs */ /* the number which is max stored line logs */
#ifndef ULOG_ASYNC_OUTPUT_STORE_LINES #ifndef ULOG_ASYNC_OUTPUT_STORE_LINES
#define ULOG_ASYNC_OUTPUT_STORE_LINES (ULOG_ASYNC_OUTPUT_BUF_SIZE * 3 / 2 / ULOG_LINE_BUF_SIZE) #define ULOG_ASYNC_OUTPUT_STORE_LINES (ULOG_ASYNC_OUTPUT_BUF_SIZE * 3 / 2 / 80)
#endif #endif
#ifdef ULOG_USING_COLOR #ifdef ULOG_USING_COLOR
@ -92,6 +92,8 @@ struct rt_ulog
#ifdef ULOG_USING_ASYNC_OUTPUT #ifdef ULOG_USING_ASYNC_OUTPUT
rt_bool_t async_enabled; rt_bool_t async_enabled;
rt_rbb_t async_rbb; rt_rbb_t async_rbb;
/* ringbuffer for log_raw function only */
struct rt_ringbuffer *async_rb;
rt_thread_t async_th; rt_thread_t async_th;
struct rt_semaphore async_notice; struct rt_semaphore async_notice;
#endif #endif
@ -429,38 +431,48 @@ void ulog_output_to_all_backend(rt_uint32_t level, const char *tag, rt_bool_t is
static void do_output(rt_uint32_t level, const char *tag, rt_bool_t is_raw, const char *log_buf, rt_size_t log_len) static void do_output(rt_uint32_t level, const char *tag, rt_bool_t is_raw, const char *log_buf, rt_size_t log_len)
{ {
#ifdef ULOG_USING_ASYNC_OUTPUT #ifdef ULOG_USING_ASYNC_OUTPUT
rt_rbb_blk_t log_blk;
ulog_frame_t log_frame;
/* allocate log frame */ if (is_raw == RT_FALSE)
log_blk = rt_rbb_blk_alloc(ulog.async_rbb, RT_ALIGN(sizeof(struct ulog_frame) + log_len, RT_ALIGN_SIZE));
if (log_blk)
{ {
/* package the log frame */ rt_rbb_blk_t log_blk;
log_frame = (ulog_frame_t) log_blk->buf; ulog_frame_t log_frame;
log_frame->magic = ULOG_FRAME_MAGIC;
log_frame->is_raw = is_raw; /* allocate log frame */
log_frame->level = level; log_blk = rt_rbb_blk_alloc(ulog.async_rbb, RT_ALIGN(sizeof(struct ulog_frame) + log_len, RT_ALIGN_SIZE));
log_frame->log_len = log_len; if (log_blk)
log_frame->tag = tag; {
log_frame->log = (const char *)log_blk->buf + sizeof(struct ulog_frame); /* package the log frame */
/* copy log data */ log_frame = (ulog_frame_t) log_blk->buf;
rt_memcpy(log_blk->buf + sizeof(struct ulog_frame), log_buf, log_len); log_frame->magic = ULOG_FRAME_MAGIC;
/* put the block */ log_frame->is_raw = is_raw;
rt_rbb_blk_put(log_blk); log_frame->level = level;
log_frame->log_len = log_len;
log_frame->tag = tag;
log_frame->log = (const char *)log_blk->buf + sizeof(struct ulog_frame);
/* copy log data */
rt_memcpy(log_blk->buf + sizeof(struct ulog_frame), log_buf, log_len);
/* put the block */
rt_rbb_blk_put(log_blk);
/* send a notice */
rt_sem_release(&ulog.async_notice);
}
else
{
static rt_bool_t already_output = RT_FALSE;
if (already_output == RT_FALSE)
{
rt_kprintf("Warning: There is no enough buffer for saving async log,"
" please increase the ULOG_ASYNC_OUTPUT_BUF_SIZE option.\n");
already_output = RT_TRUE;
}
}
}
else if (ulog.async_rb)
{
rt_ringbuffer_put(ulog.async_rb, (const rt_uint8_t *)log_buf, log_len);
/* send a notice */ /* send a notice */
rt_sem_release(&ulog.async_notice); rt_sem_release(&ulog.async_notice);
} }
else
{
static rt_bool_t already_output = RT_FALSE;
if (already_output == RT_FALSE)
{
rt_kprintf("Warning: There is no enough buffer for saving async log,"
" please increase the ULOG_ASYNC_OUTPUT_BUF_SIZE option.\n");
already_output = RT_TRUE;
}
}
#else #else
/* is in thread context */ /* is in thread context */
if (rt_interrupt_get_nest() == 0) if (rt_interrupt_get_nest() == 0)
@ -601,6 +613,13 @@ void ulog_raw(const char *format, ...)
RT_ASSERT(ulog.init_ok); RT_ASSERT(ulog.init_ok);
#ifdef ULOG_USING_ASYNC_OUTPUT
if (ulog.async_rb == NULL)
{
ulog.async_rb = rt_ringbuffer_create(ULOG_ASYNC_OUTPUT_BUF_SIZE);
}
#endif
/* get log buffer */ /* get log buffer */
log_buf = get_log_buf(); log_buf = get_log_buf();
@ -1181,7 +1200,7 @@ rt_err_t ulog_backend_register(ulog_backend_t backend, const char *name, rt_bool
backend->support_color = support_color; backend->support_color = support_color;
backend->out_level = LOG_FILTER_LVL_ALL; backend->out_level = LOG_FILTER_LVL_ALL;
rt_memcpy(backend->name, name, RT_NAME_MAX); rt_strncpy(backend->name, name, RT_NAME_MAX);
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
rt_slist_append(&ulog.backend_list, &backend->list); rt_slist_append(&ulog.backend_list, &backend->list);
@ -1236,6 +1255,18 @@ void ulog_async_output(void)
} }
rt_rbb_blk_free(ulog.async_rbb, log_blk); rt_rbb_blk_free(ulog.async_rbb, log_blk);
} }
/* output the log_raw format log */
if (ulog.async_rb)
{
size_t log_len = rt_ringbuffer_data_len(ulog.async_rb);
char *log = rt_malloc(log_len);
if (log)
{
size_t len = rt_ringbuffer_get(ulog.async_rb, (rt_uint8_t *)log, log_len);
ulog_output_to_all_backend(LOG_LVL_DBG, NULL, RT_TRUE, log, len);
rt_free(log);
}
}
} }
/** /**
@ -1390,6 +1421,8 @@ void ulog_deinit(void)
#ifdef ULOG_USING_ASYNC_OUTPUT #ifdef ULOG_USING_ASYNC_OUTPUT
rt_rbb_destroy(ulog.async_rbb); rt_rbb_destroy(ulog.async_rbb);
rt_thread_delete(ulog.async_th); rt_thread_delete(ulog.async_th);
if (ulog.async_rb)
rt_ringbuffer_destroy(ulog.async_rb);
#endif #endif
ulog.init_ok = RT_FALSE; ulog.init_ok = RT_FALSE;