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

* process.c: split after_exec into async-signal-safe part and rest.

Browse Source 
(after_exec_async_signal_safe): extracted from after_exec.
  (after_exec_non_async_signal_safe): ditto.
  (after_exec): call them.
  (rb_exec_async_signal_safe): call after_exec_async_signal_safe.
  (rb_exec_err): call after_exec_non_async_signal_safe instead of
  after_exec.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-06-09 21:48:42 +00:00
parent e6424f805b
commit 99c71b1ee4
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sun Jun 10 06:43:51 2012 Tanaka Akira <akr@fsij.org>
* process.c: split after_exec into async-signal-safe part and rest.
(after_exec_async_signal_safe): extracted from after_exec.
(after_exec_non_async_signal_safe): ditto.
(after_exec): call them.
(rb_exec_async_signal_safe): call after_exec_async_signal_safe.
(rb_exec_err): call after_exec_non_async_signal_safe instead of
after_exec.
Sun Jun 10 06:21:10 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> Sun Jun 10 06:21:10 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
* NEWS: document new features of Ruby OpenSSL. * NEWS: document new features of Ruby OpenSSL.

27
process.c
View File

@ -1026,18 +1026,28 @@ static void before_exec(void)
before_exec_async_signal_safe(); before_exec_async_signal_safe();
} }
static void after_exec(void) /* This function should be async-signal-safe. Actually it is. */
static void after_exec_async_signal_safe(void)
{
#ifdef SIGPIPE
signal(SIGPIPE, saved_sigpipe_handler); /* async-signal-safe */
#endif
}
static void 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();
#ifdef SIGPIPE
signal(SIGPIPE, saved_sigpipe_handler);
#endif
forked_child = 0; forked_child = 0;
} }
static void after_exec(void)
{
after_exec_async_signal_safe();
after_exec_non_async_signal_safe();
}
#define before_fork() before_exec() #define before_fork() before_exec()
#define after_fork() (GET_THREAD()->thrown_errinfo = 0, after_exec()) #define after_fork() (GET_THREAD()->thrown_errinfo = 0, after_exec())
@ -2606,7 +2616,7 @@ rb_exec_async_signal_safe(const struct rb_exec_arg *e, char *errmsg, size_t errm
before_exec_async_signal_safe(); /* async-signal-safe */ before_exec_async_signal_safe(); /* async-signal-safe */
if (rb_run_exec_options_err(e, sargp, errmsg, errmsg_buflen) < 0) { /* hopefully async-signal-safe */ if (rb_run_exec_options_err(e, sargp, errmsg, errmsg_buflen) < 0) { /* hopefully async-signal-safe */
return -1; goto failure;
} }
if (e->use_shell) { if (e->use_shell) {
@ -2623,6 +2633,9 @@ rb_exec_async_signal_safe(const struct rb_exec_arg *e, char *errmsg, size_t errm
#else #else
# undef sargp # undef sargp
#endif #endif
failure:
preserving_errno(after_exec_async_signal_safe()); /* async-signal-safe */
return -1; return -1;
} }
@ -2632,7 +2645,7 @@ rb_exec_err(const struct rb_exec_arg *e, 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(); /* async-signal-safe if forked_child is true */
ret = rb_exec_async_signal_safe(e, errmsg, errmsg_buflen); ret = rb_exec_async_signal_safe(e, errmsg, errmsg_buflen);
preserving_errno(after_exec()); /* not async-signal-safe because after_exec calls rb_thread_start_timer_thread. */ preserving_errno(after_exec_non_async_signal_safe()); /* not async-signal-safe because after_exec calls rb_thread_start_timer_thread. */
return ret; return ret;
} }