io_splice 2.2.0 → 2.2.0.18.g3025

data/.document

@@ -4,3 +4,4 @@ NEWS
 ChangeLog
 lib
 ext/io_splice/io_splice_ext.c
+LATEST

data/.gitignore

@@ -13,3 +13,5 @@ Makefile
 /pkg
 /doc
 /coverage
+LATEST
+/tmp

data/.wrongdoc.yml

@@ -0,0 +1,5 @@
+---
+cgit_url: http://bogomips.org/ruby_io_splice.git
+git_url: git://bogomips.org/ruby_io_splice.git
+rdoc_url: http://bogomips.org/ruby_io_splice/
+changelog_start: v1.0.0

data/GNUmakefile

@@ -1,200 +1,14 @@
-# use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
-RUBY = ruby
-RAKE = rake
-GIT_URL = git://git.bogomips.org/ruby_io_splice.git
-RSYNC = rsync
 RCOV = rcov
-
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN
--include GIT-VERSION-FILE
--include local.mk
-ifeq ($(DLEXT),) # "so" for Linux
-  DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
-endif
-ifeq ($(RUBY_VERSION),)
-  RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
-endif
-
-install: $(bins)
-	$(prep_setup_rb)
-	$(RM) -r .install-tmp
-	mkdir .install-tmp
-	cp -p bin/* .install-tmp
-	$(RUBY) setup.rb all
-	$(RM) $^
-	mv .install-tmp/* bin/
-	$(RM) -r .install-tmp
-	$(prep_setup_rb)
-
-setup_rb_files := .config InstalledFiles
-prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C $(ext) clean
-
-clean:
-	-$(MAKE) -C ext/io_splice clean
-	$(RM) $(setup_rb_files) ext/io_splice/Makefile
-
-pkg_extra := GIT-VERSION-FILE NEWS ChangeLog
-manifest: $(pkg_extra)
-	$(RM) .manifest
-	$(MAKE) .manifest
-
-.manifest:
-	(git ls-files && \
-         for i in $@ $(pkg_extra); \
-	 do echo $$i; done) | LC_ALL=C sort > $@+
-	cmp $@+ $@ || mv $@+ $@
-	$(RM) $@+
-
-NEWS: GIT-VERSION-FILE
-	$(RAKE) -s news_rdoc > $@+
-	mv $@+ $@
-
-SINCE = 1.0.0
-ChangeLog: LOG_VERSION = \
-  $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
-          echo $(GIT_VERSION) || git describe)
-ifneq ($(SINCE),)
-ChangeLog: log_range = v$(SINCE)..$(LOG_VERSION)
-endif
-ChangeLog: GIT-VERSION-FILE
-	@echo "ChangeLog from $(GIT_URL) ($(log_range))" > $@+
-	@echo >> $@+
-	git log $(log_range) | sed -e 's/^/    /' >> $@+
-	mv $@+ $@
-
-news_atom := http://bogomips.org/ruby_io_splice/NEWS.atom.xml
-cgit_atom := http://git.bogomips.org/cgit/ruby_io_splice.git/atom/?h=master
-atom = <link rel="alternate" title="Atom feed" href="$(1)" \
-             type="application/atom+xml"/>
-
-# using rdoc 2.5.x + workaround patch here:
-# rubyforge.org/tracker/index.php?func=detail&aid=28230&group_id=627&atid=2472
-doc: .document NEWS ChangeLog
-	rdoc -a -t "$(shell sed -ne '1s/^= //p' README)"
-	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
-	cd doc && for i in $(base_bins); do \
-	  html=$$(echo $$i | sed 's/\.rb/_rb/')_1.html; \
-	  sed -e '/"documentation">/r man1/'$$i'.1.html' \
-		< $$html > tmp && mv tmp $$html; done
-	$(RUBY) -i -p -e \
-	  '$$_.gsub!("</title>",%q{\&$(call atom,$(cgit_atom))})' \
-	  doc/ChangeLog.html
-	$(RUBY) -i -p -e \
-	  '$$_.gsub!("</title>",%q{\&$(call atom,$(news_atom))})' \
-	  doc/NEWS.html doc/README.html
-	$(RAKE) -s news_atom > doc/NEWS.atom.xml
-	cd doc && ln README.html tmp && mv tmp index.html
-
-latest: NEWS
-	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' $<
-
-# publishes docs to http://bogomips.org/ruby_io_splice/,
-publish_doc:
-	-git set-file-times
-	$(RM) -r doc ChangeLog NEWS
-	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
-	awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' \
-	  NEWS > doc/LATEST
-	find doc/images doc/js -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:01' doc/rdoc.css
-	$(MAKE) doc_gz
-	chmod 644 $$(find doc -type f)
-	$(RSYNC) -av doc/ bogomips.org:/srv/bogomips/ruby_io_splice/
-	git ls-files | xargs touch
-
-# Create gzip variants of the same timestamp as the original so nginx
-# "gzip_static on" can serve the gzipped versions directly.
-doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
-doc_gz:
-	touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)"
-	for i in $(docs); do \
-	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
-
-ifneq ($(VERSION),)
+RSYNC_DEST := bogomips.org:/srv/bogomips/ruby_io_splice
 rfproject := qrp
 rfpackage := io_splice
-pkggem := pkg/$(rfpackage)-$(VERSION).gem
-pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
-release_notes := release_notes-$(VERSION)
-release_changes := release_changes-$(VERSION)
-
-release-notes: $(release_notes)
-release-changes: $(release_changes)
-$(release_changes):
-	$(RAKE) -s release_changes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-$(release_notes):
-	GIT_URL=$(GIT_URL) $(RAKE) -s release_notes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-
-# ensures we're actually on the tagged $(VERSION), only used for release
-verify:
-	test x"$(shell umask)" = x0022
-	git rev-parse --verify refs/tags/v$(VERSION)^{}
-	git diff-index --quiet HEAD^0
-	test `git rev-parse --verify HEAD^0` = \
-	     `git rev-parse --verify refs/tags/v$(VERSION)^{}`
-
-fix-perms:
-	-git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
-	-git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
-
-gem: $(pkggem)
-
-install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
-
-$(pkggem): manifest fix-perms
-	gem build $(rfpackage).gemspec
-	mkdir -p pkg
-	mv $(@F) $@
-
-$(pkgtgz): distdir = $(basename $@)
-$(pkgtgz): HEAD = v$(VERSION)
-$(pkgtgz): manifest fix-perms
-	@test -n "$(distdir)"
-	$(RM) -r $(distdir)
-	mkdir -p $(distdir)
-	tar c `cat .manifest` | (cd $(distdir) && tar x)
-	cd pkg && tar c $(basename $(@F)) | gzip -9 > $(@F)+
-	mv $@+ $@
-
-package: $(pkgtgz) $(pkggem)
-
-test-release: verify package $(release_notes) $(release_changes)
-release: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	# push gem to Gemcutter
-	gem push $(pkggem)
-	# in case of gem downloads from RubyForge releases page
-	-rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
-else
-gem install-gem: GIT-VERSION-FILE
-	$(MAKE) $@ VERSION=$(GIT_VERSION)
+include pkg.mk
+ifneq ($(VERSION),)
+release::
+	$(RAKE) raa_update VERSION=$(VERSION)
+	$(RAKE) publish_news VERSION=$(VERSION)
 endif
-
-ext := ext/io_splice/io_splice_ext.$(DLEXT)
-ext/io_splice/Makefile: ext/io_splice/extconf.rb
-	cd $(@D) && $(RUBY) extconf.rb
-$(ext): $(wildcard $(addprefix ext/io_splice/,*.c *.h)) ext/io_splice/Makefile
-	$(MAKE) -C $(@D)
-
-all:: test
-
-build: $(ext)
-test: test-unit
 rcov: build
 	$(RCOV) -I lib:ext/io_splice $(test_unit)
-
-test_unit := $(wildcard test/test_*.rb)
-$(test_unit): build
-	$(RUBY) -I lib:ext/io_splice $@ $(TEST_UNIT_OPTS)
-test-unit: $(test_unit)
-
-.PHONY: .FORCE-GIT-VERSION-FILE doc manifest man test $(test_unit)
+.PHONY: rcov

data/README

@@ -66,13 +66,13 @@ standardized and available in non-Linux kernels some day.
 
 You can get the latest source via git from the following locations:
 
-  git://git.bogomips.org/ruby_io_splice.git
+  git://bogomips.org/ruby_io_splice.git
   git://repo.or.cz/ruby_io_splice.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://git.bogomips.org/cgit/ruby_io_splice.git (cgit)
+* http://bogomips.org/cgit/ruby_io_splice.git (cgit)
 * http://repo.or.cz/w/ruby_io_splice.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are

data/Rakefile

@@ -1,112 +1,26 @@
 # -*- encoding: binary -*-
+require 'wrongdoc'
+cgit_url = Wrongdoc.config[:cgit_url]
+git_url = Wrongdoc.config[:git_url]
 
-# most tasks are in the GNUmakefile which offers better parallelism
-
-def tags
-  timefmt = '%Y-%m-%dT%H:%M:%SZ'
-  @tags ||= `git tag -l`.split(/\n/).map do |tag|
-    if %r{\Av[\d\.]+\z} =~ tag
-      header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
-      header = header.split(/\n/)
-      tagger = header.grep(/\Atagger /).first
-      body ||= "initial"
-      {
-        :time => Time.at(tagger.split(/ /)[-2].to_i).utc.strftime(timefmt),
-        :tagger_name => %r{^tagger ([^<]+)}.match(tagger)[1].strip,
-        :tagger_email => %r{<([^>]+)>}.match(tagger)[1].strip,
-        :id => `git rev-parse refs/tags/#{tag}`.chomp!,
-        :tag => tag,
-        :subject => subject,
-        :body => body,
-      }
-    end
-  end.compact.sort { |a,b| b[:time] <=> a[:time] }
-end
-
-cgit_url = "http://git.bogomips.org/cgit/ruby_io_splice.git"
-git_url = ENV['GIT_URL'] || 'git://git.bogomips.org/ruby_io_splice.git'
-web_url = "http://bogomips.org/ruby_io_splice/"
-
-desc 'prints news as an Atom feed'
-task :news_atom do
-  require 'nokogiri'
-  new_tags = tags[0,10]
-  puts(Nokogiri::XML::Builder.new do
-    feed :xmlns => "http://www.w3.org/2005/Atom" do
-      id! "#{web_url}NEWS.atom.xml"
-      title "Ruby io_splice news"
-      subtitle "splice and tee Linux syscalls from Ruby"
-      link! :rel => "alternate", :type => "text/html",
-            :href => "#{web_url}NEWS.html"
-      updated(new_tags.empty? ? "1970-01-01T00:00:00Z" : new_tags.first[:time])
-      new_tags.each do |tag|
-        entry do
-          title tag[:subject]
-          updated tag[:time]
-          published tag[:time]
-          author {
-            name tag[:tagger_name]
-            email tag[:tagger_email]
-          }
-          url = "#{cgit_url}/tag/?id=#{tag[:tag]}"
-          link! :rel => "alternate", :type => "text/html", :href =>url
-          id! url
-          message_only = tag[:body].split(/\n.+\(\d+\):\n {6}/s).first.strip
-          content({:type =>:text}, message_only)
-          content(:type =>:xhtml) { pre tag[:body] }
-        end
-      end
-    end
-  end.to_xml)
-end
-
-desc 'prints RDoc-formatted news'
-task :news_rdoc do
-  tags.each do |tag|
-    time = tag[:time].tr!('T', ' ').gsub!(/:\d\dZ/, ' UTC')
-    puts "=== #{tag[:tag].sub(/^v/, '')} / #{time}"
-    puts ""
-
-    body = tag[:body]
-    puts tag[:body].gsub(/^/sm, "  ").gsub(/[ \t]+$/sm, "")
-    puts ""
-  end
-end
-
-desc "print release changelog for Rubyforge"
-task :release_changes do
-  version = ENV['VERSION'] or abort "VERSION= needed"
-  version = "v#{version}"
-  vtags = tags.map { |tag| tag[:tag] =~ /\Av/ and tag[:tag] }.sort
-  prev = vtags[vtags.index(version) - 1]
-  if prev
-    system('git', 'diff', '--stat', prev, version) or abort $?
-    puts ""
-    system('git', 'log', "#{prev}..#{version}") or abort $?
-  else
-    system('git', 'log', version) or abort $?
-  end
-end
-
-desc "print release notes for Rubyforge"
-task :release_notes do
-  spec = Gem::Specification.load('io_splice.gemspec')
-  puts spec.description.strip
-  puts ""
-  puts "* #{spec.homepage}"
-  puts "* #{spec.email}"
-  puts "* #{git_url}"
-
-  _, _, body = `git cat-file tag v#{spec.version}`.split(/\n\n/, 3)
-  print "\nChanges:\n\n"
-  puts body
-end
-
-desc "read news article from STDIN and post to rubyforge"
+desc "post news article to rubyforge"
 task :publish_news do
   require 'rubyforge'
-  IO.select([STDIN], nil, nil, 1) or abort "E: news must be read from stdin"
-  msg = STDIN.readlines
+  spec = Gem::Specification.load('io_splice.gemspec')
+  tmp = Tempfile.new('rf-news')
+  _, subject, body = `git cat-file tag v#{spec.version}`.split(/\n\n/, 3)
+  tmp.puts subject
+  tmp.puts
+  tmp.puts spec.description.strip
+  tmp.puts ""
+  tmp.puts "* #{spec.homepage}"
+  tmp.puts "* #{spec.email}"
+  tmp.puts "* #{git_url}"
+  tmp.print "\nChanges:\n\n"
+  tmp.puts body
+  tmp.flush
+  system(ENV["VISUAL"], tmp.path) or abort "#{ENV["VISUAL"]} failed: #$?"
+  msg = File.readlines(tmp.path)
   subject = msg.shift
   blank = msg.shift
   blank == "\n" or abort "no newline after subject!"
@@ -144,7 +58,7 @@ task :raa_update do
     :category_minor => 'System',
     :url => s.homepage,
     :download => 'http://rubyforge.org/frs/?group_id=5626',
-    :license => 'LGPL',
+    :license => "LGPL",
     :description_style => 'Plain',
     :description => desc,
     :pass => password,

data/ext/io_splice/io_splice_ext.c

@@ -12,6 +12,8 @@
 #include <alloca.h>
 #include <sys/utsname.h>
 
+static VALUE sym_EAGAIN;
+
 #ifndef F_LINUX_SPECIFIC_BASE
 #  define F_LINUX_SPECIFIC_BASE 1024
 #endif
@@ -88,8 +90,14 @@ rb_thread_blocking_region(
 #  define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif
 
+static VALUE io_run(rb_blocking_function_t *fn, void *data)
+{
+	return rb_thread_blocking_region(fn, data, RUBY_UBF_IO, 0);
+}
+
 /*
  * Releases GVL only iff blocking I/O is used.
+ * Only use this if all file descriptors in data are pipes.
  * We'll trust programmers who use non-blocking I/O explicitly to
  * want the fastest possible performance without resorting to threads,
  * so releasing and them immediately reacquiring the GVL would be
@@ -99,7 +107,7 @@ static VALUE nb_io_run(rb_blocking_function_t *fn, void *data, unsigned flags)
 {
 	if (flags & SPLICE_F_NONBLOCK)
 		return fn(data);
-	return rb_thread_blocking_region(fn, data, RUBY_UBF_IO, 0);
+	return io_run(fn, data);
 }
 
 struct splice_args {
@@ -119,8 +127,28 @@ static VALUE nogvl_splice(void *ptr)
 	                     a->len, a->flags);
 }
 
+static long do_splice(int argc, VALUE *argv, unsigned dflags)
+{
+	off_t i, o;
+	VALUE fd_in, off_in, fd_out, off_out, len, flags;
+	struct splice_args a;
+
+	rb_scan_args(argc, argv, "51",
+	             &fd_in, &off_in, &fd_out, &off_out, &len, &flags);
+
+	a.off_in = NIL_P(off_in) ? NULL : (i = NUM2OFFT(off_in), &i);
+	a.off_out = NIL_P(off_out) ? NULL : (o = NUM2OFFT(off_out), &o);
+	a.fd_in = my_fileno(fd_in);
+	a.fd_out = my_fileno(fd_out);
+	a.len = (size_t)NUM2ULONG(len);
+	a.flags = NIL_P(flags) ? dflags : NUM2UINT(flags) | dflags;
+
+	return (long)io_run(nogvl_splice, &a);
+}
+
 /*
  * call-seq:
+ *    IO.splice(fd_in, off_in, fd_out, off_out, len) => integer
  *    IO.splice(fd_in, off_in, fd_out, off_out, len, flags) => integer
  *
  * Splice +len+ bytes from/to a pipe.  Either +fd_in+ or +fd_out+
@@ -130,6 +158,7 @@ static VALUE nogvl_splice(void *ptr)
  * +off_in+ and +off_out+ if non-nil may be used to
  * specify an offset for the non-pipe file descriptor.
  *
+ * +flags+ defaults to zero if unspecified.
  * +flags+ may be a bitmask of the following flags:
  *
  * IO::Splice::F_MOVE, IO::Splice::F_NONBLOCK, IO::Splice::F_MORE
@@ -152,26 +181,17 @@ static VALUE nogvl_splice(void *ptr)
  * into account userspace buffering done by Ruby or stdio.  It is
  * also not subject to encoding/decoding filters under Ruby 1.9.
  *
+ * Consider using IO.trysplice if you are using non-blocking I/O on
+ * both descriptors as it avoids the cost of raising common Errno::EAGAIN
+ * exceptions.
+ *
  * See manpage for full documentation:
  * http://kernel.org/doc/man-pages/online/pages/man2/splice.2.html
  */
