diff options
| author | dzzxzz <[email protected]> | 2011-09-21 03:56:42 +0000 |
|---|---|---|
| committer | dzzxzz <[email protected]> | 2011-09-21 03:56:42 +0000 |
| commit | c0f80bdf9a7fc66776fcb1ab5f94ef6af06fd17f (patch) | |
| tree | bb688f8017547fe23cb2879b85090f84f8b4f5c1 /src/mempool.c | |
| parent | fea7d02bfd41a73be2d4fb2c0ecfe2b8628be68b (diff) | |
cleanup kernel code
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1715 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'src/mempool.c')
| -rw-r--r-- | src/mempool.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/mempool.c b/src/mempool.c index df6ece85fe..473d324ad4 100644 --- a/src/mempool.c +++ b/src/mempool.c @@ -1,7 +1,7 @@ /* * File : mempool.c * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team + * COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -27,8 +27,8 @@ #ifdef RT_USING_MEMPOOL #ifdef RT_USING_HOOK -static void (*rt_mp_alloc_hook)(struct rt_mempool* mp, void *block); -static void (*rt_mp_free_hook)(struct rt_mempool* mp, void *block); +static void (*rt_mp_alloc_hook)(struct rt_mempool *mp, void *block); +static void (*rt_mp_free_hook)(struct rt_mempool *mp, void *block); /** * @addtogroup Hook @@ -41,7 +41,7 @@ static void (*rt_mp_free_hook)(struct rt_mempool* mp, void *block); * * @param hook the hook function */ -void rt_mp_alloc_sethook(void (*hook)(struct rt_mempool* mp, void *block)) +void rt_mp_alloc_sethook(void (*hook)(struct rt_mempool *mp, void *block)) { rt_mp_alloc_hook = hook; } @@ -52,7 +52,7 @@ void rt_mp_alloc_sethook(void (*hook)(struct rt_mempool* mp, void *block)) * * @param hook the hook function */ -void rt_mp_free_sethook(void (*hook)(struct rt_mempool* mp, void *block)) +void rt_mp_free_sethook(void (*hook)(struct rt_mempool *mp, void *block)) { rt_mp_free_hook = hook; } @@ -79,7 +79,7 @@ void rt_mp_free_sethook(void (*hook)(struct rt_mempool* mp, void *block)) * @return RT_EOK * */ -rt_err_t rt_mp_init(struct rt_mempool* mp, const char* name, void *start, rt_size_t size, rt_size_t block_size) +rt_err_t rt_mp_init(struct rt_mempool *mp, const char *name, void *start, rt_size_t size, rt_size_t block_size) { rt_uint8_t *block_ptr; register rt_base_t offset; @@ -97,7 +97,7 @@ rt_err_t rt_mp_init(struct rt_mempool* mp, const char* name, void *start, rt_siz mp->block_size = block_size; /* align to align size byte */ - mp->block_total_count = mp->size / (mp->block_size + sizeof(rt_uint8_t*)); + mp->block_total_count = mp->size / (mp->block_size + sizeof(rt_uint8_t *)); mp->block_free_count = mp->block_total_count; /* init suspended thread list */ @@ -105,14 +105,14 @@ rt_err_t rt_mp_init(struct rt_mempool* mp, const char* name, void *start, rt_siz mp->suspend_thread_count = 0; /* init free block list */ - block_ptr = (rt_uint8_t*) mp->start_address; + block_ptr = (rt_uint8_t *)mp->start_address; for (offset = 0; offset < mp->block_total_count; offset ++) { - *(rt_uint8_t**)(block_ptr + offset * (block_size + sizeof(rt_uint8_t*))) - = (rt_uint8_t*)(block_ptr + (offset + 1) * (block_size + sizeof(rt_uint8_t*))); + *(rt_uint8_t **)(block_ptr + offset * (block_size + sizeof(rt_uint8_t *))) + = (rt_uint8_t *)(block_ptr + (offset + 1) * (block_size + sizeof(rt_uint8_t *))); } - *(rt_uint8_t**)(block_ptr + (offset - 1) * (block_size + sizeof(rt_uint8_t*))) = RT_NULL; + *(rt_uint8_t **)(block_ptr + (offset - 1) * (block_size + sizeof(rt_uint8_t *))) = RT_NULL; mp->block_list = block_ptr; @@ -126,9 +126,9 @@ rt_err_t rt_mp_init(struct rt_mempool* mp, const char* name, void *start, rt_siz * * @return RT_EOK */ -rt_err_t rt_mp_detach(struct rt_mempool* mp) +rt_err_t rt_mp_detach(struct rt_mempool *mp) { - struct rt_thread* thread; + struct rt_thread *thread; register rt_ubase_t temp; /* parameter check */ @@ -176,24 +176,24 @@ rt_err_t rt_mp_detach(struct rt_mempool* mp) * @return the created mempool object * */ -rt_mp_t rt_mp_create(const char* name, rt_size_t block_count, rt_size_t block_size) +rt_mp_t rt_mp_create(const char *name, rt_size_t block_count, rt_size_t block_size) { rt_uint8_t *block_ptr; - struct rt_mempool* mp; + struct rt_mempool *mp; register rt_base_t offset; RT_DEBUG_NOT_IN_INTERRUPT; /* allocate object */ - mp = (struct rt_mempool*)rt_object_allocate(RT_Object_Class_MemPool, name); + mp = (struct rt_mempool *)rt_object_allocate(RT_Object_Class_MemPool, name); if (mp == RT_NULL) return RT_NULL; /* allocate object failed */ /* init memory pool */ mp->block_size = RT_ALIGN(block_size, RT_ALIGN_SIZE); - mp->size = (block_size + sizeof(rt_uint8_t*))* block_count; + mp->size = (block_size + sizeof(rt_uint8_t *)) * block_count; /* allocate memory */ - mp->start_address = rt_malloc((block_size + sizeof(rt_uint8_t*))* block_count); + mp->start_address = rt_malloc((block_size + sizeof(rt_uint8_t *)) * block_count); if (mp->start_address == RT_NULL) { /* no memory, delete memory pool object */ @@ -210,14 +210,14 @@ rt_mp_t rt_mp_create(const char* name, rt_size_t block_count, rt_size_t block_si mp->suspend_thread_count = 0; /* init free block list */ - block_ptr = (rt_uint8_t*) mp->start_address; + block_ptr = (rt_uint8_t *)mp->start_address; for (offset = 0; offset < mp->block_total_count; offset ++) { - *(rt_uint8_t**)(block_ptr + offset * (block_size + sizeof(rt_uint8_t*))) - = block_ptr + (offset + 1) * (block_size + sizeof(rt_uint8_t*)); + *(rt_uint8_t **)(block_ptr + offset * (block_size + sizeof(rt_uint8_t *))) + = block_ptr + (offset + 1) * (block_size + sizeof(rt_uint8_t *)); } - *(rt_uint8_t**)(block_ptr + (offset - 1) * (block_size + sizeof(rt_uint8_t*))) = RT_NULL; + *(rt_uint8_t **)(block_ptr + (offset - 1) * (block_size + sizeof(rt_uint8_t *))) = RT_NULL; mp->block_list = block_ptr; @@ -234,7 +234,7 @@ rt_mp_t rt_mp_create(const char* name, rt_size_t block_count, rt_size_t block_si */ rt_err_t rt_mp_delete(rt_mp_t mp) { - struct rt_thread* thread; + struct rt_thread *thread; register rt_ubase_t temp; RT_DEBUG_NOT_IN_INTERRUPT; @@ -269,7 +269,7 @@ rt_err_t rt_mp_delete(rt_mp_t mp) #if defined(RT_USING_MODULE) && defined(RT_USING_SLAB) /* the mp object belongs to an application module */ - if(mp->parent.flag & RT_OBJECT_FLAG_MODULE) + if (mp->parent.flag & RT_OBJECT_FLAG_MODULE) rt_module_free(mp->parent.module_id, mp->start_address); else #endif @@ -293,26 +293,26 @@ rt_err_t rt_mp_delete(rt_mp_t mp) * @return the allocated memory block or RT_NULL on allocated failed * */ -void *rt_mp_alloc (rt_mp_t mp, rt_int32_t time) +void *rt_mp_alloc(rt_mp_t mp, rt_int32_t time) { - rt_uint8_t* block_ptr; + rt_uint8_t *block_ptr; register rt_base_t level; - struct rt_thread* thread; + struct rt_thread *thread; /* disable interrupt */ level = rt_hw_interrupt_disable(); - if(mp->block_free_count) + if (mp->block_free_count) { /* memory block is available. decrease the free block counter */ - mp->block_free_count--; + mp->block_free_count --; /* get block from block list */ block_ptr = mp->block_list; - mp->block_list = *(rt_uint8_t**)block_ptr; + mp->block_list = *(rt_uint8_t **)block_ptr; /* point to memory pool */ - *(rt_uint8_t**)block_ptr = (rt_uint8_t*)mp; + *(rt_uint8_t **)block_ptr = (rt_uint8_t *)mp; } else { @@ -333,7 +333,7 @@ void *rt_mp_alloc (rt_mp_t mp, rt_int32_t time) /* need suspend thread */ rt_thread_suspend(thread); rt_list_insert_after(&(mp->suspend_thread), &(thread->tlist)); - mp->suspend_thread_count++; + mp->suspend_thread_count ++; if (time > 0) { @@ -358,19 +358,19 @@ void *rt_mp_alloc (rt_mp_t mp, rt_int32_t time) /* get block from block list */ block_ptr = mp->block_list; - mp->block_list = *(rt_uint8_t**)block_ptr; + mp->block_list = *(rt_uint8_t **)block_ptr; /* point to memory pool */ - *(rt_uint8_t**)block_ptr = (rt_uint8_t*)mp; + *(rt_uint8_t **)block_ptr = (rt_uint8_t *)mp; } } /* enable interrupt */ rt_hw_interrupt_enable(level); - RT_OBJECT_HOOK_CALL(rt_mp_alloc_hook, (mp, (rt_uint8_t*)(block_ptr + sizeof(rt_uint8_t*)))); + RT_OBJECT_HOOK_CALL(rt_mp_alloc_hook, (mp, (rt_uint8_t *)(block_ptr + sizeof(rt_uint8_t *)))); - return (rt_uint8_t*)(block_ptr + sizeof(rt_uint8_t*)); + return (rt_uint8_t *)(block_ptr + sizeof(rt_uint8_t *)); } /** @@ -379,7 +379,7 @@ void *rt_mp_alloc (rt_mp_t mp, rt_int32_t time) * @param block the address of memory block to be released * */ -void rt_mp_free (void *block) +void rt_mp_free(void *block) { rt_uint8_t **block_ptr; struct rt_mempool *mp; @@ -387,8 +387,8 @@ void rt_mp_free (void *block) register rt_base_t level; /* get the control block of pool which the block belongs to */ - block_ptr = (rt_uint8_t**)((rt_uint8_t*)block - sizeof(rt_uint8_t*)); - mp = (struct rt_mempool*) *block_ptr; + block_ptr = (rt_uint8_t **)((rt_uint8_t *)block - sizeof(rt_uint8_t *)); + mp = (struct rt_mempool *)*block_ptr; RT_OBJECT_HOOK_CALL(rt_mp_free_hook, (mp, block)); @@ -400,7 +400,7 @@ void rt_mp_free (void *block) /* link the block into the block list */ *block_ptr = mp->block_list; - mp->block_list = (rt_uint8_t*)block_ptr; + mp->block_list = (rt_uint8_t *)block_ptr; if (mp->suspend_thread_count > 0) { |
