sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched/pthread:need check pthread is DETACHED

Browse Source 
pthread_join need check thread is DETACHED,
Whether to wait according to the result.And,
if a thread is DETACHED,it will not set a new
attr.
Signed-off-by: anjiahao <anjiahao@xiaomi.com>
This commit is contained in:
anjiahao 2022-04-01 11:53:02 +08:00 committed by Xiang Xiao
parent b6cf1ac662
commit 47304e7254
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sched/pthread/pthread_detach.c
View File

@ -65,7 +65,7 @@ int pthread_detach(pthread_t thread)
FAR struct tcb_s *rtcb = this_task();
FAR struct task_group_s *group = rtcb->group;
FAR struct join_s *pjoin;
int ret;
int ret = OK;
sinfo("Thread=%d group=%p\n", thread, group);
DEBUGASSERT(group);
@ -96,12 +96,15 @@ int pthread_detach(pthread_t thread)
* thread exits
*/
pjoin->detached = true;
if (pjoin->detached)
{
ret = EINVAL;
}
else
{
pjoin->detached = true;
}
}
/* Either case is successful */
ret = OK;
}
pthread_sem_give(&group->tg_joinsem);

7
sched/pthread/pthread_join.c
View File

@ -138,6 +138,13 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
}
else
{
if (pjoin->detached)
{
pthread_sem_give(&group->tg_joinsem);
leave_cancellation_point();
return EINVAL;
}
/* NOTE: sched_lock() is not enough for SMP
* because another CPU would continue the pthread and exit
* sequences so need to protect it with a critical section