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

* process.c: exec() requires to be single threaded also on Haiku.

Browse Source 
by Takashi Toyoshima <toyoshim@gmail.com>
  https://github.com/ruby/ruby/pull/178

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-09-09 15:17:15 +00:00
parent 7198053a49
commit aa8dd0290b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Sep 10 00:16:34 2012 NARUSE, Yui <naruse@ruby-lang.org>
* process.c: exec() requires to be single threaded also on Haiku.
by Takashi Toyoshima <toyoshim@gmail.com>
https://github.com/ruby/ruby/pull/178
Sun Sep 9 21:21:15 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sun Sep 9 21:21:15 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* lib/thread.rb (Queue#pop): Fixed double registration issue when * lib/thread.rb (Queue#pop): Fixed double registration issue when

4
process.c
View File

@ -1017,6 +1017,8 @@ before_exec_non_async_signal_safe(void)
* On Mac OS X 10.5.x (Leopard) or earlier, exec() may return ENOTSUPP * On Mac OS X 10.5.x (Leopard) or earlier, exec() may return ENOTSUPP
* if the process have multiple threads. Therefore we have to kill * if the process have multiple threads. Therefore we have to kill
* internal threads temporary. [ruby-core:10583] * internal threads temporary. [ruby-core:10583]
* This is also true on Haiku. It returns Errno::EPERM against exec()
* in multiple threads.
*/ */
rb_thread_stop_timer_thread(0); rb_thread_stop_timer_thread(0);
} }
@ -2307,7 +2309,7 @@ rb_f_exec(int argc, VALUE *argv)
rb_execarg_fixup(execarg_obj); rb_execarg_fixup(execarg_obj);
fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name; fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
#ifdef __APPLE__ #if defined(__APPLE__) || defined(__HAIKU__)
rb_exec_without_timer_thread(eargp, errmsg, sizeof(errmsg)); rb_exec_without_timer_thread(eargp, errmsg, sizeof(errmsg));
#else #else
rb_exec_async_signal_safe(eargp, errmsg, sizeof(errmsg)); rb_exec_async_signal_safe(eargp, errmsg, sizeof(errmsg));