Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mr_Pangza
rt-thread
提交
266496ce
R
rt-thread
项目概览
Mr_Pangza
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
2
Star
1
Fork
1
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
266496ce
编写于
8月 03, 2015
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Kernel] Use rt_assert_handler() function to handle assertion.
上级
abd19b8d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
40 addition
and
8 deletion
+40
-8
include/rtdebug.h
include/rtdebug.h
+1
-8
include/rtthread.h
include/rtthread.h
+2
-0
src/kservice.c
src/kservice.c
+37
-0
未找到文件。
include/rtdebug.h
浏览文件 @
266496ce
...
@@ -83,14 +83,7 @@ while (0)
...
@@ -83,14 +83,7 @@ while (0)
#define RT_ASSERT(EX) \
#define RT_ASSERT(EX) \
if (!(EX)) \
if (!(EX)) \
{ \
{ \
volatile char dummy = 0; \
rt_assert_handler(#EX, __FUNCTION__, __LINE__); \
if (rt_assert_hook == RT_NULL) \
{ \
rt_kprintf("(%s) assert failed at %s:%d \n", #EX, __FUNCTION__, __LINE__);\
while (dummy == 0); \
} else { \
rt_assert_hook(#EX, __FUNCTION__, __LINE__); \
} \
}
}
/* Macro to check current context */
/* Macro to check current context */
...
...
include/rtthread.h
浏览文件 @
266496ce
...
@@ -518,6 +518,8 @@ void rt_show_version(void);
...
@@ -518,6 +518,8 @@ void rt_show_version(void);
#ifdef RT_DEBUG
#ifdef RT_DEBUG
extern
void
(
*
rt_assert_hook
)(
const
char
*
ex
,
const
char
*
func
,
rt_size_t
line
);
extern
void
(
*
rt_assert_hook
)(
const
char
*
ex
,
const
char
*
func
,
rt_size_t
line
);
void
rt_assert_set_hook
(
void
(
*
hook
)(
const
char
*
ex
,
const
char
*
func
,
rt_size_t
line
));
void
rt_assert_set_hook
(
void
(
*
hook
)(
const
char
*
ex
,
const
char
*
func
,
rt_size_t
line
));
void
rt_assert_handler
(
const
char
*
ex
,
const
char
*
func
,
rt_size_t
line
);
#endif
/* RT_DEBUG */
#endif
/* RT_DEBUG */
/*@}*/
/*@}*/
...
...
src/kservice.c
浏览文件 @
266496ce
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
* 2012-12-22 Bernard fix rt_kprintf issue, which found by Grissiom.
* 2012-12-22 Bernard fix rt_kprintf issue, which found by Grissiom.
* 2013-06-24 Bernard remove rt_kprintf if RT_USING_CONSOLE is not defined.
* 2013-06-24 Bernard remove rt_kprintf if RT_USING_CONSOLE is not defined.
* 2013-09-24 aozima make sure the device is in STREAM mode when used by rt_kprintf.
* 2013-09-24 aozima make sure the device is in STREAM mode when used by rt_kprintf.
* 2015-07-06 Bernard Add rt_assert_handler routine.
*/
*/
#include <rtthread.h>
#include <rtthread.h>
...
@@ -1248,6 +1249,42 @@ void (*rt_assert_hook)(const char* ex, const char* func, rt_size_t line);
...
@@ -1248,6 +1249,42 @@ void (*rt_assert_hook)(const char* ex, const char* func, rt_size_t line);
void
rt_assert_set_hook
(
void
(
*
hook
)(
const
char
*
ex
,
const
char
*
func
,
rt_size_t
line
))
{
void
rt_assert_set_hook
(
void
(
*
hook
)(
const
char
*
ex
,
const
char
*
func
,
rt_size_t
line
))
{
rt_assert_hook
=
hook
;
rt_assert_hook
=
hook
;
}
}
/**
* The RT_ASSERT function.
*
* @param ex the assertion condition string
* @param func the function name when assertion.
* @param line the file line number when assertion.
*/
void
rt_assert_handler
(
const
char
*
ex_string
,
const
char
*
func
,
rt_size_t
line
)
{
volatile
char
dummy
=
0
;
if
(
rt_assert_hook
==
RT_NULL
)
{
#ifdef RT_USING_MODULE
if
(
rt_module_self
()
!=
RT_NULL
)
{
/* unload assertion module */
rt_module_unload
(
rt_module_self
());
/* re-schedule */
rt_schedule
();
}
else
#endif
{
rt_kprintf
(
"(%s) assertion failed at function:%s, line number:%d
\n
"
,
ex_string
,
func
,
line
);
while
(
dummy
==
0
);
}
}
else
{
rt_assert_hook
(
ex_string
,
func
,
line
);
}
}
RTM_EXPORT
(
rt_assert_handler
);
#endif
/* RT_DEBUG */
#endif
/* RT_DEBUG */
#if !defined (RT_USING_NEWLIB) && defined (RT_USING_MINILIBC) && defined (__GNUC__)
#if !defined (RT_USING_NEWLIB) && defined (RT_USING_MINILIBC) && defined (__GNUC__)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录