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

* process.c (handle_fork_error): Don't need state_p argument.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-09-05 11:49:04 +00:00
parent 4eed59e667
commit 5e42cc3085
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Sep 5 20:48:06 2014 Tanaka Akira <akr@fsij.org>
* process.c (handle_fork_error): Don't need state_p argument.
Fri Sep 5 20:35:52 2014 Tanaka Akira <akr@fsij.org> Fri Sep 5 20:35:52 2014 Tanaka Akira <akr@fsij.org>
* process.c (has_privilege): Fix a return value. * process.c (has_privilege): Fix a return value.

18
process.c
View File

@ -3159,8 +3159,10 @@ pipe_nocrash(int filedes[2], VALUE fds)
#endif #endif
static int static int
handle_fork_error(int *status, int *ep, int *state_p, int *try_gc_p) handle_fork_error(int *status, int *ep, int *try_gc_p)
{ {
int state = 0;
switch (errno) { switch (errno) {
case ENOMEM: case ENOMEM:
if ((*try_gc_p)-- > 0 && !rb_during_gc()) { if ((*try_gc_p)-- > 0 && !rb_during_gc()) {
@ -3177,16 +3179,16 @@ handle_fork_error(int *status, int *ep, int *state_p, int *try_gc_p)
return 0; return 0;
} }
else { else {
rb_protect((VALUE (*)())rb_thread_sleep, 1, state_p); rb_protect((VALUE (*)())rb_thread_sleep, 1, &state);
if (status) *status = *state_p; if (status) *status = state;
if (!*state_p) return 0; if (!state) return 0;
} }
break; break;
} }
if (ep) { if (ep) {
preserving_errno((close(ep[0]), close(ep[1]))); preserving_errno((close(ep[0]), close(ep[1])));
} }
if (*state_p && !status) rb_jump_tag(*state_p); if (state && !status) rb_jump_tag(state);
return -1; return -1;
} }
@ -3388,7 +3390,6 @@ retry_fork_async_signal_safe(int *status, int *ep,
char *errmsg, size_t errmsg_buflen) char *errmsg, size_t errmsg_buflen)
{ {
rb_pid_t pid; rb_pid_t pid;
int state = 0;
int try_gc = 1; int try_gc = 1;
while (1) { while (1) {
@ -3416,7 +3417,7 @@ retry_fork_async_signal_safe(int *status, int *ep,
if (0 < pid) /* fork succeed, parent process */ if (0 < pid) /* fork succeed, parent process */
return pid; return pid;
/* fork failed */ /* fork failed */
if (handle_fork_error(status, ep, &state, &try_gc)) if (handle_fork_error(status, ep, &try_gc))
return -1; return -1;
} }
} }
@ -3458,7 +3459,6 @@ static rb_pid_t
retry_fork_ruby(int *status) retry_fork_ruby(int *status)
{ {
rb_pid_t pid; rb_pid_t pid;
int state = 0;
int try_gc = 1; int try_gc = 1;
while (1) { while (1) {
@ -3471,7 +3471,7 @@ retry_fork_ruby(int *status)
if (0 < pid) /* fork succeed, parent process */ if (0 < pid) /* fork succeed, parent process */
return pid; return pid;
/* fork failed */ /* fork failed */
if (handle_fork_error(status, NULL, &state, &try_gc)) if (handle_fork_error(status, NULL, &try_gc))
return -1; return -1;
} }
} }