Add sig_raise()

include/signal.h

@@ -280,8 +280,9 @@ extern "C"
 #define EXTERN extern
 #endif
 
-int kill(pid_t, int);
-int sigaction(int sig, FAR const struct sigaction *act,
+int kill(pid_t pid, int signo);
+int raise(int signo);
+int sigaction(int signo, FAR const struct sigaction *act,
               FAR struct sigaction *oact);
 int sigaddset(FAR sigset_t *set, int signo);
 int sigdelset(FAR sigset_t *set, int signo);
@@ -290,7 +291,7 @@ int sigfillset(FAR sigset_t *set);
 int sighold(int signo);
 int sigismember(FAR const sigset_t *set, int signo);
 int sigignore(int signo);
-CODE void (*signal(int sig, CODE void (*func)(int signo)))(int signo);
+CODE void (*signal(int signo, CODE void (*func)(int signo)))(int signo);
 int sigprocmask(int how, FAR const sigset_t *set, FAR sigset_t *oset);
 int sigpause(int signo);
 int sigpending(FAR sigset_t *set);
@@ -300,7 +301,7 @@ int sigqueue(int pid, int signo, union sigval value);
 int sigqueue(int pid, int signo, FAR void *sival_ptr);
 #endif
 int sigrelse(int signo);
-CODE void (*sigset(int sig, CODE void (*func)(int signo)))(int signo);
+CODE void (*sigset(int signo, CODE void (*func)(int signo)))(int signo);
 int sigtimedwait(FAR const sigset_t *set, FAR struct siginfo *value,
                  FAR const struct timespec *timeout);
 int sigsuspend(FAR const sigset_t *sigmask);

libc/signal/Make.defs

@@ -37,9 +37,9 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
 
 # Add the signal C files to the build
 
-CSRCS += sig_emptyset.c sig_fillset.c sig_addset.c sig_delset.c
-CSRCS += sig_ismember.c sig_hold.c sig_relse.c sig_ignore.c sig_pause.c
-CSRCS += sig_set.c signal.c
+CSRCS += sig_addset.c sig_delset.c sig_emptyset.c sig_fillset.c
+CSRCS += sig_hold.c sig_ignore.c sig_ismember.c sig_pause.c sig_raise.c
+CSRCS += sig_relse.c sig_set.c signal.c
 
 # Add the signal directory to the build
 

libc/signal/sig_raise.c

@@ -0,0 +1,88 @@
+/****************************************************************************
+ * libc/signal/sig_raise.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <signal.h>
+#include <pthread.h>
+#include <assert.h>
+#include <errno.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: sig_raise
+ *
+ * Description:
+ *   The raise() function sends the signal signo to the executing thread or
+ *   process. If a signal handler is called, the raise() function does not
+ *   return until after the signal handler does.
+ *
+ *   If the implementation supports the Threads option, the effect of the
+ *   raise() function is equivalent to calling:
+ *
+ *     pthread_kill(pthread_self(), signo);
+ *
+ *   except that on failures, -1 (ERROR) is returned and the errno() variable
+ *   is set accordingly.  Otherwise, the effect of the raise() function is
+ *   equivalent to calling:
+ *
+ *     kill(getpid(), signo)
+ *
+ ****************************************************************************/
+
+int raise(int signo)
+{
+#ifndef CONFIG_DISABLE_PTHREAD
+  int errcode = pthread_kill(pthread_self(), signo);
+  if (errcode != OK)
+    {
+      DEBUGASSERT(errcode > 0);
+      set_errno(errcode);
+      return ERROR;
+    }
+
+  return OK;
+
+#else
+  return kill(getpid(), signo);
+#endif
+}

sched/pthread/pthread_kill.c

@@ -86,8 +86,8 @@
 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
+  /* If group members are supported then pthread_kill() differs from kill().
+   * kill(), in this case, must follow 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.