io_splice 4.1.1 → 4.2.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.1.1.GIT
+DEF_VER=v4.2.0
 
 LF='
 '

data/README

@@ -89,11 +89,11 @@ don't email the git mailing list or maintainer with io_splice patches.
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull
-requests) go to the mailing list: mailto:ruby.io.splice@librelist.com
+requests) go to the mailing list: mailto:ruby.io.splice@librelist.org
 
 == Mailing List Archives
 
-In addition to the rsync-able archives provided by http://librelist.com/, we
+In addition to the rsync-able archives provided by http://librelist.org/, we
 are also mirrored to
 {Gmane}[http://gmane.org/info.php?group=gmane.comp.lang.ruby.io-splice.general]
 and maintain our own mbox mirrors downloadable via HTTP.

data/ext/io_splice/io_splice_ext.c

@@ -10,11 +10,14 @@
 #include <sys/uio.h>
 #include <limits.h>
 #include <alloca.h>
-#include <sys/utsname.h>
+#include <unistd.h>
 
 static VALUE sym_EAGAIN;
 #define WAITALL 0x4000000
 
+/* taken from haproxy */
+#define MAX_AT_ONCE (1 << 30)
+
 #ifndef F_LINUX_SPECIFIC_BASE
 #  define F_LINUX_SPECIFIC_BASE 1024
 #endif
@@ -130,6 +133,9 @@ static VALUE nogvl_splice(void *ptr)
 {
 	struct splice_args *a = ptr;
 
+	if (a->len > MAX_AT_ONCE)
+		a->len = MAX_AT_ONCE;
+
 	return (VALUE)splice(a->fd_in, a->off_in, a->fd_out, a->off_out,
 	                     a->len, a->flags);
 }
@@ -276,6 +282,9 @@ static VALUE nogvl_tee(void *ptr)
 {
 	struct tee_args *a = ptr;
 
+	if (a->len > MAX_AT_ONCE)
+		a->len = MAX_AT_ONCE;
+
 	return (VALUE)tee(a->fd_in, a->fd_out, a->len, a->flags);
 }
 
@@ -468,7 +477,7 @@ static void advance_vmsplice_args(struct vmsplice_args *a, long n)
  * This may allow the kernel to avoid data copies in some cases.
  * but is (probably) of limited usefulness in Ruby.  If you have
  * use cases or ideas for making this more useful for Ruby users,
- * please tell us at ruby.io.splice@librelist.com!
+ * please tell us at ruby.io.splice@librelist.org!
  *
  * Also consider the "sendfile" RubyGem or IO.copy_stream in Ruby 1.9
  * if you want to do zero-copy file transfers to pipes or sockets.  As
@@ -483,19 +492,19 @@ static VALUE my_vmsplice(int argc, VALUE * argv, VALUE self)
 	ssize_t rv = 0;
 	ssize_t left;
 	struct vmsplice_args a;
+	struct iovec iov;
+	ssize_t n;
+
 	VALUE io, data, flags;
 
 	rb_scan_args(argc, argv, "21", &io, &data, &flags);
 
 	switch (TYPE(data)) {
-	case T_STRING: {
-		struct iovec iov;
-
+	case T_STRING:
 		iov.iov_base = RSTRING_PTR(data);
 		iov.iov_len = (size_t)(left = (ssize_t)RSTRING_LEN(data));
 		a.iov = &iov;
 		a.nr_segs = 1;
-		}
 		break;
 	case T_ARRAY:
 		ARY2IOVEC(a.iov, a.nr_segs, left, data);
@@ -505,21 +514,19 @@ static VALUE my_vmsplice(int argc, VALUE * argv, VALUE self)
 		         "(expected a String or Array of strings)",
 		         rb_obj_classname(data));
 	}
