Skip to content
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

Jump to bottom

[kernel] Revert modifications to the semaphore #5682

Merged
merged 1 commit into from
Mar 17, 2022
Merged

[kernel] Revert modifications to the semaphore #5682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/ipc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,9 +485,6 @@ rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t time)
RT_ASSERT(sem != RT_NULL);
RT_ASSERT(rt_object_get_type(&sem->parent.parent) == RT_Object_Class_Semaphore);

/* current context checking */
RT_DEBUG_SCHEDULER_AVAILABLE(time != 0);

RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(sem->parent.parent)));

/* disable interrupt */
Expand Down Expand Up @@ -517,6 +514,9 @@ rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t time)
}
else
{
/* current context checking */
RT_DEBUG_SCHEDULER_AVAILABLE(RT_TRUE);

/* semaphore is unavailable, push to suspend list */
/* get current thread */
thread = rt_thread_self();
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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* 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 && rt_thread_self() != RT_NULL)
if (heap->locked == RT_FALSE)
{
/* release lock */
rt_sem_release(&(heap->lock));
Expand Down