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

If HAVE_GROUP_MEMBERS is not defined, then pthread_kill() really is the same as kill()

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-13 20:34:21 -06:00
parent d89c29abdf
commit cc77a28f40
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sched/pthread/pthread_kill.c
View File

@ -45,6 +45,8 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/sched.h>
#include "signal/signal.h"
/************************************************************************
@ -82,6 +84,14 @@
int pthread_kill(pthread_t thread, int signo)
{
#ifdef HAVE_GROUP_MEMBERS
/* If group members are support then pthread_kill() differs from kill().
* kill(), in this case, must following the POSIX rules for delivery of
* signals in the group environment. Otherwise, kill(), like
* pthread_kill() will just deliver the signal to the thread ID it is
* requested to use.
*/
#ifdef CONFIG_SCHED_HAVE_PARENT
FAR struct tcb_s *rtcb = (FAR struct tcb_s *)g_readytorun.head;
#endif
@ -138,4 +148,21 @@ errout_with_lock:
sched_unlock();
errout:
return -ret;
#else
/* If group members are not supported then pthread_kill is basically the
* same as kill().
*/
int ret;
set_errno(EINVAL);
ret = kill((pid_t)thread, signo);
if (ret != OK)
{
ret = get_errno();
}
return ret;
#endif
}

2
sched/signal/sig_dispatch.c
View File

@ -445,7 +445,6 @@ int sig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
int sig_dispatch(pid_t pid, FAR siginfo_t *info)
{
#ifdef HAVE_GROUP_MEMBERS
FAR struct tcb_s *stcb;
FAR struct task_group_s *group;
@ -486,7 +485,6 @@ int sig_dispatch(pid_t pid, FAR siginfo_t *info)
}
#else
FAR struct tcb_s *stcb;
/* Get the TCB associated with the pid */