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

* process.c (forked_child): Removed.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-09-03 09:56:38 +00:00
parent b46b1e3f5a
commit ed0f2528e8
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Sep 3 18:56:05 2014 Tanaka Akira <akr@fsij.org>
* process.c (forked_child): Removed.
Wed Sep 3 16:56:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Sep 3 16:56:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_obj_copy_ivar): allocate no memory for empty * object.c (rb_obj_copy_ivar): allocate no memory for empty

15
process.c
View File

@ -1094,8 +1094,6 @@ proc_detach(VALUE obj, VALUE pid)
return rb_detach_process(NUM2PIDT(pid)); return rb_detach_process(NUM2PIDT(pid));
} }
static int forked_child = 0;
#ifdef SIGPIPE #ifdef SIGPIPE
static RETSIGTYPE (*saved_sigpipe_handler)(int) = 0; static RETSIGTYPE (*saved_sigpipe_handler)(int) = 0;
#endif #endif
@ -1123,9 +1121,8 @@ before_exec_async_signal_safe(void)
} }
static void static void
before_exec_non_async_signal_safe(void) before_exec_non_async_signal_safe()
{ {
if (!forked_child) {
/* /*
* On Mac OS X 10.5.x (Leopard) or earlier, exec() may return ENOTSUP * On Mac OS X 10.5.x (Leopard) or earlier, exec() may return ENOTSUP
* if the process have multiple threads. Therefore we have to kill * if the process have multiple threads. Therefore we have to kill
@ -1134,11 +1131,10 @@ before_exec_non_async_signal_safe(void)
* in multiple threads. * in multiple threads.
*/ */
rb_thread_stop_timer_thread(0); rb_thread_stop_timer_thread(0);
}
} }
static void static void
before_exec(void) before_exec()
{ {
before_exec_non_async_signal_safe(); before_exec_non_async_signal_safe();
before_exec_async_signal_safe(); before_exec_async_signal_safe();
@ -1158,8 +1154,6 @@ after_exec_non_async_signal_safe(void)
{ {
rb_thread_reset_timer_thread(); rb_thread_reset_timer_thread();
rb_thread_start_timer_thread(); rb_thread_start_timer_thread();
forked_child = 0;
} }
static void static void
@ -3087,7 +3081,7 @@ static int
rb_exec_without_timer_thread(const struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen) rb_exec_without_timer_thread(const struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen)
{ {
int ret; int ret;
before_exec_non_async_signal_safe(); /* async-signal-safe if forked_child is true */ before_exec_non_async_signal_safe(); /* not async-signal-safe because it calls rb_thread_stop_timer_thread. */
ret = rb_exec_async_signal_safe(eargp, errmsg, errmsg_buflen); /* hopefully async-signal-safe */ ret = rb_exec_async_signal_safe(eargp, errmsg, errmsg_buflen); /* hopefully async-signal-safe */
preserving_errno(after_exec_non_async_signal_safe()); /* not async-signal-safe because it calls rb_thread_start_timer_thread. */ preserving_errno(after_exec_non_async_signal_safe()); /* not async-signal-safe because it calls rb_thread_start_timer_thread. */
return ret; return ret;
@ -3301,7 +3295,6 @@ retry_fork_async_signal_safe(int *status, int *ep,
#endif #endif
if (pid == 0) {/* fork succeed, child process */ if (pid == 0) {/* fork succeed, child process */
int ret; int ret;
forked_child = 1;
close(ep[0]); close(ep[0]);
ret = chfunc(charg, errmsg, errmsg_buflen); ret = chfunc(charg, errmsg, errmsg_buflen);
if (!ret) _exit(EXIT_SUCCESS); if (!ret) _exit(EXIT_SUCCESS);
@ -3312,7 +3305,6 @@ retry_fork_async_signal_safe(int *status, int *ep,
_exit(127); _exit(127);
#endif #endif
} }
forked_child = 0; /* for vfork(). */
if (0 < pid) /* fork succeed, parent process */ if (0 < pid) /* fork succeed, parent process */
return pid; return pid;
/* fork failed */ /* fork failed */
@ -3387,7 +3379,6 @@ rb_fork_ruby(int *status)
if (pid < 0) if (pid < 0)
return pid; return pid;
if (!pid) { if (!pid) {
forked_child = 1;
after_fork(); after_fork();
} }
return pid; return pid;