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

* process.c (retry_fork_async_signal_safe): Don't return on in child

Browse Source 
process.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-09-02 15:13:36 +00:00
parent 93621161d6
commit 34af76e318
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Sep 3 00:12:44 2014 Tanaka Akira <akr@fsij.org>
* process.c (retry_fork_async_signal_safe): Don't return on in child
process.
Tue Sep 2 23:47:35 2014 Tanaka Akira <akr@fsij.org> Tue Sep 2 23:47:35 2014 Tanaka Akira <akr@fsij.org>
* process.c (retry_fork_async_signal_safe): Specialized version of * process.c (retry_fork_async_signal_safe): Specialized version of

34
process.c
View File

@ -3281,7 +3281,9 @@ recv_child_error(int fd, int *errp, char *errmsg, size_t errmsg_buflen)
} }
static rb_pid_t static rb_pid_t
retry_fork_async_signal_safe(int *status, int *ep) retry_fork_async_signal_safe(int *status, int *ep,
int (*chfunc)(void*, char *, size_t), void *charg,
char *errmsg, size_t errmsg_buflen)
{ {
rb_pid_t pid; rb_pid_t pid;
int state = 0; int state = 0;
@ -3290,8 +3292,19 @@ retry_fork_async_signal_safe(int *status, int *ep)
while (1) { while (1) {
prefork(); prefork();
pid = fork(); pid = fork();
if (pid == 0) /* fork succeed, child process */ if (pid == 0) {/* fork succeed, child process */
return pid; int ret;
forked_child = 1;
close(ep[0]);
ret = chfunc(charg, errmsg, errmsg_buflen);
if (!ret) _exit(EXIT_SUCCESS);
send_child_error(ep[1], errmsg, errmsg_buflen);
#if EXIT_SUCCESS == 127
_exit(EXIT_FAILURE);
#else
_exit(127);
#endif
}
if (0 < pid) /* fork succeed, parent process */ if (0 < pid) /* fork succeed, parent process */
return pid; return pid;
/* fork failed */ /* fork failed */
@ -3313,22 +3326,9 @@ rb_fork_async_signal_safe(int *status, int (*chfunc)(void*, char *, size_t), voi
if (status) *status = 0; if (status) *status = 0;
if (pipe_nocrash(ep, fds)) return -1; if (pipe_nocrash(ep, fds)) return -1;
pid = retry_fork_async_signal_safe(status, ep); pid = retry_fork_async_signal_safe(status, ep, chfunc, charg, errmsg, errmsg_buflen);
if (pid < 0) if (pid < 0)
return pid; return pid;
if (!pid) {
int ret;
forked_child = 1;
close(ep[0]);
ret = chfunc(charg, errmsg, errmsg_buflen);
if (!ret) _exit(EXIT_SUCCESS);
send_child_error(ep[1], errmsg, errmsg_buflen);
#if EXIT_SUCCESS == 127
_exit(EXIT_FAILURE);
#else
_exit(127);
#endif
}
close(ep[1]); close(ep[1]);
error_occurred = recv_child_error(ep[0], &err, errmsg, errmsg_buflen); error_occurred = recv_child_error(ep[0], &err, errmsg, errmsg_buflen);
if (state || error_occurred) { if (state || error_occurred) {