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>
72 lines
2.3 KiB
C
72 lines
2.3 KiB
C
/****************************************************************************
|
|
* sched/task/task.h
|
|
*
|
|
* 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.
|
|
*
|
|
****************************************************************************/
|
|
|
|
#ifndef __SCHED_TASK_TASK_H
|
|
#define __SCHED_TASK_TASK_H
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
#include <nuttx/compiler.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <stdbool.h>
|
|
|
|
#include <nuttx/sched.h>
|
|
|
|
/****************************************************************************
|
|
* Public Function Prototypes
|
|
****************************************************************************/
|
|
|
|
struct tcb_s; /* Forward reference */
|
|
|
|
/* Task start-up */
|
|
|
|
void nxtask_start(void);
|
|
int nxtask_setup_scheduler(FAR struct task_tcb_s *tcb, int priority,
|
|
start_t start, main_t main, uint8_t ttype);
|
|
int nxtask_setup_arguments(FAR struct task_tcb_s *tcb,
|
|
FAR const char *name, FAR char * const argv[]);
|
|
|
|
/* Task exit */
|
|
|
|
int nxtask_exit(void);
|
|
int nxtask_terminate(pid_t pid);
|
|
void nxtask_exithook(FAR struct tcb_s *tcb, int status);
|
|
void nxtask_recover(FAR struct tcb_s *tcb);
|
|
|
|
/* Cancellation points */
|
|
|
|
bool nxnotify_cancellation(FAR struct tcb_s *tcb);
|
|
|
|
/* Task Join */
|
|
|
|
#ifndef CONFIG_DISABLE_PTHREAD
|
|
void nxtask_joininit(FAR struct tcb_s *tcb);
|
|
void nxtask_joindestroy(FAR struct tcb_s *tcb);
|
|
#else
|
|
# define nxtask_joininit(tcb)
|
|
# define nxtask_joindestroy(tcb)
|
|
#endif
|
|
|
|
#endif /* __SCHED_TASK_TASK_H */
|