chinky/rtt-f030
chinky/rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix zone release bug

Browse Source 
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1209 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
qiuyiuestc 2010-12-18 00:46:02 +00:00
parent 6565e9511b
commit 5b440a3429
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slab.c
View File

@ -12,6 +12,7 @@
* 2008-07-12 Bernard the first version * 2008-07-12 Bernard the first version
* 2010-07-13 Bernard fix RT_ALIGN issue found by kuronca * 2010-07-13 Bernard fix RT_ALIGN issue found by kuronca
* 2010-10-23 yi.qiu add module memory allocator * 2010-10-23 yi.qiu add module memory allocator
* 2010-12-18 yi.qiu fix zone release bug
*/ */
/* /*
@ -507,7 +508,6 @@ void *rt_malloc(rt_size_t size)
slab_zone *z; slab_zone *z;
rt_int32_t zi; rt_int32_t zi;
slab_chunk *chunk; slab_chunk *chunk;
rt_base_t interrupt_level;
struct memusage *kup; struct memusage *kup;
/* zero size, return RT_NULL */ /* zero size, return RT_NULL */
@ -818,7 +818,7 @@ void rt_free(void *ptr)
/* get memory usage */ /* get memory usage */
#ifdef RT_SLAB_DEBUG #ifdef RT_SLAB_DEBUG
{ {
rt_uint32 addr = ((rt_uint32_t)ptr & ~RT_MM_PAGE_MASK); rt_uint32_t addr = ((rt_uint32_t)ptr & ~RT_MM_PAGE_MASK);
rt_kprintf("free a memory 0x%x and align to 0x%x, kup index %d\n", rt_kprintf("free a memory 0x%x and align to 0x%x, kup index %d\n",
(rt_uint32_t)ptr, (rt_uint32_t)ptr,
(rt_uint32_t)addr, (rt_uint32_t)addr,
@ -926,7 +926,7 @@ void rt_free(void *ptr)
rt_sem_release(&heap_sem); rt_sem_release(&heap_sem);
/* release pages */ /* release pages */
rt_page_free(z, zone_size); rt_page_free(z, zone_size / RT_MM_PAGE_SIZE);
return; return;
} }
} }