io-extra 1.1.0 → 1.1.1

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.1.1 - 8-Sep-2008
+* Added the IO.pread_ptr method. This returns the buffer address
+  rather than the buffer itself.
+* Added limited support for OS X.
+* Minor refactoring of the IO.pread method.
+
 == 1.1.0 - 28-Aug-2008
 * Added IO.pread and IO.pwrite methods for those platforms that
   support them.

data/ext/extconf.rb

@@ -1,5 +1,6 @@
 require 'mkmf'
 require 'fileutils'
+require 'rbconfig'
 
 dir_config('io')
 
@@ -9,4 +10,8 @@ have_func('directio')
 have_func('pread')
 have_func('pwrite')
 
+if Config::CONFIG['host_os'] =~ /darwin/i
+   $CPPFLAGS += " -D_MACOS"
+end
+
 create_makefile('io/extra', 'io')

data/ext/io/extra.c

@@ -25,8 +25,13 @@
  * 
  *--
  * The manual approach was copied from the closefrom() man page on Solaris 9.
+ * Not implemented on OS X because the getrlimit function is busted.
  */
 static VALUE io_closefrom(VALUE klass, VALUE v_low_fd){
+#ifdef _MACOS
+   rb_raise(rb_eNotImpError, "IO.closefrom is not implemented on this platform");
+#endif
+
 #ifdef HAVE_CLOSEFROM
    closefrom(NUM2INT(v_low_fd));
 #else
@@ -136,19 +141,38 @@ static VALUE io_set_directio(VALUE self, VALUE v_advice){
  * 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){
-   size_t result;
    int fd = NUM2INT(v_fd);
    size_t nbyte = NUM2ULONG(v_nbyte);
    off_t offset = NUM2ULONG(v_offset);
-   char buf[nbyte+1];
+   char* buf = malloc(nbyte + 1);
 
-   result = pread(fd, buf, nbyte, offset);
-
-   if(result == -1)
+   if(pread(fd, buf, nbyte, offset) == -1)
       rb_sys_fail("pread");
 
    return rb_str_new2(buf);
 }
+
+/*
+ * IO.pread_ptr(fd, length, offset)
+ *
+ * This is identical to IO.pread, except that it returns the pointer address
+ * of the string, instead of the actual buffer.
+ *--
+ * This was added because, in some cases, the IO.pread buffer might return
+ * an empty string. In such situations we are unable to get the actual pointer
+ * address with pure Ruby.
+ */
+static VALUE s_io_pread_ptr(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 = NUM2ULONG(v_offset);
+   uintptr_t* vector = malloc(nbyte + 1);
+
+   if(pread(fd, vector, nbyte, offset) == -1)
+      rb_sys_fail("pread");
+
+   return ULL2NUM(vector[0]);
+}
 #endif
 
 #ifdef HAVE_PWRITE
@@ -203,12 +227,13 @@ void Init_extra(){
 
 #ifdef HAVE_PREAD
    rb_define_singleton_method(rb_cIO, "pread", s_io_pread, 3);
+   rb_define_singleton_method(rb_cIO, "pread_ptr", s_io_pread_ptr, 3);
 #endif
 
 #ifdef HAVE_PWRITE
    rb_define_singleton_method(rb_cIO, "pwrite", s_io_pwrite, 3);
 #endif
 
-   /* 1.1.0: The version of this package. This a string. */
-   rb_define_const(rb_cIO, "EXTRA_VERSION", rb_str_new2("1.1.0"));
+   /* 1.1.1: The version of this package. This a string. */
+   rb_define_const(rb_cIO, "EXTRA_VERSION", rb_str_new2("1.1.1"));
 }

data/test/test_io_extra.rb

@@ -15,33 +15,40 @@ class TC_IO_Extra < Test::Unit::TestCase
    end
      
    def test_version
-      assert_equal('1.1.0', IO::EXTRA_VERSION)
+      assert_equal('1.1.1', IO::EXTRA_VERSION)
    end
    
-   def test_directio
-      assert_respond_to(@fh, :directio?)
-      assert_nothing_raised{ @fh.directio? }
-   end
+   unless Config::CONFIG['host_os'] =~ /darwin/i
+      def test_directio
+         assert_respond_to(@fh, :directio?)
+         assert_nothing_raised{ @fh.directio? }
+      end
 
-   def test_directio_set
-      assert_respond_to(@fh, :directio=)
-      assert_raises(StandardError){ @fh.directio = 99 }
-      assert_nothing_raised{ @fh.directio = IO::DIRECTIO_ON }
-   end
+      def test_directio_set
+         assert_respond_to(@fh, :directio=)
+         assert_raises(StandardError){ @fh.directio = 99 }
+         assert_nothing_raised{ @fh.directio = IO::DIRECTIO_ON }
+      end
 
-   def test_constants
-      assert_not_nil(IO::DIRECTIO_ON)
-      assert_not_nil(IO::DIRECTIO_OFF)
-   end
+      def test_constants
+         assert_not_nil(IO::DIRECTIO_ON)
+         assert_not_nil(IO::DIRECTIO_OFF)
+      end
 
-   def test_fdwalk
-      assert_respond_to(IO, :fdwalk)
-      assert_nothing_raised{ IO.fdwalk(0){ } }
+      def test_fdwalk
+         assert_respond_to(IO, :fdwalk)
+         assert_nothing_raised{ IO.fdwalk(0){ } }
+      end
    end
 
    def test_closefrom
       assert_respond_to(IO, :closefrom)
-      assert_nothing_raised{ IO.closefrom(3) }
+
+      if Config::CONFIG['host_os'] =~ /darwin/i
+         assert_raise(NotImplementedError){ IO.closefrom(3) }
+      else
+         assert_nothing_raised{ IO.closefrom(3) }
+      end
    end
 
    def test_pread
@@ -51,6 +58,13 @@ class TC_IO_Extra < Test::Unit::TestCase
       assert_equal("quick", IO.pread(@fh.fileno, 5, 4))
    end
 
+   def test_pread_ptr
+      @fh.close rescue nil
+      @fh = File.open(@file)
+      assert_respond_to(IO, :pread_ptr)
+      assert_kind_of(Fixnum, IO.pread_ptr(@fh.fileno, 5, 4))
+   end
+
    def test_pwrite
       assert_respond_to(IO, :pwrite)
       assert_nothing_raised{ IO.pwrite(@fh.fileno, "HAL", 0) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: io-extra
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-28 00:00:00 -06:00
+date: 2008-09-08 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
-description: Adds the IO.closefrom and IO.fdwalk class methods as well as the IO#directio and IO#directio? instance methods (for those platforms that support them).
+description: Adds the IO.closefrom, IO.fdwalk, IO.pread, IO.pread_ptr, and IO.pwrite class methods as well as the IO#directio and IO#directio? instance methods (for those platforms that support them).
 email: djberg96@gmail.com
 executables: []
 
@@ -55,6 +55,6 @@ rubyforge_project: shards
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Adds the IO.closefrom and IO.fdwalk class methods as well as the IO#directio and IO#directio? instance methods (for those platforms that support them).
+summary: Adds the IO.closefrom, IO.fdwalk, IO.pread, IO.pread_ptr, and IO.pwrite class methods as well as the IO#directio and IO#directio? instance methods (for those platforms that support them).
 test_files: 
 - test/test_io_extra.rb