Imagelibrary/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-12-26 09:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[smart/syscall] fix exit(2) and add exit_group(2) (#8005)

Browse Source 
Signed-off-by: shell <smokewood@qq.com>
Signed-off-by: shell <wangxiaoyao@rt-thread.com>
Signed-off-by: Shell <smokewood@qq.com>
This commit is contained in:
Shell
2023-09-09 09:35:56 +08:00
committed by GitHub
parent b8e332fa2d
commit 47b183a297
12 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
components/lwp/lwp_syscall.c
View File

@@ -318,14 +318,14 @@ static void _crt_thread_entry(void *parameter)
#endif /* ARCH_MM_MMU */
}
/* thread/process */
void sys_exit(int value)
/* exit group */
sysret_t sys_exit_group(int value)
{
rt_base_t level;
rt_thread_t tid, main_thread;
struct rt_lwp *lwp;
LOG_D("thread/process exit.");
LOG_D("process exit");
tid = rt_thread_self();
lwp = (struct rt_lwp *)tid->lwp;
@@ -370,15 +370,51 @@ void sys_exit(int value)
#endif /* ARCH_MM_MMU */
rt_thread_delete(tid);
rt_schedule();
rt_hw_interrupt_enable(level);
rt_schedule();
return;
/* never reach here */
return 0;
}
/* exit group */
void sys_exit_group(int status)
/* thread exit */
void sys_exit(int status)
{
rt_base_t level;
rt_thread_t tid, main_thread;
struct rt_lwp *lwp;
LOG_D("thread exit");
tid = rt_thread_self();
lwp = (struct rt_lwp *)tid->lwp;
level = rt_hw_interrupt_disable();
#ifdef ARCH_MM_MMU
if (tid->clear_child_tid)
{
int t = 0;
int *clear_child_tid = tid->clear_child_tid;
tid->clear_child_tid = RT_NULL;
lwp_put_to_user(clear_child_tid, &t, sizeof t);
sys_futex(clear_child_tid, FUTEX_WAKE, 1, RT_NULL, RT_NULL, 0);
}
main_thread = rt_list_entry(lwp->t_grp.prev, struct rt_thread, sibling);
if (main_thread == tid && tid->sibling.prev == &lwp->t_grp)
{
lwp_terminate(lwp);
lwp_wait_subthread_exit();
lwp->lwp_ret = status;
}
#endif /* ARCH_MM_MMU */
rt_thread_delete(tid);
rt_hw_interrupt_enable(level);
rt_schedule();
return;
}
@@ -1842,6 +1878,7 @@ sysret_t _sys_fork(void)
thread->user_stack_size = self_thread->user_stack_size;
thread->signal.sigset_mask = self_thread->signal.sigset_mask;
thread->thread_idr = self_thread->thread_idr;
thread->clear_child_tid = self_thread->clear_child_tid;
thread->lwp = (void *)lwp;
thread->tid = tid;