From 019543aa3a1074582a460b944ad5ebcddecd4394 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 6 Oct 2013 11:02:38 +0000 Subject: buffer: remove ioctl syscall in common paths We do not need this for single sink situations (the common case) at all. We also do not need to check IO#nread for splice, either; we can just do non-blocking I/O. The only common path where we might still need it is the non-splice case with multiple sinks. --- lib/dtas/buffer/read_write.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib/dtas/buffer/read_write.rb') diff --git a/lib/dtas/buffer/read_write.rb b/lib/dtas/buffer/read_write.rb index 0044400..11d1a95 100644 --- a/lib/dtas/buffer/read_write.rb +++ b/lib/dtas/buffer/read_write.rb @@ -17,25 +17,30 @@ module DTAS::Buffer::ReadWrite # :nodoc: def discard(bytes) buf = _rbuf begin - @to_io.read(bytes, buf) or break # EOF + @to_io.readpartial(bytes, buf) bytes -= buf.bytesize + rescue EOFError + return end until bytes == 0 end # always block when we have a single target - def broadcast_one(targets, bytes) + def broadcast_one(targets) buf = _rbuf - @to_io.read(bytes, buf) + @to_io.readpartial(MAX_AT_ONCE, buf) n = targets[0].write(buf) # IO#write has write-in-full behavior @bytes_xfer += n :wait_readable + rescue EOFError + nil rescue Errno::EPIPE, IOError => e __dst_error(targets[0], e) targets.clear nil # do not return error here, we already spewed an error message end - def broadcast_inf(targets, bytes) + def broadcast_inf(targets) + bytes = inflight nr_nb = targets.count { |sink| sink.nonblock? } if nr_nb == 0 || nr_nb == targets.size # if all targets are full, don't start until they're all writable -- cgit v1.2.3-24-ge0c7