libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[Kernel] Fix sem_release twice issue in slab.

This commit is contained in:
bernard 2017-10-31 11:38:28 +08:00
parent d615bebb7c
commit c733086354
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slab.c
View File

@ -616,7 +616,10 @@ void *rt_malloc(rt_size_t size)
/* allocate a zone from page */ /* allocate a zone from page */
z = rt_page_alloc(zone_size / RT_MM_PAGE_SIZE); z = rt_page_alloc(zone_size / RT_MM_PAGE_SIZE);
if (z == RT_NULL) if (z == RT_NULL)
goto fail; {
chunk = RT_NULL;
goto __exit;
}
/* lock heap */ /* lock heap */
rt_sem_take(&heap_sem, RT_WAITING_FOREVER); rt_sem_take(&heap_sem, RT_WAITING_FOREVER);
@ -672,15 +675,10 @@ void *rt_malloc(rt_size_t size)
done: done:
rt_sem_release(&heap_sem); rt_sem_release(&heap_sem);
RT_OBJECT_HOOK_CALL(rt_malloc_hook, ((char *)chunk, size)); RT_OBJECT_HOOK_CALL(rt_malloc_hook, ((char *)chunk, size));
__exit:
return chunk; return chunk;
fail:
rt_sem_release(&heap_sem);
return RT_NULL;
} }
RTM_EXPORT(rt_malloc); RTM_EXPORT(rt_malloc);