From d8a1b61690862777b137ec182a0d62dcf4ee8db2 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 6 Feb 2013 00:06:35 +0000 Subject: Misc clean-up and bugfixes related to multi-thread group signalling git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5614 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/sched/group_find.c | 2 +- nuttx/sched/group_internal.h | 2 -- nuttx/sched/task_exithook.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'nuttx/sched') diff --git a/nuttx/sched/group_find.c b/nuttx/sched/group_find.c index d7e82d1f9..4c1205bea 100644 --- a/nuttx/sched/group_find.c +++ b/nuttx/sched/group_find.c @@ -145,7 +145,7 @@ FAR struct task_group_s *group_findbygid(gid_t gid) * *****************************************************************************/ -#if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_SCHED_HAVE_PARENT) +#ifdef HAVE_GROUP_MEMBERS FAR struct task_group_s *group_findbypid(pid_t pid) { FAR struct task_group_s *group; diff --git a/nuttx/sched/group_internal.h b/nuttx/sched/group_internal.h index 520a9544b..f97f07d95 100644 --- a/nuttx/sched/group_internal.h +++ b/nuttx/sched/group_internal.h @@ -86,8 +86,6 @@ void group_leave(FAR struct tcb_s *tcb); #ifdef HAVE_GROUP_MEMBERS FAR struct task_group_s *group_findbygid(gid_t gid); -#endif -#if !defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_SCHED_HAVE_PARENT) FAR struct task_group_s *group_findbypid(pid_t pid); #endif diff --git a/nuttx/sched/task_exithook.c b/nuttx/sched/task_exithook.c index 444bfee9c..5633786aa 100644 --- a/nuttx/sched/task_exithook.c +++ b/nuttx/sched/task_exithook.c @@ -396,7 +396,7 @@ static inline void task_sigchild(FAR struct tcb_s *ptcb, info.si_code = CLD_EXITED; info.si_value.sival_ptr = NULL; #ifndef CONFIG_DISABLE_PTHREAD - info.si_pid = chgrp->tg_task; + info.si_pid = ctcb->group->tg_task; #else info.si_pid = ctcb->pid; #endif -- cgit v1.2.3