* [PATCH 1/2] buffer/splice: prepare for IO::Splice::WAITALL removal
@ 2015-02-18 22:23 7% Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2015-02-18 22:23 UTC (permalink / raw)
To: dtas-all
This feature in the io_splice was probably a bad idea
and slated for removal at some point in the future.
Anyways, do not rely on it since it is undocumented.
---
lib/dtas/buffer/splice.rb | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/lib/dtas/buffer/splice.rb b/lib/dtas/buffer/splice.rb
index c83b87b..b987f3a 100644
--- a/lib/dtas/buffer/splice.rb
+++ b/lib/dtas/buffer/splice.rb
@@ -12,7 +12,6 @@ module DTAS::Buffer::Splice # :nodoc:
MAX_SIZE = File.read("/proc/sys/fs/pipe-max-size").to_i
DEVNULL = File.open("/dev/null", "r+")
F_MOVE = IO::Splice::F_MOVE
- WAITALL = IO::Splice::WAITALL
def buffer_size
@to_io.pipe_size
@@ -44,6 +43,26 @@ def broadcast_one(targets)
nil # do not return error here, we already spewed an error message
end
+ def __tee_in_full(src, dst, bytes)
+ rv = 0
+ while bytes > 0
+ s = IO.tee(src, dst, bytes)
+ bytes -= s
+ rv += s
+ end
+ rv
+ end
+
+ def __splice_in_full(src, dst, bytes, flags)
+ rv = 0
+ while bytes > 0
+ s = IO.splice(src, nil, dst, nil, bytes, flags)
+ rv += s
+ bytes -= s
+ end
+ rv
+ end
+
# returns the largest value we teed
def __broadcast_tee(blocked, targets, chunk_size)
most_teed = 0
@@ -51,7 +70,7 @@ def __broadcast_tee(blocked, targets, chunk_size)
begin
t = (dst.nonblock? || most_teed == 0) ?
IO.trytee(@to_io, dst, chunk_size) :
- IO.tee(@to_io, dst, chunk_size, WAITALL)
+ __tee_in_full(@to_io, dst, chunk_size)
if Integer === t
if t > most_teed
chunk_size = t if most_teed == 0
@@ -117,7 +136,7 @@ def broadcast_inf(targets)
end
else
# the blocking case is simple
- s = IO.splice(@to_io, nil, last, nil, bytes, WAITALL|F_MOVE)
+ s = __splice_in_full(@to_io, last, bytes, F_MOVE)
end
@bytes_xfer += s
--
EW
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-02-18 22:23 7% [PATCH 1/2] buffer/splice: prepare for IO::Splice::WAITALL removal Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/dtas.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).