io-extra 1.2.4 → 1.2.5

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.2.5 - 23-Mar-2011
+* Use rb_thread_blocking_region internally for IO.pread and IO.pwrite. Thanks
+  go to Eric Wong for the patch.
+
 == 1.2.4 - 22-Mar-2011
 * Use NUM2OFFT where appropriate. Fixes potential 32 vs 64 bit issues. Thanks
   go to Eric Wong for the spot and patch.

data/ext/io/extra.c

@@ -314,6 +314,20 @@ static VALUE io_set_directio(VALUE self, VALUE v_advice){
 #endif
 
 #ifdef HAVE_PREAD
+struct pread_args {
+   int fd;
+   void *buf;
+   size_t nbyte;
+   off_t offset;
+};
+
+static VALUE nogvl_pread(void *ptr)
+{
+   struct pread_args *args = ptr;
+
+   return (VALUE)pread(args->fd, args->buf, args->nbyte, args->offset);
+}
+
 /*
  * IO.pread(fd, length, offset)
  *
@@ -321,16 +335,22 @@ static VALUE io_set_directio(VALUE self, VALUE v_advice){
  * position in the file without changing the file pointer. And unlike IO.read,
  * the +fd+, +length+ and +offset+ arguments are all mandatory.
  */
-static VALUE s_io_pread(VALUE klass, VALUE v_fd, VALUE v_nbyte, VALUE v_offset){
-   int fd = NUM2INT(v_fd);
-   size_t nbyte = NUM2ULONG(v_nbyte);
-   off_t offset = NUM2OFFT(v_offset);
-   VALUE str = rb_str_new(NULL, nbyte);
-   ssize_t nread = pread(fd, RSTRING_PTR(str), nbyte, offset);
+static VALUE s_io_pread(VALUE klass, VALUE fd, VALUE nbyte, VALUE offset){
+   struct pread_args args;
+   VALUE str;
+   ssize_t nread;
+
+   args.fd = NUM2INT(fd);
+   args.nbyte = NUM2ULONG(nbyte);
+   args.offset = NUM2OFFT(offset);
+   str = rb_str_new(NULL, args.nbyte);
+   args.buf = RSTRING_PTR(str);
+
+   nread = (ssize_t)rb_thread_blocking_region(nogvl_pread, &args, RUBY_UBF_IO, 0);
 
-   if (nread < 0)
+   if (nread == -1)
       rb_sys_fail("pread");
-   if ((size_t)nread != nbyte)
+   if ((size_t)nread != args.nbyte)
       rb_str_set_len(str, nread);
 
    return str;
@@ -360,6 +380,20 @@ static VALUE s_io_pread_ptr(VALUE klass, VALUE v_fd, VALUE v_nbyte, VALUE v_offs
 #endif
 
 #ifdef HAVE_PWRITE
+struct pwrite_args {
+   int fd;
+   const void *buf;
+   size_t nbyte;
+   off_t offset;
+};
+
+static VALUE nogvl_pwrite(void *ptr)
+{
+   struct pwrite_args *args = ptr;
+
+   return (VALUE)pwrite(args->fd, args->buf, args->nbyte, args->offset);
+}
+
 /*
  * IO.pwrite(fd, buf, offset)
  *
@@ -371,15 +405,16 @@ static VALUE s_io_pread_ptr(VALUE klass, VALUE v_fd, VALUE v_nbyte, VALUE v_offs
  *
  * Returns the number of bytes written.
  */
-static VALUE s_io_pwrite(VALUE klass, VALUE v_fd, VALUE v_buf, VALUE v_offset){
+static VALUE s_io_pwrite(VALUE klass, VALUE fd, VALUE buf, VALUE offset){
    ssize_t result;
+   struct pwrite_args args;
+
+   args.fd = NUM2INT(fd);
+   args.buf = RSTRING_PTR(buf);
+   args.nbyte = RSTRING_LEN(buf);
+   args.offset = NUM2OFFT(offset);
 
-   result = pwrite(
-      NUM2INT(v_fd),
-      RSTRING_PTR(v_buf),
-      RSTRING_LEN(v_buf),
-      NUM2OFFT(v_offset)
-   );
+   result = (ssize_t)rb_thread_blocking_region(nogvl_pwrite, &args, RUBY_UBF_IO, 0);
 
    if(result == -1)
       rb_sys_fail("pwrite");
@@ -544,6 +579,6 @@ void Init_extra(){
    rb_define_singleton_method(rb_cIO, "writev", s_io_writev, 2);
 #endif
 
-   /* 1.2.4: The version of this library. This a string. */
-   rb_define_const(rb_cIO, "EXTRA_VERSION", rb_str_new2("1.2.4"));
+   /* 1.2.5: The version of this library. This a string. */
+   rb_define_const(rb_cIO, "EXTRA_VERSION", rb_str_new2("1.2.5"));
 }

data/io-extra.gemspec

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rbconfig'
 
 Gem::Specification.new do |spec|
-  if RbConfig::CONFIG['host_os'] =~ /mswin|dos|win32|cygwin|mingw/i
+  if RbConfig::CONFIG['host_os'] =~ /mswin|dos|win32|cygwin|mingw|windows/i
     STDERR.puts 'Not supported on this platform. Exiting.'
     exit(-1)
   end
    
   spec.name       = 'io-extra'
-  spec.version    = '1.2.4'
+  spec.version    = '1.2.5'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'

data/test/test_io_extra.rb

@@ -20,7 +20,7 @@ class TC_IO_Extra < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal('1.2.4', IO::EXTRA_VERSION)
+    assert_equal('1.2.5', IO::EXTRA_VERSION)
   end
 
   def test_direct_constant

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: io-extra
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -06:00
+date: 2011-03-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency