nuttx/sched/pthread/pthread_join.c
chao an df30a1f8d3 sched/pthread/join: refactor pthread join to support join task
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>
2024-03-13 18:06:56 +09:00

176 lines
5.0 KiB
C

/****************************************************************************
* sched/pthread/pthread_join.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 <unistd.h>
#include <pthread.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/cancelpt.h>
#include "sched/sched.h"
#include "pthread/pthread.h"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: pthread_join
*
* Description:
* A thread can await termination of another thread and retrieve the
* return value of the thread.
*
* 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
* pexit_value
*
* Returned Value:
* 0 if successful. Otherwise, one of the following error codes:
*
* EINVAL The value specified by thread does not refer to joinable
* thread.
* ESRCH No thread could be found corresponding to that specified by the
* given thread ID.
* EDEADLK A deadlock was detected or the value of thread specifies the
* calling thread.
*
* Assumptions:
*
****************************************************************************/
int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
{
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 = OK;
/* pthread_join() is a cancellation point */
enter_cancellation_point();
nxrmutex_lock(&group->tg_joinlock);
tcb = nxsched_get_tcb((pid_t)thread);
if (tcb == NULL || (tcb->flags & TCB_FLAG_JOIN_COMPLETED) != 0)
{
ret = pthread_findjoininfo(group, (pid_t)thread, &join, false);
if (ret == OK)
{
/* If the task is terminated, maintain the same behavior as Linux:
* 1. Join detached task will always return EINVAL.
* 2. Other threads will destroy the join information after
* obtain the exit value, ESRCH will return if calling
* pthread_join() again
*/
if (join->detached)
{
ret = EINVAL;
}
else
{
if (pexit_value != NULL)
{
*pexit_value = join->exit_value;
}
pthread_destroyjoin(group, join);
}
}
else
{
ret = ESRCH;
}
goto errout;
}
/* First make sure that this is not an attempt to join to
* ourself.
*/
if (tcb == rtcb)
{
ret = EDEADLK;
goto errout;
}
/* Task was detached or not a pthread, return EINVAL */
if ((tcb->group != group) ||
(tcb->flags & TCB_FLAG_DETACHED) != 0)
{
ret = EINVAL;
goto errout;
}
/* Relinquish the data set semaphore. Since pre-emption is
* disabled, we can be certain that no task has the
* opportunity to run between the time we relinquish the
* join semaphore and the time that we wait on the thread exit
* semaphore.
*/
sq_addfirst(&rtcb->join_entry, &tcb->join_queue);
nxrmutex_unlock(&group->tg_joinlock);
/* Take the thread's thread exit semaphore. We will sleep here
* until the thread exits. We need to exercise caution because
* there could be multiple threads waiting here for the same
* pthread to exit.
*/
nxsem_wait_uninterruptible(&rtcb->join_sem);
nxrmutex_lock(&group->tg_joinlock);
/* The thread has exited! Get the thread exit value */
if (pexit_value != NULL)
{
*pexit_value = rtcb->join_val;
}
errout:
nxrmutex_unlock(&group->tg_joinlock);
leave_cancellation_point();
sinfo("Returning %d, exit_value %p\n", ret, *pexit_value);
return ret;
}