mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 21:14:23 +02:00
io + socket: make pipes and sockets nonblocking by default
All normal Ruby IO methods (IO#read, IO#gets, IO#write, ...) are all capable of appearing to be "blocking" when presented with a file description with the O_NONBLOCK flag set; so there is little risk of incompatibility within Ruby-using programs. The biggest compatibility risk is when spawning external programs. As a result, stdin, stdout, and stderr are now always made blocking before exec-family calls. This change will make an event-oriented MJIT usable if it is waiting on pipes on POSIX_like platforms. It is ALSO necessary to take advantage of (proposed lightweight concurrency (aka "auto-Fiber") or any similar proposal for network concurrency: https://bugs.ruby-lang.org/issues/13618 Named-pipe (FIFO) are NOT yet non-blocking by default since they are rarely-used and may introduce compatibility problems and extra syscall overhead for a common path. Please revert this commit if there are problems and if I am afk since I am afk a lot, lately. [ruby-core:89950] [Bug #14968] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b009de13bf
commit
6a65f2b1e4
14 changed files with 139 additions and 46 deletions
|
@ -53,6 +53,7 @@ class TestIONonblock < Test::Unit::TestCase
|
|||
|
||||
def test_nonblock
|
||||
IO.pipe {|r, w|
|
||||
w.nonblock = false
|
||||
assert_equal(false, w.nonblock?)
|
||||
w.nonblock do
|
||||
assert_equal(true, w.nonblock?)
|
||||
|
|
|
@ -1360,6 +1360,7 @@ class TestIO < Test::Unit::TestCase
|
|||
def test_readpartial_lock
|
||||
with_pipe do |r, w|
|
||||
s = ""
|
||||
r.nonblock = false if have_nonblock?
|
||||
t = Thread.new { r.readpartial(5, s) }
|
||||
Thread.pass until t.stop?
|
||||
assert_raise(RuntimeError) { s.clear }
|
||||
|
|
|
@ -770,6 +770,15 @@ class TestProcess < Test::Unit::TestCase
|
|||
Process.wait pid
|
||||
end
|
||||
}
|
||||
|
||||
# ensure standard FDs we redirect to are blocking for compatibility
|
||||
with_pipes(3) do |pipes|
|
||||
src = 'p [STDIN,STDOUT,STDERR].map(&:nonblock?)'
|
||||
rdr = { 0 => pipes[0][0], 1 => pipes[1][1], 2 => pipes[2][1] }
|
||||
pid = spawn(RUBY, '-rio/nonblock', '-e', src, rdr)
|
||||
assert_equal("[false, false, false]\n", pipes[1][0].gets)
|
||||
Process.wait pid
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -159,8 +159,9 @@ class TestSocket_BasicSocket < Test::Unit::TestCase
|
|||
set_nb = true
|
||||
buf = String.new
|
||||
if ssock.respond_to?(:nonblock?)
|
||||
assert_not_predicate(ssock, :nonblock?)
|
||||
assert_not_predicate(csock, :nonblock?)
|
||||
assert_predicate(ssock, :nonblock?)
|
||||
assert_predicate(csock, :nonblock?)
|
||||
csock.nonblock = ssock.nonblock = false
|
||||
|
||||
# Linux may use MSG_DONTWAIT to avoid setting O_NONBLOCK
|
||||
if RUBY_PLATFORM.match?(/linux/) && Socket.const_defined?(:MSG_DONTWAIT)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue