From 7a918b85ddcd903244055e1d3946775d9ce53c84 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 21 Jun 2006 20:19:07 +0000 Subject: * ext/socket/socket.c (sock_s_socketpair): try GC only once. [ruby-dev:28778] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/socket.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'ext/socket') diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 80a271baa..1a7c6ab08 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)"); } -- cgit