summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-11 04:15:29 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-11 04:15:29 +0000
commit14a97fd48aad077f7e239a20dd30cad41c0f6d8f (patch)
tree27e677526f591c29820e9d781c0f3409069d7c48 /io.c
parent427347626599135f6b9aa84018df8ac23685c35f (diff)
* thread.c (thread_cleanup_func_before_exec): extracted from
thread_cleanup_func not to touch pthread data. pthread_cond_destroy in forked process may cause deadlock on Debian GNU/Linux Etch on x86, x86-64 and IA64. this doesn't cause resource leak because the process will exec soon. (terminate_atfork_before_exec_i): defined. (rb_thread_atfork_before_exec): defined. * include/ruby/intern.h (rb_thread_atfork_before_exec): declared. * process.c (rb_exec_atfork): call rb_thread_atfork_before_exec instead of rb_thread_atfork. * io.c (popen_exec): call rb_thread_atfork_before_exec instead of rb_thread_atfork. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/io.c b/io.c
index ad0b6ffda3..6bd0037d22 100644
--- a/io.c
+++ b/io.c
@@ -3671,7 +3671,7 @@ popen_exec(void *pp)
{
struct popen_arg *p = (struct popen_arg*)pp;
- rb_thread_atfork();
+ rb_thread_atfork_before_exec();
return rb_exec(p->execp);
}
#endif