ruby-changes:51665
From: normal <ko1@a...>
Date: Sun, 8 Jul 2018 08:59:29 +0900 (JST)
Subject: [ruby-changes:51665] normal:r63877 (trunk): process.c (rb_f_exec): pause MJIT before replacing process
normal 2018-07-08 08:59:23 +0900 (Sun, 08 Jul 2018) New Revision: 63877 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63877 Log: 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] Modified files: trunk/process.c trunk/spec/ruby/core/process/wait2_spec.rb Index: spec/ruby/core/process/wait2_spec.rb =================================================================== --- spec/ruby/core/process/wait2_spec.rb (revision 63876) +++ spec/ruby/core/process/wait2_spec.rb (revision 63877) @@ -15,8 +15,7 @@ describe "Process.wait2" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/process/wait2_spec.rb#L15 $stderr.puts "leaked before wait2 specs: #{leaked}" unless leaked.empty? with_feature :mjit do # Ruby-space should not see PIDs used by mjit - # TODO: Enable this once it succeeds with -DMJIT_FORCE_ENABLE - # leaked.should be_empty + leaked.should be_empty end rescue Errno::ECHILD # No child processes rescue NotImplementedError Index: process.c =================================================================== --- process.c (revision 63876) +++ process.c (revision 63877) @@ -148,6 +148,10 @@ static void check_uid_switch(void); https://github.com/ruby/ruby/blob/trunk/process.c#L148 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) https://github.com/ruby/ruby/blob/trunk/process.c#L2853 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; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/