From aa8dd0290b20fa9db9b545b8a1670ff3371c2e4b Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 9 Sep 2012 15:17:15 +0000 Subject: * process.c: exec() requires to be single threaded also on Haiku. by Takashi Toyoshima https://github.com/ruby/ruby/pull/178 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ process.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 586c27a49c..41d4d7371c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 10 00:16:34 2012 NARUSE, Yui + + * process.c: exec() requires to be single threaded also on Haiku. + by Takashi Toyoshima + https://github.com/ruby/ruby/pull/178 + Sun Sep 9 21:21:15 2012 KOSAKI Motohiro * lib/thread.rb (Queue#pop): Fixed double registration issue when diff --git a/process.c b/process.c index e0bb84a4d2..270ee769c9 100644 --- a/process.c +++ b/process.c @@ -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 * if the process have multiple threads. Therefore we have to kill * 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); } @@ -2307,7 +2309,7 @@ rb_f_exec(int argc, VALUE *argv) rb_execarg_fixup(execarg_obj); 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)); #else rb_exec_async_signal_safe(eargp, errmsg, sizeof(errmsg)); -- cgit v1.2.3