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

[kernel] update memheap auto binding policy.

This commit is contained in:
aozima 2021-07-14 22:08:30 +08:00
parent 00221bd43f
commit 2e5b4736fe
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Kconfig
View File

@ -268,11 +268,18 @@ menu "Memory Management"
help help
Using static memory fixed partition Using static memory fixed partition
config RT_USING_MEMHEAP menuconfig RT_USING_MEMHEAP
bool "Using memory heap object" bool "Using memory heap object"
default n default n
help
Using memory heap object to manage dynamic memory heap. if RT_USING_MEMHEAP
if RT_USING_MEMHEAP_AS_HEAP
config RT_USING_MEMHEAP_AUTO_BINDING
bool "Use all of memheap objects as heap"
default y
endif
endif
choice choice
prompt "Dynamic Memory Management" prompt "Dynamic Memory Management"
@ -289,7 +296,7 @@ menu "Memory Management"
if RT_USING_MEMHEAP if RT_USING_MEMHEAP
config RT_USING_MEMHEAP_AS_HEAP config RT_USING_MEMHEAP_AS_HEAP
bool "Use all of memheap objects as heap" bool "Use memheap objects as heap"
endif endif
config RT_USING_USERHEAP config RT_USING_USERHEAP

2
src/memheap.c
View File

@ -852,6 +852,7 @@ void *rt_malloc(rt_size_t size)
/* try to allocate in system heap */ /* try to allocate in system heap */
ptr = rt_memheap_alloc(&_heap, size); ptr = rt_memheap_alloc(&_heap, size);
#ifdef RT_USING_MEMHEAP_AUTO_BINDING
if (ptr == RT_NULL) if (ptr == RT_NULL)
{ {
struct rt_object *object; struct rt_object *object;
@ -881,6 +882,7 @@ void *rt_malloc(rt_size_t size)
break; break;
} }
} }
#endif /* RT_USING_MEMHEAP_AUTO_BINDING */
#ifdef RT_USING_MEMTRACE #ifdef RT_USING_MEMTRACE
if (ptr == RT_NULL) if (ptr == RT_NULL)