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

improve some assertions; add some comments.

Browse Source
This commit is contained in:
Gregory Nutt 2016-09-06 10:21:41 -06:00
parent 27919549f1
commit e034c78516
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sched/task/task_setup.c
View File

@ -203,10 +203,8 @@ static inline void task_saveparent(FAR struct tcb_s *tcb, uint8_t ttype)
{ {
FAR struct tcb_s *rtcb = this_task(); FAR struct tcb_s *rtcb = this_task();
#if defined(HAVE_GROUP_MEMBERS) || defined(CONFIG_SCHED_CHILD_STATUS) DEBUGASSERT( tcb != NULL && tcb->group != NULL &&
DEBUGASSERT(tcb != NULL && tcb->group != NULL && rtcb->group != NULL); rtcb != NULL && rtcb->group != NULL);
#else
#endif
/* Only newly created tasks (and kernel threads) have parents. None of /* Only newly created tasks (and kernel threads) have parents. None of
* this logic applies to pthreads with reside in the same group as the * this logic applies to pthreads with reside in the same group as the
@ -226,7 +224,7 @@ static inline void task_saveparent(FAR struct tcb_s *tcb, uint8_t ttype)
tcb->group->tg_pgid = rtcb->group->tg_gid; tcb->group->tg_pgid = rtcb->group->tg_gid;
#else #else
DEBUGASSERT(tcb); DEBUGASSERT(tcb != NULL && tcb->group != NULL);
/* Save the parent task's ID in the child task's group. */ /* Save the parent task's ID in the child task's group. */
@ -247,8 +245,8 @@ static inline void task_saveparent(FAR struct tcb_s *tcb, uint8_t ttype)
*/ */
child = group_findchild(rtcb->group, tcb->pid); child = group_findchild(rtcb->group, tcb->pid);
DEBUGASSERT(!child); DEBUGASSERT(child == NULL);
if (!child) if (child == NULL)
{ {
/* Allocate a new status structure */ /* Allocate a new status structure */
@ -257,8 +255,8 @@ static inline void task_saveparent(FAR struct tcb_s *tcb, uint8_t ttype)
/* Did we successfully find/allocate the child status structure? */ /* Did we successfully find/allocate the child status structure? */
DEBUGASSERT(child); DEBUGASSERT(child != NULL);
if (child) if (child != NULL)
{ {
/* Yes.. Initialize the structure */ /* Yes.. Initialize the structure */
@ -271,7 +269,8 @@ static inline void task_saveparent(FAR struct tcb_s *tcb, uint8_t ttype)
group_addchild(rtcb->group, child); group_addchild(rtcb->group, child);
} }
} }
#else
#else /* CONFIG_SCHED_CHILD_STATUS */
/* Child status is not retained. Simply keep track of the number /* Child status is not retained. Simply keep track of the number
* child tasks created. * child tasks created.
*/ */
@ -281,7 +280,8 @@ static inline void task_saveparent(FAR struct tcb_s *tcb, uint8_t ttype)
rtcb->group->tg_nchildren++; rtcb->group->tg_nchildren++;
} }
#endif
#endif /* CONFIG_SCHED_CHILD_STATUS */
} }
#else #else
# define task_saveparent(tcb,ttype) # define task_saveparent(tcb,ttype)