Skip to content

[ulog] Fixed the problem of abnormal log output at the INIT_BOARD_EXP… #5589

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
merged 3 commits into from
Feb 10, 2022
Merged

[ulog] Fixed the problem of abnormal log output at the INIT_BOARD_EXP… #5589

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cf7e12
[ulog] Fixed the problem of abnormal log output at the INIT_BOARD_EXP…
Guozhanxin Feb 9, 2022
e17e6c0
[fix] memheap using assertions before scheduler starts.
Guozhanxin Feb 9, 2022
7a428ef
[ulog] Optimize code to improve readability.
Guozhanxin Feb 10, 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
15 changes: 11 additions & 4 deletions components/utilities/ulog/ulog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ static void output_unlock(void)
if (!ulog.output_lock_enabled)
return;

/* is in thread context */
if (rt_interrupt_get_nest() == 0)
/* If the scheduler is started and in thread context */
if (rt_thread_self() && (rt_interrupt_get_nest() == 0))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rt_thread_self() != RT_NULL
这样写更清楚一些吧

{
rt_sem_release(&ulog.output_locker);
}
Expand All @@ -208,8 +208,8 @@ static void output_lock(void)
if (!ulog.output_lock_enabled)
return;

/* is in thread context */
if (rt_interrupt_get_nest() == 0)
/* If the scheduler is started and in thread context */
if (rt_thread_self() && (rt_interrupt_get_nest() == 0))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rt_thread_self() != RT_NULL

{
rt_sem_take(&ulog.output_locker, RT_WAITING_FOREVER);
}
Expand Down Expand Up @@ -429,6 +429,13 @@ void ulog_output_to_all_backend(rt_uint32_t level, const char *tag, rt_bool_t is
if (!ulog.init_ok)
return;

/* if there is no backend */
if (!rt_slist_first(&ulog.backend_list))
{
rt_kputs(log);
return;
}

/* output for all backends */
for (node = rt_slist_first(&ulog.backend_list); node; node = rt_slist_next(node))
{
Expand Down
24 changes: 12 additions & 12 deletions src/memheap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size)
free_size = 0;

/* lock memheap */
if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER);
if (result != RT_EOK)
Expand Down Expand Up @@ -316,7 +316,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size)
rt_memcpy(header_ptr->owner_thread_name, "NONE", sizeof(header_ptr->owner_thread_name));
#endif /* RT_USING_MEMTRACE */

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* release lock */
rt_sem_release(&(heap->lock));
Expand All @@ -332,7 +332,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size)
return (void *)((rt_uint8_t *)header_ptr + RT_MEMHEAP_SIZE);
}

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* release lock */
rt_sem_release(&(heap->lock));
Expand Down Expand Up @@ -394,7 +394,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
void *new_ptr;
struct rt_memheap_item *next_ptr;

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* lock memheap */
result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER);
Expand Down Expand Up @@ -475,7 +475,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("new ptr: next_free 0x%08x, prev_free 0x%08x",
next_ptr->next_free,
next_ptr->prev_free));
if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* release lock */
rt_sem_release(&(heap->lock));
Expand All @@ -485,7 +485,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
}
}

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* release lock */
rt_sem_release(&(heap->lock));
Expand All @@ -506,7 +506,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
if (newsize + RT_MEMHEAP_SIZE + RT_MEMHEAP_MINIALLOC >= oldsize)
return ptr;

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* lock memheap */
result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER);
Expand Down Expand Up @@ -577,7 +577,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
/* increment the available byte count. */
heap->available_size = heap->available_size + MEMITEM_SIZE(new_ptr);

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* release lock */
rt_sem_release(&(heap->lock));
Expand Down Expand Up @@ -630,7 +630,7 @@ void rt_memheap_free(void *ptr)
RT_ASSERT(heap);
RT_ASSERT(rt_object_get_type(&heap->parent) == RT_Object_Class_MemHeap);

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* lock memheap */
result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER);
Expand Down Expand Up @@ -716,7 +716,7 @@ void rt_memheap_free(void *ptr)
rt_memset(header_ptr->owner_thread_name, ' ', sizeof(header_ptr->owner_thread_name));
#endif /* RT_USING_MEMTRACE */

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* release lock */
rt_sem_release(&(heap->lock));
Expand Down Expand Up @@ -744,7 +744,7 @@ void rt_memheap_info(struct rt_memheap *heap,
{
rt_err_t result;

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* lock memheap */
result = rt_sem_take(&(heap->lock), RT_WAITING_FOREVER);
Expand All @@ -764,7 +764,7 @@ void rt_memheap_info(struct rt_memheap *heap,
if (max_used != RT_NULL)
*max_used = heap->max_used_size;

if (heap->locked == RT_FALSE)
if (heap->locked == RT_FALSE && rt_thread_self() != RT_NULL)
{
/* release lock */
rt_sem_release(&(heap->lock));
Expand Down