writev 1.0.1 → 1.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+Thu Oct 11 18:45:15 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/writev/extconf.rb: check for rb_io_check_io
+        * ext/writev/writev.c: conditionally use built in function
+
+Thu Oct 11 18:43:53 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/writev/writev.c: check for array type. Fixes #2
+        * test/test_writev.rb: appropriate test
+
 === 1.0.1 / 2011-08-19
 
 * 1 bug fixed

data/bench.rb

@@ -2,28 +2,101 @@ require 'writev'
 require 'tempfile'
 require 'benchmark'
 
-LIST = File.readlines '/usr/share/dict/words'
-p LIST.length
-
-Benchmark.bm(7) do |x|
-  x.report('write') {
-    file = Tempfile.new('write')
-    LIST.each { |l| file.write l }
-    file.unlink
-  }
-  x.report('writev') {
-    file = Tempfile.new('write1')
-    LIST.each_slice(IO::IOV_MAX) do |slice|
-      file.writev slice
+def avg items
+  items.map { |item| item.length }.inject(:+) / items.length
+end
+
+def make_strings count, min, spread
+  strings = []
+
+  open '/dev/zero' do |io|
+    while strings.length < count do
+      strings << io.read(min + rand(spread))
     end
-    file.unlink
-  }
+  end
+
+  strings
 end
 
+def bench list
+  p :length => list.length
+  p :avg_size => avg(list)
+
+  Benchmark.bm(13) do |x|
+    x.report('write') {
+      Tempfile.open 'write' do |file|
+        list.each { |l| file.write l }
+      end
+    }
+
+    x.report('write join') {
+      Tempfile.open 'write' do |file|
+        file.write list.join
+      end
+    }
+
+    x.report('syswrite') {
+      Tempfile.open 'write' do |file|
+        list.each { |l| file.syswrite l }
+      end
+    }
+
+    x.report('syswrite join') {
+      Tempfile.open 'write' do |file|
+        file.syswrite list.join
+      end
+    }
+
+    x.report('writev') {
+      Tempfile.open 'write' do |file|
+        list.each_slice(IO::IOV_MAX) do |slice|
+          file.writev slice
+        end
+      end
+    }
+  end
+
+  puts
+end
+
+list = File.readlines '/usr/share/dict/words'
+
+bench list
+
+list = make_strings list.length, 1024, 1024
+
+bench list
+
+list = make_strings (list.length / 4), 10240, 10240
+
+bench list
+
 # /* vim: set et sws=2 sw=2: */
 __END__
-[aaron@higgins writev (master)]$ ruby -I lib bench.rb
-235886
-              user     system      total        real
-write     0.270000   0.010000   0.280000 (  0.293202)
-writev    0.020000   0.040000   0.060000 (  0.087576)
+{:length=>235886}
+{:avg_size=>10}
+                    user     system      total        real
+write           0.150000   0.010000   0.160000 (  0.168736)
+write join      0.020000   0.000000   0.020000 (  0.020665)
+syswrite        0.390000   0.500000   0.890000 (  0.883507)
+syswrite join   0.010000   0.000000   0.010000 (  0.018780)
+writev          0.030000   0.030000   0.060000 (  0.051839)
+
+{:length=>235886}
+{:avg_size=>1535}
+                    user     system      total        real
+write           0.330000   0.700000   1.030000 (  5.380344)
+write join      0.160000   0.450000   0.610000 (  5.489569)
+syswrite        0.430000   1.180000   1.610000 (  5.433381)
+syswrite join   0.140000   0.490000   0.630000 (  5.723345)
+writev          0.020000   0.300000   0.320000 (  5.411284)
+
+{:length=>58971}
+{:avg_size=>15372}
+                    user     system      total        real
+write           0.180000   1.120000   1.300000 ( 13.305516)
+write join      0.360000   1.230000   1.590000 ( 15.051602)
+syswrite        0.160000   1.120000   1.280000 ( 14.246432)
+syswrite join   0.280000   1.280000   1.560000 ( 15.344061)
+writev          0.000000   0.680000   0.680000 ( 14.185484)
+

data/ext/writev/extconf.rb

@@ -1,3 +1,4 @@
 require 'mkmf'
 
+have_func 'rb_io_check_io'
 create_makefile 'writev'

data/ext/writev/writev.c

@@ -4,11 +4,13 @@
 
 VALUE rb_IOV_MAX;
 
+#ifndef HAVE_RB_IO_CHECK_IO
 static VALUE
 rb_io_check_io(VALUE io)
 {
     return rb_check_convert_type(io, T_FILE, "IO", "to_io");
 }
+#endif
 
 #define rb_sys_fail_path(path) rb_sys_fail(NIL_P(path) ? 0 : RSTRING_PTR(path))
 
@@ -20,6 +22,7 @@ static VALUE rb_writev(VALUE io, VALUE list)
     ssize_t written;
     VALUE tmp;
 
+    Check_Type(list, T_ARRAY);
 #ifdef IOV_MAX
     if(RARRAY_LEN(list) > IOV_MAX)
 #else

data/lib/writev.rb

@@ -1,5 +1,5 @@
 require 'writev.so'
 
 module WriteV
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/test/test_writev.rb

@@ -11,6 +11,15 @@ class TestWritev < MiniTest::Unit::TestCase
     file.unlink
   end
 
+  def test_checks_arguments
+    file = Tempfile.new('foo')
+
+    assert_raises TypeError do
+      file.writev('hello')
+    end
+    file.unlink
+  end
+
   def test_length
     file = Tempfile.new('foo')
 

metadata

@@ -1,82 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: writev
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.0.2
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 9
-        version: "2.9"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-description: |-
-  This gem adds the `writev` method to IO.  It provides access to the `writev`
-  system call on your IO objects.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: ! 'This gem adds the `writev` method to IO.  It provides access to the
+  `writev`
+
+  system call on your IO objects.'
+email:
 - aaron@tenderlovemaking.com
 executables: []
-
-extensions: 
+extensions:
 - ext/writev/extconf.rb
-extra_rdoc_files: 
-- Manifest.txt
+extra_rdoc_files:
 - CHANGELOG.rdoc
+- Manifest.txt
 - README.rdoc
-files: 
+files:
 - .autotest
 - CHANGELOG.rdoc
 - Manifest.txt
@@ -90,39 +102,29 @@ files:
 - .gemtest
 homepage: http://github.com/tenderlove/writev
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-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
-      - 9
-      - 2
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-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: writev
-rubygems_version: 1.8.8
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This gem adds the `writev` method to IO
-test_files: 
+test_files:
 - test/test_writev.rb