sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched: Change the return type of nxtask_activate to void

Browse Source 
to simplify the error handling logic

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I00fedd4d69620a7cc7b9f9e8bf4ba7f7989dc2b2
This commit is contained in:
Xiang Xiao 2020-06-04 20:19:40 +08:00 committed by Abdelatif Guettouche
parent b4bd9427f7
commit a69678810d
7 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
binfmt/binfmt_execmodule.c
View File

@ -198,7 +198,7 @@ int exec_module(FAR const struct binary_s *binp)
} }
#endif #endif
#if defined(CONFIG_BUILD_KERNEL) && defined(CONFIG_MM_SHM) #ifdef CONFIG_MM_SHM
/* Initialize the shared memory virtual page allocator */ /* Initialize the shared memory virtual page allocator */
ret = shm_group_initialize(tcb->cmn.group); ret = shm_group_initialize(tcb->cmn.group);
@ -254,12 +254,7 @@ int exec_module(FAR const struct binary_s *binp)
/* Then activate the task at the provided priority */ /* Then activate the task at the provided priority */
ret = nxtask_activate((FAR struct tcb_s *)tcb); nxtask_activate((FAR struct tcb_s *)tcb);
if (ret < 0)
{
berr("nxtask_activate() failed: %d\n", ret);
goto errout_with_tcbinit;
}
#if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL) #if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)
/* Restore the address environment of the caller */ /* Restore the address environment of the caller */
@ -274,11 +269,13 @@ int exec_module(FAR const struct binary_s *binp)
return (int)pid; return (int)pid;
#if defined(CONFIG_ARCH_ADDRENV) || defined(CONFIG_MM_SHM)
errout_with_tcbinit: errout_with_tcbinit:
tcb->cmn.stack_alloc_ptr = NULL; tcb->cmn.stack_alloc_ptr = NULL;
nxsched_release_tcb(&tcb->cmn, TCB_FLAG_TTYPE_TASK); nxsched_release_tcb(&tcb->cmn, TCB_FLAG_TTYPE_TASK);
kumm_free(stack); kumm_free(stack);
return ret; return ret;
#endif
errout_with_addrenv: errout_with_addrenv:
#if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL) #if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL)

4
include/nuttx/sched.h
View File

@ -989,11 +989,11 @@ void nxtask_uninit(FAR struct tcb_s *tcb);
* argument). * argument).
* *
* Returned Value: * Returned Value:
* Always returns OK * None
* *
********************************************************************************/ ********************************************************************************/
int nxtask_activate(FAR struct tcb_s *tcb); void nxtask_activate(FAR struct tcb_s *tcb);
/******************************************************************************** /********************************************************************************
* Name: nxtask_starthook * Name: nxtask_starthook

5
sched/pthread/pthread_create.c
View File

@ -553,11 +553,8 @@ int pthread_create(FAR pthread_t *thread, FAR const pthread_attr_t *attr,
sched_lock(); sched_lock();
if (ret == OK) if (ret == OK)
{ {
ret = nxtask_activate((FAR struct tcb_s *)ptcb); nxtask_activate((FAR struct tcb_s *)ptcb);
}
if (ret == OK)
{
/* Wait for the task to actually get running and to register /* Wait for the task to actually get running and to register
* its join structure. * its join structure.
*/ */

5
sched/task/task_activate.c
View File

@ -49,11 +49,11 @@
* argument). * argument).
* *
* Returned Value: * Returned Value:
* Always returns OK * None
* *
****************************************************************************/ ****************************************************************************/
int nxtask_activate(FAR struct tcb_s *tcb) void nxtask_activate(FAR struct tcb_s *tcb)
{ {
irqstate_t flags = enter_critical_section(); irqstate_t flags = enter_critical_section();
@ -79,5 +79,4 @@ int nxtask_activate(FAR struct tcb_s *tcb)
up_unblock_task(tcb); up_unblock_task(tcb);
leave_critical_section(flags); leave_critical_section(flags);
return OK;
} }

7
sched/task/task_create.c
View File

@ -145,12 +145,7 @@ static int nxthread_create(FAR const char *name, uint8_t ttype,
/* Activate the task */ /* Activate the task */
ret = nxtask_activate((FAR struct tcb_s *)tcb); nxtask_activate((FAR struct tcb_s *)tcb);
if (ret < OK)
{
goto errout_with_active;
}
return pid; return pid;
errout_with_active: errout_with_active:

12
sched/task/task_restart.c
View File

@ -73,7 +73,6 @@ int task_restart(pid_t pid)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
int cpu; int cpu;
#endif #endif
int ret;
/* Check if the task to restart is the calling task */ /* Check if the task to restart is the calling task */
@ -188,7 +187,7 @@ int task_restart(pid_t pid)
if (cpu >= 0) if (cpu >= 0)
{ {
ret = up_cpu_resume(cpu); int ret = up_cpu_resume(cpu);
if (ret < 0) if (ret < 0)
{ {
errcode = -ret; errcode = -ret;
@ -201,14 +200,7 @@ int task_restart(pid_t pid)
/* Activate the task. */ /* Activate the task. */
ret = nxtask_activate((FAR struct tcb_s *)tcb); nxtask_activate((FAR struct tcb_s *)tcb);
if (ret != OK)
{
nxtask_terminate(pid, true);
errcode = -ret;
goto errout_with_lock;
}
return OK; return OK;
errout_with_lock: errout_with_lock:

8
sched/task/task_vfork.c
View File

@ -434,13 +434,7 @@ pid_t nxtask_start_vfork(FAR struct task_tcb_s *child)
/* Activate the task */ /* Activate the task */
ret = nxtask_activate((FAR struct tcb_s *)child); nxtask_activate((FAR struct tcb_s *)child);
if (ret < OK)
{
nxtask_abort_vfork(child, -ret);
sched_unlock();
return ERROR;
}
/* The child task has not yet ran because pre-emption is disabled. /* The child task has not yet ran because pre-emption is disabled.
* The child task has the same priority as the parent task, so that * The child task has the same priority as the parent task, so that