summaryrefslogtreecommitdiff
path: root/process.c
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-07 23:59:23 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-07 23:59:23 +0000
commitac41c2c1322b0ff4ed363e05fd03d9cfcc1ced55 (patch)
tree73fb327ccd7e226d8e1b787150dd0fb8c12370b5 /process.c
parenta854e4dd182de3597cdafd7c80e5470eaccfd202 (diff)
downloadruby-ac41c2c1322b0ff4ed363e05fd03d9cfcc1ced55.tar.gz
process.c (rb_f_exec): pause MJIT before replacing process
Non-parallel "make test-spec" caused spec/ruby/core/process/wait2_spec.rb failures because mspec uses "exec" in single-process mode, so there's no chance the post-exec state could know about the MJIT child process from its pre-exec state. [ruby-core:87846] [Bug #14867] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/process.c b/process.c
index 12cceba934..67883e0af2 100644
--- a/process.c
+++ b/process.c
@@ -148,6 +148,10 @@ static void check_uid_switch(void);
static void check_gid_switch(void);
static int exec_async_signal_safe(const struct rb_execarg *, char *, size_t);
+/* mjit.c */
+extern int mjit_enabled;
+VALUE mjit_pause(void);
+
#if 1
#define p_uid_from_name p_uid_from_name
#define p_gid_from_name p_gid_from_name
@@ -2849,6 +2853,7 @@ rb_f_exec(int argc, const VALUE *argv)
execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE);
eargp = rb_execarg_get(execarg_obj);
+ if (mjit_enabled) mjit_pause(); /* do not leak children */
before_exec(); /* stop timer thread before redirects */
rb_execarg_parent_start(execarg_obj);
fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;