1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove special handling of SIGCHLD. (#7482)

Browse Source
This commit is contained in:
Samuel Williams 2023-03-09 21:48:50 +13:00 committed by GitHub
parent 7bd7aee02e
commit 44a0711eab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-03-09 08:49:10 +00:00 
Merged-By: ioquatix <samuel@codeotaku.com>
1 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
signal.c
View File

@ -508,9 +508,6 @@ static struct {
rb_atomic_t cnt[RUBY_NSIG]; rb_atomic_t cnt[RUBY_NSIG];
rb_atomic_t size; rb_atomic_t size;
} signal_buff; } signal_buff;
#if RUBY_SIGCHLD
volatile unsigned int ruby_nocldwait;
#endif
#define sighandler_t ruby_sighandler_t #define sighandler_t ruby_sighandler_t
@ -608,27 +605,6 @@ ruby_signal(int signum, sighandler_t handler)
#endif #endif
switch (signum) { switch (signum) {
#if RUBY_SIGCHLD
case RUBY_SIGCHLD:
if (handler == SIG_IGN) {
ruby_nocldwait = 1;
# ifdef USE_SIGALTSTACK
if (sigact.sa_flags & SA_SIGINFO) {
sigact.sa_sigaction = (ruby_sigaction_t*)sighandler;
}
else {
sigact.sa_handler = sighandler;
}
# else
sigact.sa_handler = handler;
sigact.sa_flags = 0;
# endif
}
else {
ruby_nocldwait = 0;
}
break;
#endif
#if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK) #if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK)
case SIGSEGV: case SIGSEGV:
#ifdef SIGBUS #ifdef SIGBUS
@ -707,35 +683,14 @@ signal_enque(int sig)
ATOMIC_INC(signal_buff.size); ATOMIC_INC(signal_buff.size);
} }
#if RUBY_SIGCHLD
static rb_atomic_t sigchld_hit;
/* destructive getter than simple predicate */
# define GET_SIGCHLD_HIT() ATOMIC_EXCHANGE(sigchld_hit, 0)
#else
# define GET_SIGCHLD_HIT() 0
#endif
static void static void
sighandler(int sig) sighandler(int sig)
{ {
int old_errnum = errno; int old_errnum = errno;
/* the VM always needs to handle SIGCHLD for rb_waitpid */
if (sig == RUBY_SIGCHLD) {
#if RUBY_SIGCHLD
rb_vm_t *vm = GET_VM();
ATOMIC_EXCHANGE(sigchld_hit, 1);
/* avoid spurious wakeup in main thread if and only if nobody uses trap(:CHLD) */
if (vm && ACCESS_ONCE(VALUE, vm->trap_list.cmd[sig])) {
signal_enque(sig); signal_enque(sig);
}
#endif
}
else {
signal_enque(sig);
}
rb_thread_wakeup_timer_thread(sig); rb_thread_wakeup_timer_thread(sig);
#if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL) #if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL)
ruby_signal(sig, sighandler); ruby_signal(sig, sighandler);
#endif #endif
@ -1151,9 +1106,6 @@ default_handler(int sig)
#endif #endif
#ifdef SIGUSR2 #ifdef SIGUSR2
case SIGUSR2: case SIGUSR2:
#endif
#if RUBY_SIGCHLD
case RUBY_SIGCHLD:
#endif #endif
func = sighandler; func = sighandler;
break; break;
@ -1220,9 +1172,6 @@ trap_handler(VALUE *cmd, int sig)
break; break;
case 14: case 14:
if (memcmp(cptr, "SYSTEM_DEFAULT", 14) == 0) { if (memcmp(cptr, "SYSTEM_DEFAULT", 14) == 0) {
if (sig == RUBY_SIGCHLD) {
goto sig_dfl;
}
func = SIG_DFL; func = SIG_DFL;
*cmd = 0; *cmd = 0;
} }