diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-28 14:37:34 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-28 14:37:34 +0000 |
| commit | 965b947fff6453464acfc9726db09db359db920b (patch) | |
| tree | 431763219edb8e8be63cf5f7978e90acff0e604e /ext/socket/unixsocket.c | |
| parent | fbf4850cabbb7dc50be08660fe39889d03a03b96 (diff) | |
| download | ruby-965b947fff6453464acfc9726db09db359db920b.tar.gz | |
* ext/socket: Avoid redundant fcntl/fstat syscalls for cloexec
sockets.
Patch by Eric Wong. [ruby-core:59429] [Feature #9330]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/unixsocket.c')
| -rw-r--r-- | ext/socket/unixsocket.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 1742496e84..519343b558 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -389,7 +389,13 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock) #if FD_PASSING_BY_MSG_CONTROL memcpy(&fd, CMSG_DATA(&cmsg.hdr), sizeof(int)); #endif - rb_fd_fix_cloexec(fd); + + rb_update_max_fd(fd); + + if (rsock_cmsg_cloexec_state < 0) + rsock_cmsg_cloexec_state = rsock_detect_cloexec(fd); + if (rsock_cmsg_cloexec_state == 0 || fd <= 2) + rb_maygvl_fd_fix_cloexec(fd); if (klass == Qnil) return INT2FIX(fd); |