Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
人间散章
rt-thread
提交
bfde3803
R
rt-thread
项目概览
人间散章
/
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,发现更多精彩内容 >>
未验证
提交
bfde3803
编写于
2月 13, 2021
作者:
B
Bernard Xiong
提交者:
GitHub
2月 13, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4334 from mysterywolf/exit
[libc][exit][abort] 重新实现exit和abort函数
上级
d1d2d3a2
652d98bc
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
90 addition
and
19 deletion
+90
-19
components/libc/compilers/armlibc/stubs.c
components/libc/compilers/armlibc/stubs.c
+18
-2
components/libc/compilers/dlib/syscalls.c
components/libc/compilers/dlib/syscalls.c
+52
-0
components/libc/compilers/dlib/syscalls.h
components/libc/compilers/dlib/syscalls.h
+0
-10
components/libc/compilers/newlib/syscalls.c
components/libc/compilers/newlib/syscalls.c
+20
-7
未找到文件。
components/libc/compilers/armlibc/stubs.c
浏览文件 @
bfde3803
...
...
@@ -11,6 +11,7 @@
* in msh.
* 2020-08-05 Meco Man fixed _sys_flen() compiling-warning when
* RT_USING_DFS is not defined
* 2020-02-13 Meco Man re-implement exit() and abort()
*/
#include <string.h>
...
...
@@ -255,8 +256,23 @@ void _ttywrch(int ch)
RT_WEAK
void
_sys_exit
(
int
return_code
)
{
/* TODO: perhaps exit the thread which is invoking this function */
while
(
1
);
rt_thread_t
self
=
rt_thread_self
();
#ifdef RT_USING_MODULE
if
(
dlmodule_self
())
{
dlmodule_exit
(
return_code
);
}
#endif
if
(
self
!=
RT_NULL
)
{
rt_kprintf
(
"thread:%-8.*s exit:%d!
\n
"
,
RT_NAME_MAX
,
self
->
name
,
return_code
);
rt_thread_suspend
(
self
);
rt_schedule
();
}
while
(
1
);
/* noreturn */
}
/**
...
...
components/libc/compilers/dlib/syscalls.c
0 → 100644
浏览文件 @
bfde3803
/*
* Copyright (c) 2006-2018, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2021-02-13 Meco Man implement exit() and abort()
*/
#include <rtthread.h>
void
exit
(
int
status
)
{
rt_thread_t
self
=
rt_thread_self
();
#ifdef RT_USING_MODULE
if
(
dlmodule_self
())
{
dlmodule_exit
(
status
);
}
#endif
if
(
self
!=
RT_NULL
)
{
rt_kprintf
(
"thread:%-8.*s exit:%d!
\n
"
,
RT_NAME_MAX
,
self
->
name
,
status
);
rt_thread_suspend
(
self
);
rt_schedule
();
}
while
(
1
);
/* noreturn */
}
void
abort
(
void
)
{
rt_thread_t
self
=
rt_thread_self
();
#ifdef RT_USING_MODULE
if
(
dlmodule_self
())
{
dlmodule_exit
(
-
1
);
}
#endif
if
(
self
!=
RT_NULL
)
{
rt_kprintf
(
"thread:%-8.*s abort!
\n
"
,
RT_NAME_MAX
,
self
->
name
);
rt_thread_suspend
(
self
);
rt_schedule
();
}
while
(
1
);
/* noreturn */
}
components/libc/compilers/dlib/syscalls.h
已删除
100644 → 0
浏览文件 @
d1d2d3a2
/*
* Copyright (c) 2006-2018, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2015-01-28 Bernard first version
*/
components/libc/compilers/newlib/syscalls.c
浏览文件 @
bfde3803
...
...
@@ -6,6 +6,7 @@
* Change Logs:
* Date Author Notes
* 2021-02-11 Meco Man remove _gettimeofday_r() and _times_r()
* 2020-02-13 Meco Man re-implement exit() and abort()
*/
#include <reent.h>
...
...
@@ -288,6 +289,8 @@ _free_r (struct _reent *ptr, void *addr)
void
exit
(
int
status
)
{
rt_thread_t
self
=
rt_thread_self
();
#ifdef RT_USING_MODULE
if
(
dlmodule_self
())
{
...
...
@@ -295,10 +298,14 @@ exit (int status)
}
#endif
rt_kprintf
(
"thread:%s exit with %d
\n
"
,
rt_thread_self
()
->
name
,
status
);
RT_ASSERT
(
0
);
if
(
self
!=
RT_NULL
)
{
rt_kprintf
(
"thread:%-8.*s exit:%d!
\n
"
,
RT_NAME_MAX
,
self
->
name
,
status
);
rt_thread_suspend
(
self
);
rt_schedule
();
}
while
(
1
);
while
(
1
);
/* noreturn */
}
void
...
...
@@ -315,17 +322,23 @@ void __libc_init_array(void)
void
abort
(
void
)
{
if
(
rt_thread_self
())
rt_thread_t
self
=
rt_thread_self
();
#ifdef RT_USING_MODULE
if
(
dlmodule_self
())
{
rt_thread_t
self
=
rt_thread_self
();
dlmodule_exit
(
-
1
);
}
#endif
if
(
self
!=
RT_NULL
)
{
rt_kprintf
(
"thread:%-8.*s abort!
\n
"
,
RT_NAME_MAX
,
self
->
name
);
rt_thread_suspend
(
self
);
rt_schedule
();
}
while
(
1
);
while
(
1
);
/* noreturn */
}
uid_t
getuid
(
void
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录