Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2345VOR
rt-thread
提交
615824b5
R
rt-thread
项目概览
2345VOR
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
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,发现更多精彩内容 >>
提交
615824b5
编写于
2月 09, 2022
作者:
G
guozhanxin
提交者:
guo
2月 10, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[fix] memheap using assertions before scheduler starts.
上级
26c51147
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
12 deletion
+12
-12
src/memheap.c
src/memheap.c
+12
-12
未找到文件。
src/memheap.c
浏览文件 @
615824b5
...
...
@@ -203,7 +203,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size)
free_size
=
0
;
/* lock memheap */
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
result
=
rt_sem_take
(
&
(
heap
->
lock
),
RT_WAITING_FOREVER
);
if
(
result
!=
RT_EOK
)
...
...
@@ -316,7 +316,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size)
rt_memcpy
(
header_ptr
->
owner_thread_name
,
"NONE"
,
sizeof
(
header_ptr
->
owner_thread_name
));
#endif
/* RT_USING_MEMTRACE */
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* release lock */
rt_sem_release
(
&
(
heap
->
lock
));
...
...
@@ -332,7 +332,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size)
return
(
void
*
)((
rt_uint8_t
*
)
header_ptr
+
RT_MEMHEAP_SIZE
);
}
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* release lock */
rt_sem_release
(
&
(
heap
->
lock
));
...
...
@@ -394,7 +394,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
void
*
new_ptr
;
struct
rt_memheap_item
*
next_ptr
;
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* lock memheap */
result
=
rt_sem_take
(
&
(
heap
->
lock
),
RT_WAITING_FOREVER
);
...
...
@@ -475,7 +475,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
RT_DEBUG_LOG
(
RT_DEBUG_MEMHEAP
,
(
"new ptr: next_free 0x%08x, prev_free 0x%08x"
,
next_ptr
->
next_free
,
next_ptr
->
prev_free
));
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* release lock */
rt_sem_release
(
&
(
heap
->
lock
));
...
...
@@ -485,7 +485,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
}
}
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* release lock */
rt_sem_release
(
&
(
heap
->
lock
));
...
...
@@ -506,7 +506,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
if
(
newsize
+
RT_MEMHEAP_SIZE
+
RT_MEMHEAP_MINIALLOC
>=
oldsize
)
return
ptr
;
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* lock memheap */
result
=
rt_sem_take
(
&
(
heap
->
lock
),
RT_WAITING_FOREVER
);
...
...
@@ -577,7 +577,7 @@ void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
/* increment the available byte count. */
heap
->
available_size
=
heap
->
available_size
+
MEMITEM_SIZE
(
new_ptr
);
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* release lock */
rt_sem_release
(
&
(
heap
->
lock
));
...
...
@@ -630,7 +630,7 @@ void rt_memheap_free(void *ptr)
RT_ASSERT
(
heap
);
RT_ASSERT
(
rt_object_get_type
(
&
heap
->
parent
)
==
RT_Object_Class_MemHeap
);
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* lock memheap */
result
=
rt_sem_take
(
&
(
heap
->
lock
),
RT_WAITING_FOREVER
);
...
...
@@ -716,7 +716,7 @@ void rt_memheap_free(void *ptr)
rt_memset
(
header_ptr
->
owner_thread_name
,
' '
,
sizeof
(
header_ptr
->
owner_thread_name
));
#endif
/* RT_USING_MEMTRACE */
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* release lock */
rt_sem_release
(
&
(
heap
->
lock
));
...
...
@@ -744,7 +744,7 @@ void rt_memheap_info(struct rt_memheap *heap,
{
rt_err_t
result
;
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* lock memheap */
result
=
rt_sem_take
(
&
(
heap
->
lock
),
RT_WAITING_FOREVER
);
...
...
@@ -764,7 +764,7 @@ void rt_memheap_info(struct rt_memheap *heap,
if
(
max_used
!=
RT_NULL
)
*
max_used
=
heap
->
max_used_size
;
if
(
heap
->
locked
==
RT_FALSE
)
if
(
heap
->
locked
==
RT_FALSE
&&
rt_thread_self
()
!=
RT_NULL
)
{
/* release lock */
rt_sem_release
(
&
(
heap
->
lock
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录