sendfile 1.1.0 → 1.2.0

data/README.textile

@@ -1,31 +1,27 @@
 h1. Ruby sendfile(2) Interface
 
-This module allows Ruby programs to access their OS's native
-<code>sendfile(2)</code> system call from any IO object. Your kernel must
-export a recognized signature for the <code>sendfile(2)</code> system call
-to use this module. Currently, that includes Linux, Solaris
-and FreeBSD.
+This module allows Ruby programs to access their OS's native <code>sendfile(2)</code> system call from any IO object. Your kernel must export a recognized signature for the <code>sendfile(2)</code> system call to use this module. Currently, that includes Linux, Solaris and FreeBSD.
 
 h2. Installation
 
-Download and install the latest package from the rubyforge.org
-RubyGems repository.
+Download and install the latest package from the rubyforge.org RubyGems repository.
 
-  $ sudo gem install sendfile 
+<code>
+  $ gem install sendfile 
+</code>
 
-If the tests all pass, you're ready to start using sendfile.
+If the tests all pass, you're ready to start using sendfile!
 
 h2. Usage
 
 Here's a small example of a use of <code>IO#sendfile</code>.
 
-  require 'socket'
-  require 'rubygems'
-  require 'sendfile'
-  s = TCPSocket.new 'yourdomain.com', 5000
-  File.open 'somefile.txt' { |f| s.sendfile f }
-  s.close
+bc.. require 'socket'
+require 'rubygems'
+require 'sendfile'
+s = TCPSocket.new 'yourdomain.com', 5000
+File.open 'somefile.txt' { |f| s.sendfile f }
+s.close
 
-See the test scripts for more examples on how to use this 
-module.
+p. See the test scripts for more examples on how to use this module.
 

data/ext/extconf.rb

@@ -1,22 +1,22 @@
-# 
+#
 # Copyright (c) 2005 Tobias DiPasquale
 #
-# Permission is hereby granted, free of charge, to any person obtaining a 
+# Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-# and/or sell copies of the Software, and to permit persons to whom the 
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included 
+# The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
 
@@ -28,16 +28,19 @@ require 'mkmf'
 $config_h = ""
 case RUBY_PLATFORM
 when /solaris/
-	have_header( "sys/sendfile.h")
-	have_library( "sendfile", "sendfile")
-	$config_h << "#define RUBY_PLATFORM_SOLARIS"
+  have_header( "sys/sendfile.h")
+  have_library( "sendfile", "sendfile")
+  $config_h << "#define RUBY_PLATFORM_SOLARIS"
 when /linux/
-	have_header( "sys/sendfile.h")
-	have_library( "c", "sendfile")
-	$config_h << "#define RUBY_PLATFORM_LINUX"
+  have_header( "sys/sendfile.h")
+  have_library( "c", "sendfile")
+  $config_h << "#define RUBY_PLATFORM_LINUX"
 when /freebsd/
-	have_library( "c", "sendfile")
-	$config_h << "#define RUBY_PLATFORM_FREEBSD"
+  have_library( "c", "sendfile")
+  $config_h << "#define RUBY_PLATFORM_FREEBSD"
+when /darwin/
+  have_library( "c", "sendfile")
+  $config_h << "#define RUBY_PLATFORM_DARWIN"
 end
 
 File.open( "config.h", "w") do |f|
@@ -51,4 +54,3 @@ end
 
 have_func('rb_thread_blocking_region')
 create_makefile( "sendfile")
-

data/ext/sendfile.c

@@ -3,22 +3,22 @@
  *
  * Copyright (c) 2005,2008 Tobias DiPasquale
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included 
+ * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
  * ------------------------------------------------------------------------
@@ -91,6 +91,10 @@ rb_thread_blocking_region(
 # include <unistd.h>
 #elif defined(RUBY_PLATFORM_SOLARIS)
 # include <sys/sendfile.h>
+#elif defined(RUBY_PLATFORM_DARWIN)
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <sys/uio.h>
 #endif
 
 static size_t count_max(off_t count)
@@ -138,7 +142,7 @@ static VALUE nogvl_sendfile(void *data)
 	size_t w = count_max(args->count);
 
 	rv = sendfile(args->in, args->out, args->off, args->count,
-	              NULL, &written, 0);
+				  NULL, &written, 0);
 	if (written == 0 && rv == 0) {
 		args->eof = 1;
 	} else {
@@ -148,6 +152,23 @@ static VALUE nogvl_sendfile(void *data)
 
 	return (VALUE)rv;
 }
