From 90f71bd017fdf777d7ff81fe38b657455b3e8532 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Tue, 15 Jun 2021 13:28:40 +0800 Subject: [PATCH] Revert "sched/posix_spawn: Don't insert name at the begin of argv" This reverts commit 032086870d16992dcdf820bf93a36c2a6426d6e7. --- binfmt/binfmt_execmodule.c | 2 +- include/nuttx/sched.h | 22 +++++----- sched/task/task.h | 4 +- sched/task/task_create.c | 3 +- sched/task/task_init.c | 24 +++++------ sched/task/task_setup.c | 88 ++++++++++++++++++-------------------- sched/task/task_vfork.c | 2 +- 7 files changed, 67 insertions(+), 78 deletions(-) diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c index 834176f5cc..620655975c 100644 --- a/binfmt/binfmt_execmodule.c +++ b/binfmt/binfmt_execmodule.c @@ -168,7 +168,7 @@ int exec_module(FAR const struct binary_s *binp, /* Initialize the task */ - ret = nxtask_init(tcb, false, filename, binp->priority, + ret = nxtask_init(tcb, filename, binp->priority, NULL, binp->stacksize, binp->entrypt, argv); binfmt_freeargv(argv); if (ret < 0) diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h index 0be56bc977..8f324402a7 100644 --- a/include/nuttx/sched.h +++ b/include/nuttx/sched.h @@ -908,16 +908,15 @@ FAR struct streamlist *nxsched_get_streams(void); * - Task type may be set in the TCB flags to create kernel thread * * Input Parameters: - * tcb - Address of the new task's TCB - * insert_name - Insert name to the first argv - * name - Name of the new task - * priority - Priority of the new task - * stack - Start of the pre-allocated stack - * stack_size - Size (in bytes) of the stack allocated - * entry - Application start point of the new task - * argv - A pointer to an array of input parameters. The array - * should be terminated with a NULL argv[] value. If no - * parameters are required, argv may be NULL. + * tcb - Address of the new task's TCB + * name - Name of the new task (not used) + * priority - Priority of the new task + * stack - Start of the pre-allocated stack + * stack_size - Size (in bytes) of the stack allocated + * entry - Application start point of the new task + * argv - A pointer to an array of input parameters. The array + * should be terminated with a NULL argv[] value. If no + * parameters are required, argv may be NULL. * * Returned Value: * OK on success; negative error value on failure appropriately. (See @@ -928,8 +927,7 @@ FAR struct streamlist *nxsched_get_streams(void); * ****************************************************************************/ -int nxtask_init(FAR struct task_tcb_s *tcb, bool insert_name, - const char *name, int priority, +int nxtask_init(FAR struct task_tcb_s *tcb, const char *name, int priority, FAR void *stack, uint32_t stack_size, main_t entry, FAR char * const argv[]); diff --git a/sched/task/task.h b/sched/task/task.h index ab06689842..daea1bd2fa 100644 --- a/sched/task/task.h +++ b/sched/task/task.h @@ -44,8 +44,8 @@ struct tcb_s; /* Forward reference */ 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, bool insert_name, - FAR const char *name, FAR char * const argv[]); +int nxtask_setup_arguments(FAR struct task_tcb_s *tcb, FAR const char *name, + FAR char * const argv[]); /* Task exit */ diff --git a/sched/task/task_create.c b/sched/task/task_create.c index 078d8d2d9b..9915c5d8b6 100644 --- a/sched/task/task_create.c +++ b/sched/task/task_create.c @@ -91,8 +91,7 @@ static int nxthread_create(FAR const char *name, uint8_t ttype, /* Initialize the task */ - ret = nxtask_init(tcb, true, name, priority, - NULL, stack_size, entry, argv); + ret = nxtask_init(tcb, name, priority, NULL, stack_size, entry, argv); if (ret < OK) { kmm_free(tcb); diff --git a/sched/task/task_init.c b/sched/task/task_init.c index 35facff30e..dfd7c7f1dc 100644 --- a/sched/task/task_init.c +++ b/sched/task/task_init.c @@ -62,16 +62,15 @@ * - Task type may be set in the TCB flags to create kernel thread * * Input Parameters: - * tcb - Address of the new task's TCB - * insert_name - Insert name to the first argv - * name - Name of the new task - * priority - Priority of the new task - * stack - Start of the pre-allocated stack - * stack_size - Size (in bytes) of the stack allocated - * entry - Application start point of the new task - * argv - A pointer to an array of input parameters. The array - * should be terminated with a NULL argv[] value. If no - * parameters are required, argv may be NULL. + * tcb - Address of the new task's TCB + * name - Name of the new task (not used) + * priority - Priority of the new task + * stack - Start of the pre-allocated stack + * stack_size - Size (in bytes) of the stack allocated + * entry - Application start point of the new task + * argv - A pointer to an array of input parameters. The array + * should be terminated with a NULL argv[] value. If no + * parameters are required, argv may be NULL. * * Returned Value: * OK on success; negative error value on failure appropriately. (See @@ -82,8 +81,7 @@ * ****************************************************************************/ -int nxtask_init(FAR struct task_tcb_s *tcb, bool insert_name, - const char *name, int priority, +int nxtask_init(FAR struct task_tcb_s *tcb, const char *name, int priority, FAR void *stack, uint32_t stack_size, main_t entry, FAR char * const argv[]) { @@ -155,7 +153,7 @@ int nxtask_init(FAR struct task_tcb_s *tcb, bool insert_name, /* Setup to pass parameters to the new task */ - nxtask_setup_arguments(tcb, insert_name, name, argv); + nxtask_setup_arguments(tcb, name, argv); /* Now we have enough in place that we can join the group */ diff --git a/sched/task/task_setup.c b/sched/task/task_setup.c index 5bac051f05..73f681512a 100644 --- a/sched/task/task_setup.c +++ b/sched/task/task_setup.c @@ -452,6 +452,13 @@ static int nxthread_setup_scheduler(FAR struct tcb_s *tcb, int priority, static void nxtask_setup_name(FAR struct task_tcb_s *tcb, FAR const char *name) { + /* Give a name to the unnamed tasks */ + + if (!name) + { + name = (FAR char *)g_noname; + } + /* Copy the name into the TCB */ strncpy(tcb->cmn.name, name, CONFIG_TASK_NAME_SIZE); @@ -472,23 +479,21 @@ static void nxtask_setup_name(FAR struct task_tcb_s *tcb, * accessible no matter what privilege mode the task runs in. * * Input Parameters: - * tcb - Address of the new task's TCB - * insert_name - Insert name to the first entry - * name - Name of the new task - * argv - A pointer to an array of input parameters. The array - * should be terminated with a NULL argv[] value. If no - * parameters are required, argv may be NULL. + * tcb - Address of the new task's TCB + * argv - A pointer to an array of input parameters. The arrau should be + * terminated with a NULL argv[] value. If no parameters are + * required, argv may be NULL. * * Returned Value: * Zero (OK) on success; a negated errno on failure. * ****************************************************************************/ -static inline int -nxtask_setup_stackargs(FAR struct task_tcb_s *tcb, bool insert_name, - FAR const char *name, FAR char * const argv[]) +static inline int nxtask_setup_stackargs(FAR struct task_tcb_s *tcb, + FAR char * const argv[]) { FAR char **stackargv; + FAR const char *name; FAR char *str; size_t strtablen; size_t argvlen; @@ -496,9 +501,17 @@ nxtask_setup_stackargs(FAR struct task_tcb_s *tcb, bool insert_name, int argc; int i; + /* Get the name string that we will use as the first argument */ + +#if CONFIG_TASK_NAME_SIZE > 0 + name = tcb->cmn.name; +#else + name = (FAR const char *)g_noname; +#endif /* CONFIG_TASK_NAME_SIZE */ + /* Get the size of the task name (including the NUL terminator) */ - strtablen = insert_name ? (strlen(name) + 1) : 0; + strtablen = (strlen(name) + 1); /* Count the number of arguments and get the accumulated size of the * argument strings (including the null terminators). The argument count @@ -541,7 +554,7 @@ nxtask_setup_stackargs(FAR struct task_tcb_s *tcb, bool insert_name, * task name plus a NULL argv[] entry to terminate the list. */ - argvlen = (insert_name + argc + 1) * sizeof(FAR char *); + argvlen = (argc + 2) * sizeof(FAR char *); stackargv = (FAR char **)up_stack_frame(&tcb->cmn, argvlen + strtablen); DEBUGASSERT(stackargv != NULL); @@ -550,8 +563,6 @@ nxtask_setup_stackargs(FAR struct task_tcb_s *tcb, bool insert_name, return -ENOMEM; } - tcb->argv = stackargv; - /* Get the address of the string table that will lie immediately after * the argv[] array and mark it as a null string. */ @@ -562,13 +573,10 @@ nxtask_setup_stackargs(FAR struct task_tcb_s *tcb, bool insert_name, * NUL terminator in the string buffer. */ - if (insert_name) - { - *stackargv++ = str; - nbytes = strlen(name) + 1; - strcpy(str, name); - str += nbytes; - } + stackargv[0] = str; + nbytes = strlen(name) + 1; + strcpy(str, name); + str += nbytes; /* Copy each argument */ @@ -579,10 +587,10 @@ nxtask_setup_stackargs(FAR struct task_tcb_s *tcb, bool insert_name, * argument and its NUL terminator in the string buffer. */ - *stackargv++ = str; - nbytes = strlen(argv[i]) + 1; + stackargv[i + 1] = str; + nbytes = strlen(argv[i]) + 1; strcpy(str, argv[i]); - str += nbytes; + str += nbytes; } /* Put a terminator entry at the end of the argv[] array. Then save the @@ -590,7 +598,8 @@ nxtask_setup_stackargs(FAR struct task_tcb_s *tcb, bool insert_name, * nxtask_start(). */ - *stackargv++ = NULL; + stackargv[argc + 1] = NULL; + tcb->argv = stackargv; return OK; } @@ -687,35 +696,20 @@ int pthread_setup_scheduler(FAR struct pthread_tcb_s *tcb, int priority, * task runs in. * * Input Parameters: - * tcb - Address of the new task's TCB - * insert_name - Insert name to the first argv - * name - Name of the new task - * argv - A pointer to an array of input parameters. The array - * should be terminated with a NULL argv[] value. If no - * parameters are required, argv may be NULL. + * tcb - Address of the new task's TCB + * name - Name of the new task (not used) + * argv - A pointer to an array of input parameters. The array should be + * terminated with a NULL argv[] value. If no parameters are + * required, argv may be NULL. * * Returned Value: * OK * ****************************************************************************/ -int nxtask_setup_arguments(FAR struct task_tcb_s *tcb, bool insert_name, - FAR const char *name, FAR char * const argv[]) +int nxtask_setup_arguments(FAR struct task_tcb_s *tcb, FAR const char *name, + FAR char * const argv[]) { - /* Give a name to the unnamed tasks */ - - if (!name) - { - name = (FAR char *)g_noname; - } - - /* Always insert name if argv equals NULL */ - - if (!argv) - { - insert_name = true; - } - /* Setup the task name */ nxtask_setup_name(tcb, name); @@ -725,5 +719,5 @@ int nxtask_setup_arguments(FAR struct task_tcb_s *tcb, bool insert_name, * privilege mode the task runs in. */ - return nxtask_setup_stackargs(tcb, insert_name, name, argv); + return nxtask_setup_stackargs(tcb, argv); } diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c index 9ff5471e48..b31b73254f 100644 --- a/sched/task/task_vfork.c +++ b/sched/task/task_vfork.c @@ -208,7 +208,7 @@ FAR struct task_tcb_s *nxtask_setup_vfork(start_t retaddr) name = parent->cmn.name; #endif - nxtask_setup_arguments(child, false, name, parent->argv); + nxtask_setup_arguments(child, name, parent->argv); /* Now we have enough in place that we can join the group */