xiaoxiang781216 commented on code in PR #17644:
URL: https://github.com/apache/nuttx/pull/17644#discussion_r2679742488
##########
syscall/syscall.csv:
##########
@@ -178,10 +178,10 @@
"signalfd","sys/signalfd.h","defined(CONFIG_SIGNAL_FD)","int","int","FAR const
sigset_t *","int"
"sigpending","signal.h","defined(CONFIG_ENABLE_ALL_SIGNALS)","int","FAR
sigset_t *"
"sigprocmask","signal.h","","int","int","FAR const sigset_t *","FAR sigset_t *"
Review Comment:
what's about sigprocmask
##########
include/nuttx/sched.h:
##########
@@ -662,9 +664,17 @@ struct tcb_s
sigset_t sigprocmask; /* Signals that are blocked */
sigset_t sigwaitmask; /* Waiting for pending signals */
+ siginfo_t *sigunbinfo; /* Signal info when task unblocked */
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
Review Comment:
let's move to line 517
##########
sched/signal/Make.defs:
##########
@@ -38,4 +39,4 @@ endif
# Include signal build support
DEPPATH += --dep-path signal
-VPATH += :signal
+VPATH += :signal
Review Comment:
revert the change
##########
syscall/syscall.csv:
##########
Review Comment:
ditto
##########
sched/signal/CMakeLists.txt:
##########
@@ -59,4 +61,6 @@ if(CONFIG_SIG_DEFAULT)
list(APPEND SRCS sig_default.c)
endif()
-target_sources(sched PRIVATE ${SRCS})
+if(NOT CONFIG_DISABLE_ALL_SIGNALS)
Review Comment:
revert the change
##########
include/nuttx/sched.h:
##########
@@ -662,9 +662,12 @@ struct tcb_s
/* POSIX Signal Control Fields ********************************************/
+#ifndef CONFIG_DISABLE_ALL_SIGNALS
+
Review Comment:
remove the blank line
##########
syscall/syscall.csv:
##########
Review Comment:
need guard
##########
arch/arm/src/common/Make.defs:
##########
@@ -40,9 +40,11 @@ endif
ifeq ($(CONFIG_BUILD_PROTECTED)$(CONFIG_BUILD_KERNEL),y)
CMN_CSRCS += arm_task_start.c arm_pthread_start.c
- CMN_CSRCS += arm_signal_dispatch.c
Review Comment:
many files doesn't update yet:
```
arch/arm/src/tlsr82/tc32/Make.defs
arch/arm/src/common/arm_signal_dispatch.c
arch/arm/src/common/gnu/arm_signal_handler.S
arch/arm/src/c5471/c5471_vectors.S
arch/arm/src/armv8-r/arm_vectors.S
arch/arm/src/armv8-m/arm_exception.S
...
```
please reference the patch:
https://github.com/apache/nuttx/pull/17357/changes
##########
arch/arm64/src/common/Make.defs:
##########
Review Comment:
need modify
##########
arch/arm64/include/irq.h:
##########
@@ -267,16 +268,18 @@ struct xcptcontext
uintptr_t sigreturn;
#endif
+#endif /* CONFIG_ENABLE_ALL_SIGNALS */
/* task stack reg context */
uint64_t *regs;
#ifndef CONFIG_BUILD_FLAT
uint64_t *initregs;
#endif
-
+#ifdef CONFIG_ENABLE_ALL_SIGNALS
Review Comment:
merge to line 262
##########
arch/arm64/src/common/Make.defs:
##########
@@ -50,6 +49,10 @@ CMN_CSRCS += arm64_syscall.c
CMN_CSRCS += arm64_modifyreg8.c arm64_modifyreg16.c arm64_modifyreg32.c
CMN_CSRCS += arm64_hwdebug.c
+ifeq ($(CONFIG_ENABLE_ALL_SIGNALS),y)
+CMN_CSRCS += arm64_schedulesigaction.c arm64_sigdeliver.c
Review Comment:
need modify:
arch/arm64/src/common/arm64_signal_dispatch.c
arch/arm64/src/common/arm64_syscall.c
please merge all change from
https://github.com/apache/nuttx/pull/17357/changes
##########
libs/libc/signal/CMakeLists.txt:
##########
@@ -20,28 +20,32 @@
#
#
##############################################################################
-set(SRCS
- sig_addset.c
- sig_delset.c
- sig_emptyset.c
- sig_fillset.c
- sig_nandset.c
- sig_andset.c
- sig_orset.c
- sig_xorset.c
- sig_isemptyset.c
- sig_killpg.c
- sig_altstack.c
- sig_hold.c
- sig_ismember.c
- sig_pause.c
- sig_psignal.c
- sig_raise.c
- sig_relse.c
- sig_wait.c)
+if(NOT CONFIG_DISABLE_ALL_SIGNALS)
+ set(SRCS
+ sig_addset.c
+ sig_delset.c
+ sig_emptyset.c
+ sig_fillset.c
+ sig_nandset.c
+ sig_andset.c
+ sig_orset.c
+ sig_xorset.c
+ sig_isemptyset.c
+ sig_killpg.c
+ sig_altstack.c
+ sig_hold.c
+ sig_ismember.c
+ sig_pause.c
+ sig_psignal.c
+ sig_raise.c
+ sig_relse.c
+ sig_wait.c)
+endif()
if(CONFIG_ENABLE_ALL_SIGNALS)
list(APPEND SRCS sig_ignore.c sig_interrupt.c sig_set.c sig_signal.c)
endif()
-target_sources(c PRIVATE ${SRCS})
+if(NOT CONFIG_DISABLE_ALL_SIGNALS)
Review Comment:
revert
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
