sendfile 1.2.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 99bf77c10be057479085f39557a8d5a9e7a57ea1
+  data.tar.gz: 32f90f06d5a2df0f25f92e3a8215c9232f0c83f7
+SHA512:
+  metadata.gz: 8a65bce7d54943340d88b032142b308b4c1159de89b19c5f320860d1ca3815fb43e264b02d9fd22661debec1abab94f481c61325359db28e263efa60b86abf11
+  data.tar.gz: 7f528d7819de5e365e83337adccaa3c4f61e652eb6ba893837e43fd4e06e4ba62785ada754171ba4707e5dfa4d6962a8cf3e83c36f96406c1fa5a1fc1aa7013a

data/ext/extconf.rb

@@ -52,5 +52,7 @@ f.print <<EOF
 EOF
 end
 
-have_func('rb_thread_blocking_region')
+unless have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
+  have_func('rb_thread_blocking_region')
+end
 create_makefile( "sendfile")

data/ext/sendfile.c

@@ -45,7 +45,17 @@
 #include "config.h"
 static VALUE sym_wait_writable;
 
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) && defined(HAVE_RUBY_THREAD_H)
+/* Ruby 2.0+ */
+#  include <ruby/thread.h>
+typedef void * (*my_blocking_fn_t)(void*);
+#  define WITHOUT_GVL(fn,a) \
+	rb_thread_call_without_gvl((my_blocking_fn_t)(fn),(a),RUBY_UBF_IO,0)
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION) /* Ruby 1.9 */
+typedef VALUE (*my_blocking_fn_t)(void*);
+#  define WITHOUT_GVL(fn,a) \
+	rb_thread_blocking_region((my_blocking_fn_t)(fn),(a),RUBY_UBF_IO,0)
+#else /* MRI 1.8 threads */
 /*
  * For non-natively threaded interpreters, do not monopolize the
  * process and send in smaller chunks.  64K was chosen as it is
@@ -57,13 +67,9 @@ static VALUE sym_wait_writable;
 
 /* (very) partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */
 #  include <rubysig.h>
-#  define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
-typedef void rb_unblock_function_t(void *);
 typedef VALUE rb_blocking_function_t(void *);
 static VALUE
-rb_thread_blocking_region(
-	rb_blocking_function_t *fn, void *data1,
-	rb_unblock_function_t *ubf, void *data2)
+WITHOUT_GVL(rb_blocking_function_t *fn, void *data1)
 {
 	VALUE rv;
 
@@ -73,7 +79,9 @@ rb_thread_blocking_region(
 
 	return rv;
 }
-#else
+#endif /* WITHOUT_GVL definitions */
+
+#ifndef MAX_SEND_SIZE
 /*
  * We can release the GVL and block as long as we need to.
  * Limit this to the maximum ssize_t anyways, since 32-bit machines with
@@ -193,8 +201,7 @@ static off_t sendfile_full(struct sendfile_args *args)
 	off_t all = args->count;
 
 	while (1) {
-		rv = (ssize_t)rb_thread_blocking_region(nogvl_sendfile, args,
-												RUBY_UBF_IO, NULL);
+		rv = (ssize_t)WITHOUT_GVL(nogvl_sendfile, args);
 		if (!args->count)
 			break;
 		if (args->eof) {
@@ -222,8 +229,7 @@ static VALUE sendfile_nonblock(struct sendfile_args *args, int try)
 			rb_sys_fail("fcntl");
 	}
 
-	rv = (ssize_t)rb_thread_blocking_region(nogvl_sendfile, args,
-											RUBY_UBF_IO, NULL);
+	rv = (ssize_t)WITHOUT_GVL(nogvl_sendfile, args);
 	if (rv < 0) {
 		if (try && errno == EAGAIN)
 			return sym_wait_writable;

data/sendfile.gemspec

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

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sendfile
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors:
 - Toby DiPasquale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2014-06-28 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
+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: []
@@ -33,27 +32,26 @@ files:
 - sendfile.gemspec
 homepage: https://github.com/codeslinger/sendfile
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-sendfile
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby interface to sendfile(2) system call
 test_files:
 - test/test_sendfile.rb