+#elif defined(RUBY_PLATFORM_DARWIN)
+static VALUE nogvl_sendfile(void *data)
+{
+	struct sendfile_args *args = data;
+	int rv;
+	off_t written;
+	size_t w = count_max(args->count);
+
+	rv = sendfile(args->in, args->out, args->off, args->count,
+				  NULL, 0);
+	if (rv == 0)
+		args->eof = 1;
+	if (rv > 0)
+		args->count -= rv;
+
+	return (VALUE)rv;
+}
 #else
 static VALUE nogvl_sendfile(void *data)
 {
@@ -172,7 +193,7 @@ static off_t sendfile_full(struct sendfile_args *args)
 
 	while (1) {
 		rv = (ssize_t)rb_thread_blocking_region(nogvl_sendfile, args,
-		                                        RUBY_UBF_IO, NULL);
+												RUBY_UBF_IO, NULL);
 		if (!args->count)
 			break;
 		if (args->eof) {
@@ -201,7 +222,7 @@ static VALUE sendfile_nonblock(struct sendfile_args *args, int try)
 	}
 
 	rv = (ssize_t)rb_thread_blocking_region(nogvl_sendfile, args,
-	                                        RUBY_UBF_IO, NULL);
+											RUBY_UBF_IO, NULL);
 	if (rv < 0) {
 		if (try && errno == EAGAIN)
 			return sym_wait_writable;
@@ -217,7 +238,7 @@ static VALUE sendfile_nonblock(struct sendfile_args *args, int try)
 }
 
 static void convert_args(int argc, VALUE *argv, VALUE self,
-                         struct sendfile_args *args)
+						 struct sendfile_args *args)
 {
 	VALUE in, offset, count;
 
@@ -232,7 +253,7 @@ static void convert_args(int argc, VALUE *argv, VALUE self,
 	args->off = (NIL_P(offset)) ? 0 : NUM2OFFT(offset);
 	if (NIL_P(count)) {
 		/* FreeBSD's sendfile() can take 0 as an indication to send
-		 * until end of file, but Linux and Solaris can't, and anyway 
+		 * until end of file, but Linux and Solaris can't, and anyway
 		 * we need the file size to ensure we send it all in the case
 		 * of a non-blocking fd */
 		struct stat s;
@@ -299,7 +320,7 @@ static VALUE rb_io_sendfile_nonblock(int argc, VALUE *argv, VALUE self)
 
 /* call-seq:
  *	writeIO.trysendfile(readIO, offset=0, count=nil) => integer, nil, or
- *	                                                    :wait_writable
+ *														:wait_writable
  *
  * Transfers count bytes starting at offset from readIO directly to writeIO
  * without copying (i.e. invoking the kernel to do it for you).
@@ -338,7 +359,6 @@ void Init_sendfile(void)
 	sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
 	rb_define_method(rb_cIO, "sendfile", rb_io_sendfile, -1);
 	rb_define_method(rb_cIO, "sendfile_nonblock",
-	                 rb_io_sendfile_nonblock, -1);
+					 rb_io_sendfile_nonblock, -1);
 	rb_define_method(rb_cIO, "trysendfile", rb_io_trysendfile, -1);
 }
-

data/sendfile.gemspec

@@ -2,22 +2,20 @@
 
 spec = Gem::Specification.new do |gs|
 	gs.name = 'sendfile'
-	gs.version = '1.1.0'
+	gs.version = '1.2.0'
 	gs.summary = 'Ruby interface to sendfile(2) system call'
 	gs.description = <<-EOF
 Allows Ruby programs to access sendfile(2) functionality on 
-any IO object. Works on Linux, Solaris and FreeBSD with 
+any IO object. Works on Linux, Solaris, FreeBSD and Darwin with
 blocking and non-blocking sockets.
 EOF
 	gs.author = 'Toby DiPasquale'
 	gs.email = 'toby@cbcg.net'
+	gs.homepage = 'https://github.com/codeslinger/sendfile'
 	gs.rubyforge_project = 'ruby-sendfile'
-
-	gs.autorequire = 'sendfile'
 	gs.files = File.read('FILES').split($/)
 	gs.test_files = Dir.glob 'test/test_*.rb'
 	gs.extensions << 'ext/extconf.rb'
-
 	gs.has_rdoc = true
 	gs.extra_rdoc_files = %w(README.textile)
 	gs.required_ruby_version = '>= 1.8.0'

metadata

@@ -1,37 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sendfile
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Toby DiPasquale
-autorequire: sendfile
+autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-05 00:00:00 -05:00
-default_executable: 
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies: []
-
-description: |
-  Allows Ruby programs to access sendfile(2) functionality on 
-  any IO object. Works on Linux, Solaris and FreeBSD with 
-  blocking and non-blocking sockets.
-
+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
+  sockets.\n"
 email: toby@cbcg.net
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - FILES
 - README.textile
 - LICENSE
@@ -42,41 +31,29 @@ files:
 - test/large.gz
 - test/small
 - sendfile.gemspec
-has_rdoc: true
-homepage: 
+homepage: https://github.com/codeslinger/sendfile
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-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: 55
-      segments: 
-      - 1
-      - 8
-      - 0
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.0
-required_rubygems_version: !ruby/object:Gem::Requirement 
+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: ruby-sendfile
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby interface to sendfile(2) system call
-test_files: 
+test_files:
 - test/test_sendfile.rb