Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

sched/: Correct some naming. The NuttX task groups have been using the acroynum 'gid' and also the type 'gid_t' for the the task group ID. That is incorrect. Than naming is reserved for use with group permissions. So these were all named to grpid and grpid_t so that it is clearer that these refer to NuttX task group IDs, and not to group permissions.

Browse Source
This commit is contained in:
Gregory Nutt
2019-08-02 10:01:30 -06:00
parent 4c800ca372
commit 8e321aba84
12 changed files with 74 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/task/task_reparent.c
+11 -10
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* sched/task/task_reparent.c
*
* Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2013, 2016, 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,7 @@
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/sched.h>
#include "sched/sched.h"
#include "group/group.h"
@@ -79,8 +80,8 @@ int task_reparent(pid_t ppid, pid_t chpid)
FAR struct task_group_s *ogrp;
FAR struct task_group_s *pgrp;
FAR struct tcb_s *tcb;
gid_t ogid;
gid_t pgid;
grpid_t ogrpid;
grpid_t pgrpid;
irqstate_t flags;
int ret;
@@ -102,13 +103,13 @@ int task_reparent(pid_t ppid, pid_t chpid)
DEBUGASSERT(tcb->group);
chgrp = tcb->group;
/* Get the GID of the old parent task's task group (ogid) */
/* Get the GID of the old parent task's task group (ogrpid) */
ogid = chgrp->tg_pgid;
ogrpid = chgrp->tg_pgrpid;
/* Get the old parent task's task group (ogrp) */
ogrp = group_findbygid(ogid);
ogrp = group_findby_grpid(ogrpid);
if (!ogrp)
{
ret = -ESRCH;
@@ -124,8 +125,8 @@ int task_reparent(pid_t ppid, pid_t chpid)
{
/* Get the grandparent task's task group (pgrp) */
pgid = ogrp->tg_pgid;
pgrp = group_findbygid(pgid);
pgrpid = ogrp->tg_pgrpid;
pgrp = group_findby_grpid(pgrpid);
}
else
{
@@ -139,7 +140,7 @@ int task_reparent(pid_t ppid, pid_t chpid)
}
pgrp = tcb->group;
pgid = pgrp->tg_gid;
pgrpid = pgrp->tg_grpid;
}
if (!pgrp)
@@ -153,7 +154,7 @@ int task_reparent(pid_t ppid, pid_t chpid)
* all members of the child's task group.
*/
chgrp->tg_pgid = pgid;
chgrp->tg_pgrpid = pgrpid;
#ifdef CONFIG_SCHED_CHILD_STATUS
/* Remove the child status entry from old parent task group */