diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-21 20:19:07 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-21 20:19:07 +0000 |
commit | 84438a5cc3147b48bca03e1a5c00751f79193f0e (patch) | |
tree | d1b745f22c719e3117b57f05c98ce7495cedd79c | |
parent | 1b5d98f3aa0405215cc6a63e165fa2c44e5823c9 (diff) |
* ext/socket/socket.c (sock_s_socketpair): try GC only once.
[ruby-dev:28778]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/socket/socket.c | 16 |
2 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Thu Jun 22 05:15:58 2006 Tanaka Akira <akr@m17n.org> + + * ext/socket/socket.c (sock_s_socketpair): try GC only once. + [ruby-dev:28778] + Wed Jun 21 21:28:32 2006 Tadayoshi Funaba <tadf@dotrb.org> * lib/date.rb (jd_to_commercial): now works fine even if in diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 80a271baaf..1a7c6ab085 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -2304,15 +2304,17 @@ sock_s_socketpair(klass, domain, type, protocol) VALUE klass, domain, type, protocol; { #if defined HAVE_SOCKETPAIR - int d, t, sp[2]; + int d, t, p, sp[2]; + int ret; setup_domain_and_type(domain, &d, type, &t); - again: - if (socketpair(d, t, NUM2INT(protocol), sp) < 0) { - if (errno == EMFILE || errno == ENFILE) { - rb_gc(); - goto again; - } + p = NUM2INT(protocol); + ret = socketpair(d, t, p, sp); + if (ret < 0 && (errno == EMFILE || errno == ENFILE)) { + rb_gc(); + ret = socketpair(d, t, p, sp); + } + if (ret < 0) { rb_sys_fail("socketpair(2)"); } |