kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r32062 from trunk into ruby_1_9_2.

Browse source 
--
* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
  (unix_recv_io): ditto.
  fixed by Eric Wong.  [ruby-core:35574]

* test/socket/test_unix.rb: test added for above problem.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-07-03 12:24:07 +00:00
parent 8a57111129
commit 877a9a7d99
4 changed files with 54 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Jun 13 23:05:01 2011 Tanaka Akira <akr@fsij.org>
* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
(unix_recv_io): ditto.
fixed by Eric Wong. [ruby-core:35574]
* test/socket/test_unix.rb: test added for above problem.
Thu May 12 12:24:22 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Thu May 12 12:24:22 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed. * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.

14
ext/socket/unixsocket.c
View file

@ -248,9 +248,10 @@ unix_send_io(VALUE sock, VALUE val)
#endif #endif
arg.fd = fptr->fd; arg.fd = fptr->fd;
rb_thread_fd_writable(arg.fd); while ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1) {
if ((int)BLOCKING_REGION(sendmsg_blocking, &arg) == -1) if (!rb_io_wait_writable(arg.fd))
rb_sys_fail("sendmsg(2)"); rb_sys_fail("sendmsg(2)");
}
return Qnil; return Qnil;
} }
@ -334,9 +335,10 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
#endif #endif
arg.fd = fptr->fd; arg.fd = fptr->fd;
rb_thread_wait_fd(arg.fd); while ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1) {
if ((int)BLOCKING_REGION(recvmsg_blocking, &arg) == -1) if (!rb_io_wait_readable(arg.fd))
rb_sys_fail("recvmsg(2)"); rb_sys_fail("recvmsg(2)");
}
#if FD_PASSING_BY_MSG_CONTROL #if FD_PASSING_BY_MSG_CONTROL
if (arg.msg.msg_controllen < sizeof(struct cmsghdr)) { if (arg.msg.msg_controllen < sizeof(struct cmsghdr)) {

37
test/socket/test_unix.rb
View file

@ -6,6 +6,8 @@ end
require "test/unit" require "test/unit"
require "tempfile" require "tempfile"
require "tmpdir" require "tmpdir"
require "thread"
require "io/nonblock"
class TestSocket_UNIXSocket < Test::Unit::TestCase class TestSocket_UNIXSocket < Test::Unit::TestCase
def test_fd_passing def test_fd_passing
@ -102,6 +104,41 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
io_ary.each {|io| io.close if !io.closed? } io_ary.each {|io| io.close if !io.closed? }
end end
def test_fd_passing_race_condition
r1, w = IO.pipe
s1, s2 = UNIXSocket.pair
s1.nonblock = s2.nonblock = true
aoe = Thread.abort_on_exception
Thread.abort_on_exception = true
lock = Mutex.new
nr = 0
x = 2
y = 1000
begin
s1.send_io(nil)
rescue NotImplementedError
assert_raise(NotImplementedError) { s2.recv_io }
rescue TypeError
thrs = x.times.map do
Thread.new do
y.times do
s2.recv_io.close
lock.synchronize { nr += 1 }
end
end
end
(x * y).times { s1.send_io r1 }
thrs.each { |t| t.join }
assert_equal x * y, nr
ensure
Thread.abort_on_exception = aoe
s1.close
s2.close
w.close
r1.close
end
end
def test_sendmsg def test_sendmsg
return if !defined?(Socket::SCM_RIGHTS) return if !defined?(Socket::SCM_RIGHTS)
IO.pipe {|r1, w| IO.pipe {|r1, w|

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 282 #define RUBY_PATCHLEVEL 283
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1