Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
2c33678a
R
rt-thread
项目概览
wwsmg1
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2c33678a
编写于
7月 11, 2013
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix the memory block splitting issue
上级
493930ea
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
22 addition
and
14 deletion
+22
-14
src/memheap.c
src/memheap.c
+22
-14
未找到文件。
src/memheap.c
浏览文件 @
2c33678a
...
...
@@ -25,6 +25,7 @@
* change mutex lock to semaphore lock.
* 2013-04-10 Bernard add rt_memheap_realloc function.
* 2013-05-24 Bernard fix the rt_memheap_realloc issue.
* 2013-07-11 Grissiom fix the memory block splitting issue.
*/
#include <rthw.h>
...
...
@@ -122,7 +123,7 @@ rt_err_t rt_memheap_init(struct rt_memheap *memheap,
rt_sem_init
(
&
(
memheap
->
lock
),
name
,
1
,
RT_IPC_FLAG_FIFO
);
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"memory heap: start addr 0x%08x, size %d, free list header 0x%08x"
,
(
"memory heap: start addr 0x%08x, size %d, free list header 0x%08x
\n
"
,
start_addr
,
size
,
&
(
memheap
->
free_header
)));
return
RT_EOK
;
...
...
@@ -199,7 +200,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_uint32_t size)
(((
rt_uint8_t
*
)
header_ptr
)
+
size
+
RT_MEMHEAP_SIZE
);
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"split: block[0x%08x] nextm[0x%08x] prevm[0x%08x] to new[0x%08x]"
,
(
"split: block[0x%08x] nextm[0x%08x] prevm[0x%08x] to new[0x%08x]
\n
"
,
header_ptr
,
header_ptr
->
next
,
header_ptr
->
prev
,
...
...
@@ -228,7 +229,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_uint32_t size)
new_ptr
->
prev_free
=
heap
->
free_list
;
heap
->
free_list
->
next_free
->
prev_free
=
new_ptr
;
heap
->
free_list
->
next_free
=
new_ptr
;
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"new ptr: next_free 0x%08x, prev_free 0x%08x"
,
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"new ptr: next_free 0x%08x, prev_free 0x%08x
\n
"
,
new_ptr
->
next_free
,
new_ptr
->
prev_free
));
...
...
@@ -248,7 +249,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_uint32_t size)
/* remove header_ptr from free list */
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"one block: block[0x%08x], next_free 0x%08x, prev_free 0x%08x"
,
(
"one block: block[0x%08x], next_free 0x%08x, prev_free 0x%08x
\n
"
,
header_ptr
,
header_ptr
->
next_free
,
header_ptr
->
prev_free
));
...
...
@@ -267,12 +268,12 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_uint32_t size)
/* Return a memory address to the caller. */
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"alloc mem: memory[0x%08x], heap[0x%08x], size: %d"
,
(
"alloc mem: memory[0x%08x], heap[0x%08x], size: %d
\n
"
,
(
void
*
)((
rt_uint8_t
*
)
header_ptr
+
RT_MEMHEAP_SIZE
),
header_ptr
,
size
);
size
)
)
;
return
(
void
*
)((
rt_uint8_t
*
)
header_ptr
+
RT_MEMHEAP_SIZE
)
)
;
return
(
void
*
)((
rt_uint8_t
*
)
header_ptr
+
RT_MEMHEAP_SIZE
);
}
/* release lock */
...
...
@@ -328,6 +329,10 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
return
new_ptr
;
}
/* don't split when there is less than one node space left */
if
(
newsize
+
RT_MEMHEAP_SIZE
+
RT_MEMHEAP_MINIALLOC
>=
oldsize
)
return
ptr
;
/* lock memheap */
result
=
rt_sem_take
(
&
(
heap
->
lock
),
RT_WAITING_FOREVER
);
if
(
result
!=
RT_EOK
)
...
...
@@ -342,7 +347,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
(((
rt_uint8_t
*
)
header_ptr
)
+
newsize
+
RT_MEMHEAP_SIZE
);
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"split: block[0x%08x] nextm[0x%08x] prevm[0x%08x] to new[0x%08x]"
,
(
"split: block[0x%08x] nextm[0x%08x] prevm[0x%08x] to new[0x%08x]
\n
"
,
header_ptr
,
header_ptr
->
next
,
header_ptr
->
prev
,
...
...
@@ -369,7 +374,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
heap
->
available_size
=
heap
->
available_size
-
MEMITEM_SIZE
(
free_ptr
);
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"merge: right node 0x%08x, next_free 0x%08x, prev_free 0x%08x"
,
(
"merge: right node 0x%08x, next_free 0x%08x, prev_free 0x%08x
\n
"
,
header_ptr
,
header_ptr
->
next_free
,
header_ptr
->
prev_free
));
free_ptr
->
next
->
prev
=
new_ptr
;
...
...
@@ -385,7 +390,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
new_ptr
->
prev_free
=
heap
->
free_list
;
heap
->
free_list
->
next_free
->
prev_free
=
new_ptr
;
heap
->
free_list
->
next_free
=
new_ptr
;
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"new free ptr: next_free 0x%08x, prev_free 0x%08x"
,
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"new free ptr: next_free 0x%08x, prev_free 0x%08x
\n
"
,
new_ptr
->
next_free
,
new_ptr
->
prev_free
));
...
...
@@ -407,13 +412,16 @@ void rt_memheap_free(void *ptr)
struct
rt_memheap_item
*
header_ptr
,
*
new_ptr
;
rt_uint32_t
insert_header
;
/* NULL check */
if
(
ptr
==
RT_NULL
)
return
;
/* set initial status as OK */
insert_header
=
1
;
new_ptr
=
RT_NULL
;
header_ptr
=
(
struct
rt_memheap_item
*
)
((
rt_uint8_t
*
)
ptr
-
RT_MEMHEAP_SIZE
);
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"free memory: memory[0x%08x], block[0x%08x]"
,
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"free memory: memory[0x%08x], block[0x%08x]
\n
"
,
ptr
,
header_ptr
));
/* check magic */
...
...
@@ -439,7 +447,7 @@ void rt_memheap_free(void *ptr)
/* Determine if the block can be merged with the previous neighbor. */
if
(
!
RT_MEMHEAP_IS_USED
(
header_ptr
->
prev
))
{
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"merge: left node 0x%08x"
,
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"merge: left node 0x%08x
\n
"
,
header_ptr
->
prev
));
/* adjust the available number of bytes. */
...
...
@@ -465,7 +473,7 @@ void rt_memheap_free(void *ptr)
new_ptr
=
header_ptr
->
next
;
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"merge: right node 0x%08x, next_free 0x%08x, prev_free 0x%08x"
,
(
"merge: right node 0x%08x, next_free 0x%08x, prev_free 0x%08x
\n
"
,
new_ptr
,
new_ptr
->
next_free
,
new_ptr
->
prev_free
));
new_ptr
->
next
->
prev
=
header_ptr
;
...
...
@@ -485,7 +493,7 @@ void rt_memheap_free(void *ptr)
heap
->
free_list
->
next_free
=
header_ptr
;
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"insert to free list: next_free 0x%08x, prev_free 0x%08x"
,
(
"insert to free list: next_free 0x%08x, prev_free 0x%08x
\n
"
,
header_ptr
->
next_free
,
header_ptr
->
prev_free
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录