diff options
| -rw-r--r-- | include/rtthread.h | 1 | ||||
| -rw-r--r-- | src/memheap.c | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/rtthread.h b/include/rtthread.h index be43f36ec9..4b81464f18 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -242,6 +242,7 @@ rt_err_t rt_memheap_init(struct rt_memheap *memheap, rt_uint32_t size); rt_err_t rt_memheap_detach(struct rt_memheap *heap); void* rt_memheap_alloc(struct rt_memheap *heap, rt_uint32_t size); +void *rt_memheap_realloc(struct rt_memheap* heap, void* ptr, rt_size_t newsize); void rt_memheap_free(void *ptr); #endif diff --git a/src/memheap.c b/src/memheap.c index 941c73b9e2..59a499e8db 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -13,6 +13,7 @@ * 2012-10-16 Bernard add the mutex lock for heap object. * 2012-12-29 Bernard memheap can be used as system heap. * change mutex lock to semaphore lock. + * 2013-04-10 Bernard add rt_memheap_realloc function. */ #include <rthw.h> @@ -277,6 +278,27 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_uint32_t size) } RTM_EXPORT(rt_memheap_alloc); +void *rt_memheap_realloc(struct rt_memheap* heap, void* ptr, rt_size_t newsize) +{ + void* new_ptr; + if (newsize == 0) + { + rt_memheap_free(ptr); + } + + if (ptr == RT_NULL) + { + return rt_memheap_alloc(heap, newsize); + } + + new_ptr = rt_memheap_alloc(heap, newsize); + if (new_ptr == RT_NULL) return RT_NULL; + + rt_memcpy(new_ptr, ptr, newsize); + return new_ptr; +} +RTM_EXPORT(rt_memheap_realloc); + void rt_memheap_free(void *ptr) { rt_err_t result; |