df30a1f8d3
1. add support to join main task
| static pthread_t self;
|
| static void *join_task(void *arg)
| {
| int ret;
| ret = pthread_join(self, NULL); <--- /* Fix Task could not be joined */
| return NULL;
| }
|
| int main(int argc, char *argv[])
| {
| pthread_t thread;
|
| self = pthread_self();
|
| pthread_create(&thread, NULL, join_task, NULL);
| sleep(1);
|
| pthread_exit(NULL);
| return 0;
| }
2. Detach active thread will not alloc for additional join, just update the task flag.
3. Remove the return value waiting lock logic (data_sem),
the return value will be stored in the waiting tcb.
4. Revise the return value of pthread_join(), consistent with linux
e.g:
Joining a detached and canceled thread should return EINVAL, not ESRCH
https://pubs.opengroup.org/onlinepubs/009695399/functions/pthread_join.html
[EINVAL]
The value specified by thread does not refer to a joinable thread.
NOTE:
This PR will not increase stack usage, but struct tcb_s will increase 32 bytes.
Signed-off-by: chao an <anchao@lixiang.com>
110 lines
3.0 KiB
C
110 lines
3.0 KiB
C
/****************************************************************************
|
|
* sched/pthread/pthread_detach.c
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the
|
|
* License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <stdbool.h>
|
|
#include <pthread.h>
|
|
#include <errno.h>
|
|
#include <assert.h>
|
|
#include <debug.h>
|
|
|
|
#include "sched/sched.h"
|
|
#include "group/group.h"
|
|
#include "pthread/pthread.h"
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: pthread_detach
|
|
*
|
|
* Description:
|
|
* A thread object may be "detached" to specify that the return value
|
|
* and completion status will not be requested.
|
|
*
|
|
* The caller's task/thread must belong to the same "task group" as the
|
|
* pthread is (or was) a member of. The thread may or may not still
|
|
* be running.
|
|
*
|
|
* Input Parameters:
|
|
* thread
|
|
*
|
|
* Returned Value:
|
|
* 0 if successful. Otherwise, an error code.
|
|
*
|
|
* Assumptions:
|
|
*
|
|
****************************************************************************/
|
|
|
|
int pthread_detach(pthread_t thread)
|
|
{
|
|
FAR struct tcb_s *rtcb = this_task();
|
|
FAR struct task_group_s *group = rtcb->group;
|
|
FAR struct task_join_s *join;
|
|
FAR struct tcb_s *tcb;
|
|
int ret;
|
|
|
|
nxrmutex_lock(&group->tg_joinlock);
|
|
|
|
tcb = nxsched_get_tcb((pid_t)thread);
|
|
if (tcb == NULL)
|
|
{
|
|
/* If tcb has been destroyed, update the pending join
|
|
* status in the group.
|
|
*/
|
|
|
|
ret = pthread_findjoininfo(group, (pid_t)thread, &join, false);
|
|
if (ret == OK)
|
|
{
|
|
join->detached = true;
|
|
}
|
|
else
|
|
{
|
|
ret = ESRCH;
|
|
}
|
|
|
|
goto errout;
|
|
}
|
|
|
|
if ((group != tcb->group) ||
|
|
(tcb->flags & TCB_FLAG_DETACHED) != 0)
|
|
{
|
|
ret = EINVAL;
|
|
}
|
|
else
|
|
{
|
|
tcb->flags |= TCB_FLAG_DETACHED;
|
|
ret = OK;
|
|
}
|
|
|
|
errout:
|
|
nxrmutex_unlock(&group->tg_joinlock);
|
|
|
|
sinfo("Returning %d\n", ret);
|
|
return ret;
|
|
}
|