signals: fix build and runtime issues when signals all isabled

  Fix build and runtime issues when signals all disabled.

Signed-off-by: Chengdong Wang <[email protected]>

Author: wangchdo

examples/ipforward/ipforward.c

@@ -840,7 +840,12 @@ int main(int argc, FAR char *argv[])
 
   /* Wait for receiver thread to terminate */
 
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
   pthread_kill(fwd.if_receiver, 9);
+#else
+  pthread_cancel(fwd.if_receiver);
+#endif
+
   ret = pthread_join(fwd.if_receiver, &value);
   if (ret != OK)
     {

examples/usrsocktest/usrsocktest_wake_with_signal.c

@@ -560,8 +560,11 @@ static void do_wake_test(enum e_test_type type, int flags)
 
       for (tidx = 0; tidx < nthreads; tidx++)
         {
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
           pthread_kill(tid[tidx], SIGUSR1);
-
+#else
+          pthread_cancel(tid[tidx]);
+#endif
           /* Wait threads to complete work. */
 
           ret = pthread_join(tid[tidx], NULL);

nshlib/nsh.h

@@ -1179,6 +1179,7 @@ int cmd_switchboot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
   int cmd_unset(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
 
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
 #ifndef CONFIG_NSH_DISABLE_KILL
   int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
@@ -1191,6 +1192,7 @@ int cmd_switchboot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #ifndef CONFIG_NSH_DISABLE_USLEEP
   int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
 #endif
+#endif /* !CONFIG_DISABLE_ALL_SIGNALS */
 
 #ifndef CONFIG_NSH_DISABLE_UPTIME
   int cmd_uptime(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);

nshlib/nsh_command.c

@@ -304,14 +304,6 @@ static const struct cmdmap_s g_cmdmap[] =
   CMD_MAP("irqinfo",  cmd_irqinfo,  1, 1, NULL),
 #endif
 
-#ifndef CONFIG_NSH_DISABLE_KILL
-  CMD_MAP("kill",     cmd_kill,     2, 3, "[-<signal>] <pid>"),
-#endif
-
-#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
-  CMD_MAP("pkill",     cmd_pkill,     2, 3, "[-<signal>] <name>"),
-#endif
-
 #ifndef CONFIG_DISABLE_MOUNTPOINT
 #  if defined(CONFIG_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSETUP)
   CMD_MAP("losetup",  cmd_losetup,  3, 6,
@@ -575,10 +567,24 @@ static const struct cmdmap_s g_cmdmap[] =
 #endif
 #endif
 
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
+#ifndef CONFIG_NSH_DISABLE_KILL
+  CMD_MAP("kill",     cmd_kill,     2, 3, "[-<signal>] <pid>"),
+#endif
+
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
+  CMD_MAP("pkill",     cmd_pkill,     2, 3, "[-<signal>] <name>"),
+#endif
+
 #ifndef CONFIG_NSH_DISABLE_SLEEP
   CMD_MAP("sleep",    cmd_sleep,    2, 2, "<sec>"),
 #endif
 
+#ifndef CONFIG_NSH_DISABLE_USLEEP
+  CMD_MAP("usleep",   cmd_usleep,   2, 2, "<usec>"),
+#endif
+#endif
+
 #if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_SOURCE)
   CMD_MAP("source",   cmd_source,   2, 2, "<script-path>"),
 #endif
@@ -657,10 +663,6 @@ static const struct cmdmap_s g_cmdmap[] =
 #  endif
 #endif
 
-#ifndef CONFIG_NSH_DISABLE_USLEEP
-  CMD_MAP("usleep",   cmd_usleep,   2, 2, "<usec>"),
-#endif
-
 #ifndef CONFIG_NSH_DISABLE_WATCH
   CMD_MAP("watch",     cmd_watch,
           2, 6, "[-n] interval [-c] count <command>"),

nshlib/nsh_proccmds.c

@@ -995,7 +995,8 @@ int cmd_pidof(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
  * Name: cmd_kill
  ****************************************************************************/
 
-#ifndef CONFIG_NSH_DISABLE_KILL
+#if !defined(CONFIG_NSH_DISABLE_KILL) && \
+    !defined(CONFIG_DISABLE_ALL_SIGNALS)
 int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR char *ptr;
@@ -1098,7 +1099,8 @@ int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
  * Name: cmd_pkill
  ****************************************************************************/
 
-#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL) && \
+    !defined(CONFIG_DISABLE_ALL_SIGNALS)
 int cmd_pkill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   FAR const char *name;
@@ -1199,7 +1201,8 @@ int cmd_pkill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
  * Name: cmd_sleep
  ****************************************************************************/
 
-#ifndef CONFIG_NSH_DISABLE_SLEEP
+#if !defined(CONFIG_NSH_DISABLE_SLEEP) && \
+    !defined(CONFIG_DISABLE_ALL_SIGNALS)
 int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   UNUSED(argc);
@@ -1222,8 +1225,8 @@ int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 /****************************************************************************
  * Name: cmd_usleep
  ****************************************************************************/
-
-#ifndef CONFIG_NSH_DISABLE_USLEEP
+#if !defined(CONFIG_NSH_DISABLE_USLEEP) && \
+    !defined(CONFIG_DISABLE_ALL_SIGNALS)
 int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
 {
   UNUSED(argc);

system/sensortest/sensortest.c

@@ -266,10 +266,12 @@ static void usage(void)
   printf("\t<sensor_node_name> ex, accel0(/dev/uorb/sensor_accel0)\n");
 }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
 static void exit_handler(int signo)
 {
   g_should_exit = true;
 }
+#endif
 
 /****************************************************************************
  * Public Functions
@@ -300,10 +302,12 @@ int main(int argc, FAR char *argv[])
       return -EINVAL;
     }
 
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
   if (signal(SIGINT, exit_handler) == SIG_ERR)
     {
       return -errno;
     }
+#endif
 
   g_should_exit = false;
   while ((ret = getopt(argc, argv, "i:b:n:h")) != EOF)

testing/ostest/CMakeLists.txt

@@ -22,14 +22,15 @@
 
 if(CONFIG_TESTING_OSTEST)
 
-  set(SRCS
-      getopt.c
-      libc_memmem.c
-      restart.c
-      sigprocmask.c
-      sighand.c
-      signest.c
-      sighelper.c)
+  set(SRCS getopt.c libc_memmem.c restart.c sighelper.c)
+
+  if(CONFIG_ENABLE_ALL_SIGNALS)
+    list(APPEND SRCS sighand.c signest.c)
+  endif()
+
+  if(NOT CONFIG_DISABLE_ALL_SIGNALS)
+    list(APPEND SRCS sigprocmask.c)
+  endif()
 
   if(CONFIG_DEV_NULL)
     list(APPEND SRCS dev_null.c)

testing/ostest/Makefile

@@ -31,9 +31,17 @@ MODULE = $(CONFIG_TESTING_OSTEST)
 
 # NuttX OS Test
 
-CSRCS   = getopt.c libc_memmem.c restart.c sigprocmask.c sighand.c \
+CSRCS   = getopt.c libc_memmem.c restart.c \
           signest.c sighelper.c
 
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CSRCS += sighand.c signest.c
+endif
+
+ifneq ($(CONFIG_DISABLE_ALL_SIGNALS),y)
+CSRCS += sigprocmask.c
+endif
+
 MAINSRC = ostest_main.c
 
 ifeq ($(CONFIG_DEV_NULL),y)

testing/ostest/mqueue.c

@@ -382,8 +382,10 @@ void mqueue_test(void)
 
   /* Wake up the receiver thread with a signal */
 
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
   printf("mqueue_test: Killing receiver\n");
   pthread_kill(receiver, SIGUSR1);
+#endif
 
   /* Wait a bit to see if the thread exits on its own */
 

wireless/ieee802154/i8sak/i8sak_events.c

@@ -256,7 +256,13 @@ int i8sak_eventlistener_stop(FAR struct i8sak_s *i8sak)
   FAR void *value;
 
   i8sak->eventlistener_run = false;
+
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
   pthread_kill(i8sak->eventlistener_threadid, 2);
+#else
+  pthread_cancel(i8sak->eventlistener_threadid);
+#endif
+
   ret = pthread_join(i8sak->eventlistener_threadid, &value);
   if (ret != OK)
     {