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

* ext/socket/init.c (rsock_socket): use SOCK_CLOEXEC if available.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-10-31 14:38:50 +00:00
parent 6a96646de2
commit 1a8fbff3db
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Oct 31 23:31:53 2011 Tanaka Akira <akr@fsij.org>
* ext/socket/init.c (rsock_socket): use SOCK_CLOEXEC if available.
Mon Oct 31 21:47:44 2011 NARUSE, Yui <naruse@ruby-lang.org> Mon Oct 31 21:47:44 2011 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_cloexec_pipe): NetBSD 6.0 will support pipe2(2), * io.c (rb_cloexec_pipe): NetBSD 6.0 will support pipe2(2),

25
ext/socket/init.c
View File

@ -240,19 +240,38 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type
} }
int int
rsock_socket(int domain, int type, int proto) rsock_socket(int domain, int type0, int proto)
{ {
int fd; int fd, type;
#ifdef SOCK_CLOEXEC
static int try_sock_cloexec = 1;
if (try_sock_cloexec)
type = type0|SOCK_CLOEXEC;
else
type = type0;
retry_without_sock_cloexec:;
#else
type = type0;
#endif
fd = socket(domain, type, proto); fd = socket(domain, type, proto);
if (fd < 0) { if (fd < 0) {
#ifdef SOCK_CLOEXEC
/* SOCK_CLOEXEC is available since Linux 2.6.27. Linux 2.6.18 fails with EINVAL */
if (try_sock_cloexec && errno == EINVAL) {
try_sock_cloexec = 0;
type = type0;
goto retry_without_sock_cloexec;
}
#endif
if (errno == EMFILE || errno == ENFILE) { if (errno == EMFILE || errno == ENFILE) {
rb_gc(); rb_gc();
fd = socket(domain, type, proto); fd = socket(domain, type, proto);
} }
} }
if (0 <= fd) if (0 <= fd)
rb_fd_fix_cloexec(fd); rb_update_max_fd(fd);
return fd; return fd;
} }