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>
81 lines
2.5 KiB
C
81 lines
2.5 KiB
C
/****************************************************************************
|
|
* sched/pthread/pthread_release.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 <sched.h>
|
|
#include <assert.h>
|
|
#include <debug.h>
|
|
|
|
#include <nuttx/nuttx.h>
|
|
#include <nuttx/kmalloc.h>
|
|
|
|
#include "pthread/pthread.h"
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: pthread_release
|
|
*
|
|
* Description:
|
|
* Release pthread resources from the task group with the group
|
|
* terminated.
|
|
*
|
|
* Input Parameters:
|
|
* group = The task group containing the pthread resources to be
|
|
* released.
|
|
*
|
|
* Returned Value:
|
|
* None
|
|
*
|
|
* Assumptions:
|
|
*
|
|
* POSIX Compatibility:
|
|
*
|
|
****************************************************************************/
|
|
|
|
void pthread_release(FAR struct task_group_s *group)
|
|
{
|
|
FAR sq_entry_t *curr;
|
|
FAR sq_entry_t *next;
|
|
|
|
/* Visit and delete each join structure still in the list. Since we
|
|
* are last exiting thread of the group, no special protection should
|
|
* be required.
|
|
*/
|
|
|
|
sq_for_every_safe(&group->tg_joinqueue, curr, next)
|
|
{
|
|
/* Deallocate the join structure */
|
|
|
|
kmm_free(container_of(curr, struct task_join_s, entry));
|
|
}
|
|
|
|
/* Destroy the join list mutex */
|
|
|
|
nxrmutex_destroy(&group->tg_joinlock);
|
|
}
|