-	a.fd = my_fileno(io);
+
 	a.flags = NIL_P(flags) ? 0 : NUM2UINT(flags);
 
 	for (;;) {
-		ssize_t n = (ssize_t)io_run(nogvl_vmsplice, &a);
+		a.fd = check_fileno(io);
+		n = (ssize_t)io_run(nogvl_vmsplice, &a);
 
 		if (n == -1) {
 			if (errno == EAGAIN) {
-				if (a.flags & SPLICE_F_NONBLOCK) {
+				if (a.flags & SPLICE_F_NONBLOCK)
 					rb_sys_fail("vmsplice");
-				} else {
-					a.fd = check_fileno(io);
-					if (rb_io_wait_writable(a.fd))
-						continue;
-				}
+				if (rb_io_wait_writable(check_fileno(io)))
+					continue;
 				/* fall through on error */
 			}
 			/*
@@ -529,10 +536,8 @@ static VALUE my_vmsplice(int argc, VALUE * argv, VALUE self)
 			 */
 			if (rv > 0)
 				break;
-			if (errno == EINTR) {
-				a.fd = check_fileno(io);
+			if (errno == EINTR)
 				continue;
-			}
 			rb_sys_fail("vmsplice");
 		}
 
@@ -612,10 +617,28 @@ static VALUE set_pipe_size(VALUE self, VALUE size)
 	return size;
 }
 
