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

Temporary revert "process.c: dead code when no SIGCHLD"

Browse Source 
This reverts commit r64407.
Maybe it breaks http://mswinci.japaneast.cloudapp.azure.com/vc12-x64/ruby-trunk/log/20180817T095734Z.fail.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-08-18 12:35:28 +00:00
parent 3e1a6feeb6
commit b5b5b28c65
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
process.c
View File

@ -981,7 +981,6 @@ rb_sigwait_fd_migrate(rb_vm_t *vm)
rb_native_mutex_unlock(&vm->waitpid_lock); rb_native_mutex_unlock(&vm->waitpid_lock);
} }
#if RUBY_SIGCHLD
static void static void
waitpid_notify(struct waitpid_state *w, rb_pid_t ret) waitpid_notify(struct waitpid_state *w, rb_pid_t ret)
{ {
@ -995,7 +994,13 @@ waitpid_notify(struct waitpid_state *w, rb_pid_t ret)
} }
} }
#ifdef _WIN32 /* for spawnvp result from mjit.c */
# define waitpid_sys(pid,status,options) \
(WaitForSingleObject((HANDLE)(pid), 0),\
GetExitCodeProcess((HANDLE)(pid), (LPDWORD)(status)))
#else
# define waitpid_sys(pid,status,options) do_waitpid((pid),(status),(options)) # define waitpid_sys(pid,status,options) do_waitpid((pid),(status),(options))
#endif
extern volatile unsigned int ruby_nocldwait; /* signal.c */ extern volatile unsigned int ruby_nocldwait; /* signal.c */
/* called by timer thread or thread which acquired sigwait_fd */ /* called by timer thread or thread which acquired sigwait_fd */
@ -1027,14 +1032,10 @@ waitpid_each(struct list_head *head)
} }
} }
} }
#else
# define ruby_nocldwait 0
#endif
void void
ruby_waitpid_all(rb_vm_t *vm) ruby_waitpid_all(rb_vm_t *vm)
{ {
#if RUBY_SIGCHLD
rb_native_mutex_lock(&vm->waitpid_lock); rb_native_mutex_lock(&vm->waitpid_lock);
waitpid_each(&vm->waiting_pids); waitpid_each(&vm->waiting_pids);
if (list_empty(&vm->waiting_pids)) { if (list_empty(&vm->waiting_pids)) {
@ -1046,7 +1047,6 @@ ruby_waitpid_all(rb_vm_t *vm)
; /* keep looping */ ; /* keep looping */
} }
rb_native_mutex_unlock(&vm->waitpid_lock); rb_native_mutex_unlock(&vm->waitpid_lock);
#endif
} }
static void static void
@ -4458,27 +4458,21 @@ rb_f_system(int argc, VALUE *argv)
execarg_obj = rb_execarg_new(argc, argv, TRUE, TRUE); execarg_obj = rb_execarg_new(argc, argv, TRUE, TRUE);
TypedData_Get_Struct(execarg_obj, struct rb_execarg, &exec_arg_data_type, eargp); TypedData_Get_Struct(execarg_obj, struct rb_execarg, &exec_arg_data_type, eargp);
#if RUBY_SIGCHLD
eargp->nocldwait_prev = ruby_nocldwait; eargp->nocldwait_prev = ruby_nocldwait;
ruby_nocldwait = 0; ruby_nocldwait = 0;
#endif
pid = rb_execarg_spawn(execarg_obj, NULL, 0); pid = rb_execarg_spawn(execarg_obj, NULL, 0);
#if defined(HAVE_WORKING_FORK) || defined(HAVE_SPAWNV) #if defined(HAVE_WORKING_FORK) || defined(HAVE_SPAWNV)
if (pid > 0) { if (pid > 0) {
int ret, status; int ret, status;
ret = rb_waitpid(pid, &status, 0); ret = rb_waitpid(pid, &status, 0);
if (ret == (rb_pid_t)-1) { if (ret == (rb_pid_t)-1) {
# if RUBY_SIGCHLD
ruby_nocldwait = eargp->nocldwait_prev; ruby_nocldwait = eargp->nocldwait_prev;
# endif
RB_GC_GUARD(execarg_obj); RB_GC_GUARD(execarg_obj);
rb_sys_fail("Another thread waited the process started by system()."); rb_sys_fail("Another thread waited the process started by system().");
} }
} }
#endif #endif
#if RUBY_SIGCHLD
ruby_nocldwait = eargp->nocldwait_prev; ruby_nocldwait = eargp->nocldwait_prev;
#endif
if (pid < 0) { if (pid < 0) {
if (eargp->exception) { if (eargp->exception) {
int err = errno; int err = errno;

6
signal.c
View File

@ -531,9 +531,7 @@ 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; volatile unsigned int ruby_nocldwait;
#endif
#ifdef __dietlibc__ #ifdef __dietlibc__
#define sighandler_t sh_t #define sighandler_t sh_t
@ -617,8 +615,7 @@ ruby_signal(int signum, sighandler_t handler)
#endif #endif
switch (signum) { switch (signum) {
#if RUBY_SIGCHLD case SIGCHLD:
case RUBY_SIGCHLD:
if (handler == SIG_IGN) { if (handler == SIG_IGN) {
ruby_nocldwait = 1; ruby_nocldwait = 1;
if (sigact.sa_flags & SA_SIGINFO) { if (sigact.sa_flags & SA_SIGINFO) {
@ -632,7 +629,6 @@ ruby_signal(int signum, sighandler_t handler)
ruby_nocldwait = 0; ruby_nocldwait = 0;
} }
break; break;
#endif
#if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK) #if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK)
case SIGSEGV: case SIGSEGV:
#ifdef SIGBUS #ifdef SIGBUS