Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 13:52:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sched/task: task_spawnparms return path cleanup

Browse Source 
Initialize ret and propagate scheduler/param errors via a single return.
Make spawn_file_is_duplicateable() decision explicit using a dup state.
Addresses Coverity HIS_metric_violation: RETURN.

Signed-off-by: fangxinyong <fangxinyong@xiaomi.com>
This commit is contained in:
fangxinyong
2025-08-15 11:19:56 +08:00
committed by Xiang Xiao
parent c9f460d793
commit 31901573ba
1 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/task/task_spawnparms.c
+25 -33
View File
@@ -146,7 +146,7 @@ static inline int nxspawn_open(FAR struct tcb_s *tcb,
int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr)
{
struct sched_param param;
int ret;
int ret = OK;
DEBUGASSERT(attr);
@@ -180,29 +180,24 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr)
*/
ret = nxsched_get_param(pid, &param);
if (ret < 0)
{
return ret;
}
#endif
/* Get the priority from the attributes */
param.sched_priority = attr->priority;
/* If we are setting *both* the priority and the scheduler,
* then we will call nxsched_set_scheduler() below.
*/
if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) == 0)
if (ret == OK)
{
sinfo("Setting priority=%d for pid=%d\n",
param.sched_priority, pid);
/* Get the priority from the attributes */
ret = nxsched_set_param(pid, &param);
if (ret < 0)
param.sched_priority = attr->priority;
/* If we are setting *both* the priority and the scheduler,
* then we will call nxsched_set_scheduler() below.
*/
if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) == 0)
{
return ret;
sinfo("Setting priority=%d for pid=%d\n",
param.sched_priority, pid);
ret = nxsched_set_param(pid, &param);
}
}
}
@@ -215,17 +210,13 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr)
else if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) != 0)
{
ret = nxsched_get_param(0, &param);
if (ret < 0)
{
return ret;
}
}
/* Are we setting the scheduling policy? If so, use the priority
* setting determined above.
*/
if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) != 0)
if (ret == OK && (attr->flags & POSIX_SPAWN_SETSCHEDULER) != 0)
{
sinfo("Setting policy=%d priority=%d for pid=%d\n",
attr->policy, param.sched_priority, pid);
@@ -243,7 +234,7 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr)
nxsched_set_scheduler(pid, attr->policy, &param);
}
return OK;
return ret;
}
/****************************************************************************
@@ -328,11 +319,12 @@ spawn_file_is_duplicateable(FAR const posix_spawn_file_actions_t *actions,
FAR struct spawn_close_file_action_s *close;
FAR struct spawn_open_file_action_s *open;
FAR struct spawn_dup2_file_action_s *dup2;
int dup = -1;
/* check each file action */
for (entry = (FAR struct spawn_general_file_action_s *)actions;
entry != NULL;
entry != NULL && dup < 0;
entry = entry->flink)
{
switch (entry->action)
@@ -341,7 +333,7 @@ spawn_file_is_duplicateable(FAR const posix_spawn_file_actions_t *actions,
close = (FAR struct spawn_close_file_action_s *)entry;
if (close->fd == fd)
{
return false;
dup = 0;
}
break;
@@ -349,11 +341,11 @@ spawn_file_is_duplicateable(FAR const posix_spawn_file_actions_t *actions,
dup2 = (FAR struct spawn_dup2_file_action_s *)entry;
if (dup2->fd1 == fd)
{
return true;
dup = 1;
}
else if (dup2->fd2 == fd)
{
return false;
dup = 0;
}
break;
@@ -361,7 +353,7 @@ spawn_file_is_duplicateable(FAR const posix_spawn_file_actions_t *actions,
open = (FAR struct spawn_open_file_action_s *)entry;
if (open->fd == fd)
{
return false;
dup = 0;
}
break;
@@ -370,10 +362,10 @@ spawn_file_is_duplicateable(FAR const posix_spawn_file_actions_t *actions,
}
}
if (cloexec)
if (dup < 0)
{
return false;
dup = cloexec ? 0 : 1;
}
return true;
return dup > 0;
}