+static int can_mod_pipe_size(void)
+{
+	int fds[2];
+	int rc = pipe(fds);
+
+	if (rc == 0) {
+		rc = fcntl(fds[0], F_GETPIPE_SZ);
+		rc = rc < 0 ? 0 : 1;
+
+		(void)close(fds[0]);
+		(void)close(fds[1]);
+	} else {
+		/* weird error, but don't raise during init */
+		rc = 0;
+	}
+	errno = 0;
+	return rc;
+}
+
 void Init_io_splice_ext(void)
 {
 	VALUE mSplice = rb_define_module_under(rb_cIO, "Splice");
-	struct utsname utsname;
 
 	rb_define_singleton_method(rb_cIO, "splice", my_splice, -1);
 	rb_define_singleton_method(rb_cIO, "trysplice", trysplice, -1);
@@ -682,11 +705,14 @@ void Init_io_splice_ext(void)
 	 */
 	rb_define_const(mSplice, "PIPE_BUF", UINT2NUM(PIPE_BUF));
 
-	if (uname(&utsname) == -1)
-		rb_sys_fail("uname");
+	/*
+	 * The maximum size we're allowed to splice at once.  Larger
+	 * sizes will be broken up and retried if the WAITALL flag or
+	 * IO::Splice.copy_stream is used.
+	 */
+	rb_define_const(mSplice, "MAX_AT_ONCE", SIZET2NUM(MAX_AT_ONCE));
 
-	/* includes 2.6.35-rc[1-6] */
-	if (strcmp(utsname.release, "2.6.35") >= 0) {
+	if (can_mod_pipe_size()) {
 		rb_define_method(rb_cIO, "pipe_size", pipe_size, 0);
 		rb_define_method(rb_cIO, "pipe_size=", set_pipe_size, 1);
 

data/io_splice.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.authors = ["Ruby io_splice hackers"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = readme_description
-  s.email = %q{ruby.io.splice@librelist.com}
+  s.email = %q{ruby.io.splice@librelist.org}
   s.extensions = %w(ext/io_splice/extconf.rb)
   s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest

data/lib/io/splice.rb

@@ -47,26 +47,24 @@ module IO::Splice
     src, dst = src.to_io, dst.to_io
 
     if src.stat.pipe? || dst.stat.pipe?
-      if len
-        len -= full(src, dst, len, src_offset) until len == 0
-      else
-        rv = 0
-        while n = partial(src, dst, PIPE_CAPA, src_offset)
-          rv += n
-          src_offset += n if src_offset
-        end
+      return full(src, dst, len, src_offset) if len
+      rv = 0
+      while n = partial(src, dst, MAX_AT_ONCE, src_offset)
+        rv += n
+        src_offset += n if src_offset
       end
     else
       r, w = tmp = IO.pipe
       close.concat(tmp)
+      rv = 0
       if len
         while len != 0 && n = partial(src, w, len, src_offset)
           src_offset += n if src_offset
+          rv += n
           len -= full(r, dst, n, nil)
         end
       else
-        rv = 0
-        while n = partial(src, w, PIPE_CAPA, src_offset)
+        while n = partial(src, w, MAX_AT_ONCE, src_offset)
           src_offset += n if src_offset
           rv += full(r, dst, n, nil)
         end

data/test/test_tcp_splice.rb

@@ -46,4 +46,21 @@ class TestTCPCopyStream < Test::Unit::TestCase
     bytes = IO::Splice.copy_stream(@accept, "/dev/null", expect)
     assert_equal expect, bytes
   end
+
+  def test_mega_splice
+    nr = 2000
+    buf = '0123456789abcdef' * 1024
+    expect = buf.size * nr
+    thr = Thread.new do
+      nr.times { @client.write(buf) }
+      @client.close
+    end
+    size_t_max = if (1 << 30).kind_of?(Bignum)
+      0xffffffff
+    else
+      0xffffffffffffffff
+    end
+    bytes = IO::Splice.copy_stream(@accept, "/dev/null", size_t_max)
+    assert_equal expect, bytes
+  end
 end

metadata

@@ -1,63 +1,75 @@
---- !ruby/object:Gem::Specification 
-name: io_splice
-version: !ruby/object:Gem::Version 
-  hash: 57
+--- !ruby/object:Gem::Specification
+name: !binary |-
+  aW9fc3BsaWNl
+version: !ruby/object:Gem::Version
+  version: 4.2.0
   prerelease: 
-  segments: 
-  - 4
-  - 1
-  - 1
-  version: 4.1.1
 platform: ruby
-authors: 
-- Ruby io_splice hackers
+authors:
+- !binary |-
+  UnVieSBpb19zcGxpY2UgaGFja2Vycw==
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: wrongdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: !binary |-
+    d3Jvbmdkb2M=
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS41
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS41
+- !ruby/object:Gem::Dependency
+  name: !binary |-
+    cmFjaw==
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS4y
   type: :development
-  version_requirements: *id002
-description: |-
-  The splice family of Linux system calls can transfer data between file
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS4y
+description: ! 'The splice family of Linux system calls can transfer data between
+  file
+
   descriptors without the need to copy data into userspace.  Instead of a
+
   userspace buffer, they rely on an ordinary Unix pipe as a kernel-level
-  buffer.
-email: ruby.io.splice@librelist.com
-executables: []
 
-extensions: 
-- ext/io_splice/extconf.rb
-extra_rdoc_files: 
+  buffer.'
+email: !binary |-
+  cnVieS5pby5zcGxpY2VAbGlicmVsaXN0Lm9yZw==
+executables: []
+extensions:
+- !binary |-
+  ZXh0L2lvX3NwbGljZS9leHRjb25mLnJi
+extra_rdoc_files:
 - README
 - LICENSE
 - NEWS
@@ -66,7 +78,7 @@ extra_rdoc_files:
 - lib/io/splice/mri_18.rb
 - ext/io_splice/io_splice_ext.c
 - LATEST
-files: 
+files:
 - .document
 - .gitignore
 - .manifest
@@ -99,44 +111,43 @@ files:
 - test/test_tcp_splice.rb
 homepage: http://bogomips.org/ruby_io_splice/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -t
 - io_splice - zero-copy pipe I/O for Linux and Ruby
 - -W
 - http://bogomips.org/ruby_io_splice.git/tree/%s
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: qrp
-rubygems_version: 1.8.2
+rubyforge_project: !binary |-
+  cXJw
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: zero-copy pipe I/O for Linux and Ruby
-test_files: 
-- test/test_rack_file_compat.rb
-- test/test_io_splice_in_full.rb
-- test/test_tcp_splice.rb
-- test/test_io_splice.rb
-- test/test_copy_stream.rb
-- test/test_io_splice_eintr.rb
+test_files:
+- !binary |-
+  dGVzdC90ZXN0X3JhY2tfZmlsZV9jb21wYXQucmI=
+- !binary |-
+  dGVzdC90ZXN0X2lvX3NwbGljZV9pbl9mdWxsLnJi
+- !binary |-
+  dGVzdC90ZXN0X3RjcF9zcGxpY2UucmI=
+- !binary |-
+  dGVzdC90ZXN0X2lvX3NwbGljZS5yYg==
+- !binary |-
+  dGVzdC90ZXN0X2NvcHlfc3RyZWFtLnJi
+- !binary |-
+  dGVzdC90ZXN0X2lvX3NwbGljZV9laW50ci5yYg==