-static VALUE my_splice(VALUE self,
-	VALUE fd_in, VALUE off_in,
-	VALUE fd_out, VALUE off_out,
-	VALUE len, VALUE flags)
+static VALUE my_splice(int argc, VALUE *argv, VALUE self)
 {
-	off_t i, o;
-	long n;
-	struct splice_args a = {
-		.off_in = NIL_P(off_in) ? NULL : (i = NUM2OFFT(off_in), &i),
-		.off_out = NIL_P(off_out) ? NULL : (o = NUM2OFFT(off_out), &o),
-		.fd_in = my_fileno(fd_in),
-		.fd_out = my_fileno(fd_out),
-		.len = (size_t)NUM2ULONG(len),
-		.flags = NUM2UINT(flags),
-	};
-
-	n = (long)rb_thread_blocking_region(nogvl_splice, &a, RUBY_UBF_IO, 0);
+	long n = do_splice(argc, argv, 0);
+
 	if (n == 0)
 		rb_eof_error();
 	if (n < 0)
@@ -179,6 +199,33 @@ static VALUE my_splice(VALUE self,
 	return LONG2NUM(n);
 }
 
+/*
+ * call-seq:
+ *    IO.trysplice(fd_in, off_in, fd_out, off_out, len) => integer
+ *    IO.trysplice(fd_in, off_in, fd_out, off_out, len, flags) => integer
+ *
+ * Exactly like IO.splice, except +:EAGAIN+ is returned when either
+ * the read or write end would block instead of raising Errno::EAGAIN.
+ *
+ * IO::Splice::F_NONBLOCK is always passed for the pipe descriptor,
+ * but this can still block if the non-pipe descriptor is blocking.
+ *
+ * See IO.splice documentation for more details.
+ */
+static VALUE trysplice(int argc, VALUE *argv, VALUE self)
+{
+	long n = do_splice(argc, argv, SPLICE_F_NONBLOCK);
+
+	if (n == 0)
+		return Qnil;
+	if (n < 0) {
+		if (errno == EAGAIN)
+			return sym_EAGAIN;
+		rb_sys_fail("splice");
+	}
+	return LONG2NUM(n);
+}
+
 struct tee_args {
 	int fd_in;
 	int fd_out;
@@ -194,15 +241,30 @@ static VALUE nogvl_tee(void *ptr)
 	return (VALUE)tee(a->fd_in, a->fd_out, a->len, a->flags);
 }
 
+static long do_tee(int argc, VALUE *argv, unsigned dflags)
+{
+	VALUE fd_in, fd_out, len, flags;
+	struct tee_args a;
+
+	rb_scan_args(argc, argv, "31", &fd_in, &fd_out, &len, &flags);
+	a.fd_in = my_fileno(fd_in);
+	a.fd_out = my_fileno(fd_out);
+	a.len = (size_t)NUM2ULONG(len);
+	a.flags = NIL_P(flags) ? dflags : NUM2UINT(flags) | dflags;
+
+	return (long)nb_io_run(nogvl_tee, &a, a.flags);
+}
+
 /*
  * call-seq:
+ *   IO.tee(fd_in, fd_out, len) => integer
  *   IO.tee(fd_in, fd_out, len, flags) => integer
  *
  * Copies up to +len+ bytes of data from +fd_in+ to +fd_out+.  +fd_in+
  * and +fd_out+ must both refer to pipe descriptors.  +fd_in+ and +fd_out+
  * may not be endpoints of the same pipe.
  *
- * +flags+ may be zero or IO::Splice::F_NONBLOCK
+ * +flags+ may be zero (the default) or IO::Splice::F_NONBLOCK
  * Other IO::Splice flags are currently unimplemented or have no effect.
  *
  * Returns the number of bytes duplicated if successful.
@@ -210,22 +272,16 @@ static VALUE nogvl_tee(void *ptr)
  * Raises Errno::EAGAIN when +fd_in+ is empty and/or +fd_out+ is full
  * and +flags+ contains IO::Splice::F_NONBLOCK
  *
+ * Consider using IO.trytee if you are using IO::Splice::F_NONBLOCK
+ * as it avoids the cost of raising common Errno::EAGAIN exceptions.
+ *
  * See manpage for full documentation:
  * http://kernel.org/doc/man-pages/online/pages/man2/tee.2.html
  */
-static VALUE my_tee(VALUE self,
-	VALUE fd_in, VALUE fd_out,
-	VALUE len, VALUE flags)
+static VALUE my_tee(int argc, VALUE *argv, VALUE self)
 {
-	long n;
-	struct tee_args a = {
-		.fd_in = my_fileno(fd_in),
-		.fd_out = my_fileno(fd_out),
-		.len = (size_t)NUM2ULONG(len),
-		.flags = NUM2UINT(flags),
-	};
-
-	n = (long)nb_io_run(nogvl_tee, &a, a.flags);
+	long n = do_tee(argc, argv, 0);
+
 	if (n == 0)
 		rb_eof_error();
 	if (n < 0)
@@ -234,6 +290,34 @@ static VALUE my_tee(VALUE self,
 	return LONG2NUM(n);
 }
 
+/*
+ * call-seq:
+ *    IO.trytee(fd_in, fd_out, len) => integer
+ *    IO.trytee(fd_in, fd_out, len, flags) => integer
+ *
+ * Exactly like IO.tee, except +:EAGAIN+ is returned when either
+ * the read or write end would block instead of raising Errno::EAGAIN.
+ *
+ * IO::Splice::F_NONBLOCK is always passed for the pipe descriptor,
+ * but this can still block if the non-pipe descriptor is blocking.
+ *
+ * See IO.tee documentation for more details.
+ */
+static VALUE trytee(int argc, VALUE *argv, VALUE self)
+{
+	long n = do_tee(argc, argv, SPLICE_F_NONBLOCK);
+
+	if (n == 0)
+		return Qnil;
+	if (n < 0) {
+		if (errno == EAGAIN)
+			return sym_EAGAIN;
+		rb_sys_fail("tee");
+	}
+
+	return LONG2NUM(n);
+}
+
 struct vmsplice_args {
 	int fd;
 	struct iovec *iov;
@@ -272,7 +356,7 @@ do { \
 static void advance_vmsplice_args(struct vmsplice_args *a, long n)
 {
 	struct iovec *new_iov = a->iov;
-	int i;
+	unsigned long i;
 
 	/* skip over iovecs we've already written completely */
 	for (i = 0; i < a->nr_segs; i++, new_iov++) {
@@ -301,7 +385,9 @@ static void advance_vmsplice_args(struct vmsplice_args *a, long n)
 
 /*
  * call-seq:
+ *   IO.vmsplice(fd, string_array) => integer
  *   IO.vmsplice(fd, string_array, flags) => integer
+ *   IO.vmsplice(fd, string) => integer
  *   IO.vmsplice(fd, string, flags) => integer
  *
  * Transfers an array of strings into the pipe descriptor given by fd.
@@ -313,11 +399,14 @@ static void advance_vmsplice_args(struct vmsplice_args *a, long n)
  * See manpage for full documentation:
  * http://kernel.org/doc/man-pages/online/pages/man2/vmsplice.2.html
  */
-static VALUE my_vmsplice(VALUE self, VALUE fd, VALUE data, VALUE flags)
+static VALUE my_vmsplice(int argc, VALUE * argv, VALUE self)
 {
 	long rv = 0;
 	ssize_t left;
 	struct vmsplice_args a;
+	VALUE fd, data, flags;
+
+	rb_scan_args(argc, argv, "21", &fd, &data, &flags);
 
 	switch (TYPE(data)) {
 	case T_STRING: {
@@ -338,7 +427,7 @@ static VALUE my_vmsplice(VALUE self, VALUE fd, VALUE data, VALUE flags)
 		         rb_obj_classname(data));
 	}
 	a.fd = my_fileno(fd);
-	a.flags = NUM2UINT(flags);
+	a.flags = NIL_P(flags) ? 0 : NUM2UINT(flags);
 
 	for (;;) {
 		long n = (long)nb_io_run(nogvl_vmsplice, &a, a.flags);
@@ -442,9 +531,11 @@ 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, 6);
-	rb_define_singleton_method(rb_cIO, "tee", my_tee, 4);
-	rb_define_singleton_method(rb_cIO, "vmsplice", my_vmsplice, 3);
+	rb_define_singleton_method(rb_cIO, "splice", my_splice, -1);
+	rb_define_singleton_method(rb_cIO, "trysplice", trysplice, -1);
+	rb_define_singleton_method(rb_cIO, "tee", my_tee, -1);
+	rb_define_singleton_method(rb_cIO, "trytee", trytee, -1);
+	rb_define_singleton_method(rb_cIO, "vmsplice", my_vmsplice, -1);
 
 	/*
 	 * Attempt to move pages instead of copying.  This is only a hint
@@ -510,4 +601,6 @@ void Init_io_splice_ext(void)
 		rb_define_const(mSplice, "F_SETPIPE_SZ",
 		                UINT2NUM(F_SETPIPE_SZ));
 	}
+
+	sym_EAGAIN = ID2SYM(rb_intern("EAGAIN"));
 }