sendfile 1.2.0 → 1.2.1

data/ext/sendfile.c

@@ -157,15 +157,16 @@ static VALUE nogvl_sendfile(void *data)
 {
 	struct sendfile_args *args = data;
 	int rv;
-	off_t written;
-	size_t w = count_max(args->count);
+	off_t written = args->count;
 
-	rv = sendfile(args->in, args->out, args->off, args->count,
+	rv = sendfile(args->in, args->out, args->off, &written,
 				  NULL, 0);
-	if (rv == 0)
+	if (written == 0 && rv == 0) {
 		args->eof = 1;
-	if (rv > 0)
-		args->count -= rv;
+	} else {
+		args->off += written;
+		args->count -= written;
+	}
 
 	return (VALUE)rv;
 }

data/sendfile.gemspec

@@ -2,7 +2,7 @@
 
 spec = Gem::Specification.new do |gs|
 	gs.name = 'sendfile'
-	gs.version = '1.2.0'
+	gs.version = '1.2.1'
 	gs.summary = 'Ruby interface to sendfile(2) system call'
 	gs.description = <<-EOF
 Allows Ruby programs to access sendfile(2) functionality on 

data/test/test_sendfile.rb

@@ -2,253 +2,251 @@
 # vim:set ts=4 sw=4 ai:
 require 'io/nonblock'
 begin
-	require 'rubygems'
+  require 'rubygems'
 rescue
-	nil
+  nil
 end
 require 'sendfile'
 require 'socket'
 require 'tempfile'
-require 'test/unit'
+require "minitest/autorun"
+require 'minitest'
 require 'zlib'
 
-class TestSendfile < Test::Unit::TestCase
-	def __fork_server
-		# open pipe for backchannel
-		@rd, @wr = IO.pipe
-		# fork server child
-		@pid = fork do
-			# close read end in child
-			@rd.close
-
-			# start listening and send port back to parent
-			ss = TCPServer.new @host, 0
-			@wr.write( [ ss.addr[1] ].pack( "S"))
-			@wr.flush
-
-			# read what they send and push it back up the pipe
-			while s = ss.accept
-				data = s.read
-				s.close
-				@wr.write( [data.length].pack( "N"))
-				@wr.write data
-				@wr.flush
-			end
-		end
-		
-		# close write end in parent and get server port
-		@wr.close
-		@port = @rd.read( 2).unpack( "S")[0]
-	end
-
-	def setup
-		@dir = File.dirname __FILE__
-		@host = '127.0.0.1'
-		__fork_server
-		
-		@smallfile = "#{@dir}/small"
-		@small = File.open @smallfile
-		@small_data = File.read @smallfile
-		
-		File.open( "#{@dir}/large.gz") do |f|
-			gzipped = Zlib::GzipReader.new f
-			@large_data = gzipped.read
-		end
-		@largefile = "/tmp/sendfiletest"
-		@large = File.open @largefile, 'w+'
-		@large.write @large_data
-		@large.flush
-	end
-
-	def teardown
-		@small.close
-		@large.close
-		File.unlink @largefile
-
-		Process.kill 'KILL', @pid
-		Process.wait
-	end
-
-	def __do_sendfile file, off=nil, count=nil
-		s = TCPSocket.new @host, @port
-		yield s if block_given?
-		sent = s.sendfile file, off, count
-		s.close
-		len = @rd.read( 4).unpack( "N")[0]
-		read = @rd.read len
-		[ sent, read ]
-	end
-		
-	def test_blocking_full_small
-		sent, read = __do_sendfile( @small)
-		assert_equal @small_data.size, sent
-		assert_equal @small_data.size, read.size
-		assert_equal @small_data, read
-	end
-
-	def test_nonblocking_full_small
-		sent, read = __do_sendfile( @small) { |s| s.nonblock = true }
-		assert_equal @small_data.size, sent
-		assert_equal @small_data.size, read.size
-		assert_equal @small_data, read
-	end
-
-	def test_blocking_full_large
-		sent, read = __do_sendfile( @large)
-		assert_equal @large_data.size, sent
-		assert_equal @large_data.size, read.size
-		assert_equal @large_data, read
-	end
-
-	def test_nonblocking_full_large
-		sent, read = __do_sendfile( @large) { |s| s.nonblock = true }
-		assert_equal @large_data.size, sent
-		assert_equal @large_data.size, read.size
-		assert_equal @large_data, read
-	end
-	
-	def test_blocking_from_offset
-		data = @large_data[4096..-1]
-		sent, read = __do_sendfile( @large, 4096)
-		assert_equal data.size, sent
-		assert_equal data.size, read.size
-		assert_equal data, read
-	end
-	
-	def test_blocking_partial_from_beginning
-		data = @large_data[0, 1048576]
-		sent, read = __do_sendfile( @large, 0, 1048576)
-		assert_equal data.size, sent
-		assert_equal data.size, read.size
-		assert_equal data, read
-	end
-
-	def test_blocking_partial_from_middle
-		data = @large_data[2048, 1048576]
-		sent, read = __do_sendfile( @large, 2048, 1048576)
-		assert_equal data.size, sent
-		assert_equal data.size, read.size
-		assert_equal data, read
-	end
-
-	def test_blocking_partial_to_end
-		data = @large_data[-1048576, 1048576]
-		sent, read = __do_sendfile( @large, @large_data.size - 1048576, 1048576)
-		assert_equal data.size, sent
-		assert_equal data.size, read.size
-		assert_equal data, read
-	end
-
-	def test_nonblocking_from_offset
-		data = @large_data[4096..-1]
-		sent, read = __do_sendfile( @large, 4096) { |s| s.nonblock = true }
-		assert_equal data.size, sent
-		assert_equal data.size, read.size
-		assert_equal data, read
-	end
-	
-	def test_nonblocking_partial_from_beginning
-		data = @large_data[0, 1048576]
-		sent, read = __do_sendfile( @large, 0, 1048576) { |s| s.nonblock = true }
-		assert_equal data.size, sent
-		assert_equal data.size, read.size
-		assert_equal data, read
-	end
-
-	def test_nonblocking_partial_from_middle
-		data = @large_data[2048, 1048576]
-		sent, read = __do_sendfile( @large, 2048, 1048576) { |s| s.nonblock = true }
-		assert_equal data.size, sent
-		assert_equal data.size, read.size
-		assert_equal data, read
-	end
-
-	def test_nonblocking_partial_to_end
-		data = @large_data[-1048576, 1048576]
-		sent, read = __do_sendfile( @large, @large_data.size - 1048576, 1048576) { |s| s.nonblock = true }
-		assert_equal data.size, sent
-		assert_equal data.size, read.size
-		assert_equal data, read
-	end
-
-	def test_sendfile_nonblock
-		c, s = UNIXSocket.pair
-		nr_sent = 0
-		assert_raises(Errno::EAGAIN) do
-			loop do
-				nr_sent += c.sendfile_nonblock @small
-			end
-		end
-		c.close
-		nr_read = s.read.size
-		s.close
-		assert_equal nr_read, nr_sent
-	end
-
-	def test_trysendfile
-		c, s = UNIXSocket.pair
-		nr_sent = 0
-		assert_nothing_raised do
-			case rv = c.trysendfile(@small)
-			when :wait_writable
-				break
-			when Integer
-				nr_sent += rv
-			else
-				raise "Unexpected return: #{rv.inspect}"
-			end while true
-		end
-		assert nr_sent > 0, "nr_sent: #{nr_sent} <= 0"
-		c.close
-		nr_read = s.read.size
-		s.close
-		assert_equal nr_read, nr_sent
-	end
-
-	def test_tempfile
-		tmp = Tempfile.new ''
-		tmp.write @small_data
-		tmp.rewind
-		sent, read = __do_sendfile(tmp)
-		assert_equal @small_data.size, sent
-		assert_equal @small_data.size, read.size
-		assert_equal @small_data, read
-	end
-
-	def test_invalid_file
-		assert_raises(TypeError) { __do_sendfile(:hello) }
-	end
-
-	def test_sendfile_too_big_eof
-		sent = read = nil
-		count = @small_data.size * 2
-		s = TCPSocket.new @host, @port
-		sent = s.sendfile @small, nil, count
-		assert_raises(EOFError) do
-			s.sendfile @small, sent, 1
-		end
-		s.close
-		len = @rd.read( 4).unpack( "N")[0]
-		read = @rd.read len
-		assert_equal @small_data.size, sent
-		assert_equal @small_data.size, read.size
-		assert_equal @small_data, read
-	end
-
-	def test_sendfile_nonblock_eof
-		s = TCPSocket.new @host, @port
-		off = @small_data.size
-		assert_raises(EOFError) do
-			s.sendfile_nonblock @small, off, 1
-		end
-		s.close
-	end
-
-	def test_trysendfile_eof
-		s = TCPSocket.new @host, @port
-		off = @small_data.size
-		assert_nil s.trysendfile(@small, off, 1)
-		s.close
-	end
-end		# class TestSendfile
-
+class TestSendfile < MiniTest::Test
+  def __fork_server
+    # open pipe for backchannel
+    @rd, @wr = IO.pipe
+    # fork server child
+    @pid = fork do
+      # close read end in child
+      @rd.close
+
+      # start listening and send port back to parent
+      ss = TCPServer.new @host, 0
+      @wr.write( [ ss.addr[1] ].pack( "S"))
+      @wr.flush
+
+      # read what they send and push it back up the pipe
+      while s = ss.accept
+        data = s.read
+        s.close
+        @wr.write( [data.length].pack( "N"))
+        @wr.write data
+        @wr.flush
+      end
+    end
+
+    # close write end in parent and get server port
+    @wr.close
+    @port = @rd.read( 2).unpack( "S")[0]
+  end
+
+  def setup
+    @dir = File.dirname __FILE__
+    @host = '127.0.0.1'
+    __fork_server
+
+    @smallfile = "#{@dir}/small"
+    @small = File.open @smallfile
+    @small_data = File.read @smallfile
+
+    File.open( "#{@dir}/large.gz") do |f|
+      gzipped = Zlib::GzipReader.new f
+      @large_data = gzipped.read
+    end
+    @largefile = "/tmp/sendfiletest"
+    @large = File.open @largefile, 'w+'
+    @large.write @large_data
+    @large.flush
+  end
+
+  def teardown
+    @small.close
+    @large.close
+    File.unlink @largefile
+
+    Process.kill 'KILL', @pid
+    Process.wait
+  end
+
+  def __do_sendfile file, off=nil, count=nil
+    s = TCPSocket.new @host, @port
+    yield s if block_given?
+    sent = s.sendfile file, off, count
+    s.close
+    len = @rd.read( 4).unpack( "N")[0]
+    read = @rd.read len
+    [ sent, read ]
+  end
+
+  def test_blocking_full_small
+    sent, read = __do_sendfile( @small)
+    assert_equal @small_data.size, sent
+    assert_equal @small_data.size, read.size
+    assert_equal @small_data, read
+  end
+
+  def test_nonblocking_full_small
+    sent, read = __do_sendfile( @small) { |s| s.nonblock = true }
+    assert_equal @small_data.size, sent
+    assert_equal @small_data.size, read.size
+    assert_equal @small_data, read
+  end
+
+  def test_blocking_full_large
+    sent, read = __do_sendfile( @large)
+    assert_equal @large_data.size, sent
+    assert_equal @large_data.size, read.size
+    assert_equal @large_data, read
+  end
+
+  def test_nonblocking_full_large
+    sent, read = __do_sendfile( @large) { |s| s.nonblock = true }
+    assert_equal @large_data.size, sent
+    assert_equal @large_data.size, read.size
+    assert_equal @large_data, read
+  end
+
+  def test_blocking_from_offset
+    data = @large_data[4096..-1]
+    sent, read = __do_sendfile( @large, 4096)
+    assert_equal data.size, sent
+    assert_equal data.size, read.size
+    assert_equal data, read
+  end
+
+  def test_blocking_partial_from_beginning
+    data = @large_data[0, 1048576]
+    sent, read = __do_sendfile( @large, 0, 1048576)
+    assert_equal data.size, sent
+    assert_equal data.size, read.size
+    assert_equal data, read
+  end
+
+  def test_blocking_partial_from_middle
+    data = @large_data[2048, 1048576]
+    sent, read = __do_sendfile( @large, 2048, 1048576)
+    assert_equal data.size, sent
+    assert_equal data.size, read.size
+    assert_equal data, read
+  end
+
+  def test_blocking_partial_to_end
+    data = @large_data[-1048576, 1048576]
+    sent, read = __do_sendfile( @large, @large_data.size - 1048576, 1048576)
+    assert_equal data.size, sent
+    assert_equal data.size, read.size
+    assert_equal data, read
+  end
+
+  def test_nonblocking_from_offset
+    data = @large_data[4096..-1]
+    sent, read = __do_sendfile( @large, 4096) { |s| s.nonblock = true }
+    assert_equal data.size, sent
+    assert_equal data.size, read.size
+    assert_equal data, read
+  end
+
+  def test_nonblocking_partial_from_beginning
+    data = @large_data[0, 1048576]
+    sent, read = __do_sendfile( @large, 0, 1048576) { |s| s.nonblock = true }
+    assert_equal data.size, sent
+    assert_equal data.size, read.size
+    assert_equal data, read
+  end
+
+  def test_nonblocking_partial_from_middle
+    data = @large_data[2048, 1048576]
+    sent, read = __do_sendfile( @large, 2048, 1048576) { |s| s.nonblock = true }
+    assert_equal data.size, sent
+    assert_equal data.size, read.size
+    assert_equal data, read
+  end
+
+  def test_nonblocking_partial_to_end
+    data = @large_data[-1048576, 1048576]
+    sent, read = __do_sendfile( @large, @large_data.size - 1048576, 1048576) { |s| s.nonblock = true }
+    assert_equal data.size, sent
+    assert_equal data.size, read.size
+    assert_equal data, read
+  end
+
+  def test_sendfile_nonblock
+    c, s = UNIXSocket.pair
+    nr_sent = 0
+    assert_raises(Errno::EAGAIN) do
+      loop do
+        nr_sent += c.sendfile_nonblock @small
+      end
+    end
+    c.close
+    nr_read = s.read.size
+    s.close
+    assert_equal nr_read, nr_sent
+  end
+
+  def test_trysendfile
+    c, s = UNIXSocket.pair
+    nr_sent = 0
+    case rv = c.trysendfile(@small)
+    when :wait_writable
+      break
+    when Integer
+      nr_sent += rv
+    else
+      raise "Unexpected return: #{rv.inspect}"
+    end while true
+    assert nr_sent > 0, "nr_sent: #{nr_sent} <= 0"
+    c.close
+    nr_read = s.read.size
+    s.close
+    assert_equal nr_read, nr_sent
+  end
+
+  def test_tempfile
+    tmp = Tempfile.new ''
+    tmp.write @small_data
+    tmp.rewind
+    sent, read = __do_sendfile(tmp)
+    assert_equal @small_data.size, sent
+    assert_equal @small_data.size, read.size
+    assert_equal @small_data, read
+  end
+
+  def test_invalid_file
+    assert_raises(TypeError) { __do_sendfile(:hello) }
+  end
+
+  def test_sendfile_too_big_eof
+    sent = read = nil
+    count = @small_data.size * 2
+    s = TCPSocket.new @host, @port
+    sent = s.sendfile @small, nil, count
+    assert_raises(EOFError) do
+      s.sendfile @small, sent, 1
+    end
+    s.close
+    len = @rd.read( 4).unpack( "N")[0]
+    read = @rd.read len
+    assert_equal @small_data.size, sent
+    assert_equal @small_data.size, read.size
+    assert_equal @small_data, read
+  end
+
+  def test_sendfile_nonblock_eof
+    s = TCPSocket.new @host, @port
+    off = @small_data.size
+    assert_raises(EOFError) do
+      s.sendfile_nonblock @small, off, 1
+    end
+    s.close
+  end
+
+  def test_trysendfile_eof
+    s = TCPSocket.new @host, @port
+    off = @small_data.size
+    assert_nil s.trysendfile(@small, off, 1)
+    s.close
+  end
+end     # class TestSendfile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendfile
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies: []
 description: ! "Allows Ruby programs to access sendfile(2) functionality on \nany
   IO object. Works on Linux, Solaris, FreeBSD and Darwin with\nblocking and non-blocking