kgio 1.2.1 → 1.3.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.2.1.GIT
+DEF_VER=v1.3.0.GIT
 
 LF='
 '

data/ext/kgio/read_write.c

@@ -233,7 +233,7 @@ done:
 				a->ptr = RSTRING_PTR(a->buf) + written;
 				return -1;
 			} else if (written > 0) {
-				a->buf = rb_str_new(a->ptr + n, a->len - n);
+				a->buf = rb_str_new(a->ptr, a->len);
 			} else {
 				a->buf = mKgio_WaitWritable;
 			}

data/lib/kgio.rb

@@ -6,15 +6,15 @@ module Kgio
   # Rack (and CGI) servers that also serve HTTP traffic over
   # UNIX domain sockets.
   LOCALHOST = '127.0.0.1'
-end
 
-# Kgio::PipeMethods#kgio_tryread and Kgio::SocketMethods#kgio_tryread will
-# return this constant when waiting for a read is required.
-module Kgio::WaitReadable; end
+  # Kgio::PipeMethods#kgio_tryread and Kgio::SocketMethods#kgio_tryread will
+  # return this constant when waiting for a read is required.
+  WaitReadable = :wait_readable
 
-# PipeMethods#kgio_trywrite and SocketMethods#kgio_trywrite will
-# return this constant when waiting for a read is required.
-module Kgio::WaitWritable; end
+  # PipeMethods#kgio_trywrite and SocketMethods#kgio_trywrite will
+  # return this constant when waiting for a read is required.
+  WaitWritable = :wait_writable
+end
 
 require 'kgio_ext'
 

data/test/lib_read_write.rb

@@ -1,5 +1,7 @@
+# -*- encoding: binary -*-
 require 'test/unit'
 require 'io/nonblock'
+require 'digest/sha1'
 $-w = true
 require 'kgio'
 
@@ -58,6 +60,43 @@ module LibReadWriteTest
     assert false, "should never get here (line:#{__LINE__})"
   end
 
+  def test_trywrite_full
+    buf = "\302\251" * 1024 * 1024
+    buf2 = ""
+    dig = Digest::SHA1.new
+    t = Thread.new do
+      sleep 1
+      nr = 0
+      begin
+        dig.update(@rd.readpartial(4096, buf2))
+        nr += buf2.size
+      rescue EOFError
+        break
+      rescue => e
+      end while true
+      dig.hexdigest
+    end
+    50.times do
+      wr = buf
+      begin
+        rv = @wr.kgio_trywrite(wr)
+        case rv
+        when String
+          wr = rv
+        when Kgio::WaitReadable
+          assert false, "should never get here line=#{__LINE__}"
+        when Kgio::WaitWritable
+          IO.select(nil, [ @wr ])
+        else
+          wr = false
+        end
+      end while wr
+    end
+    @wr.close
+    t.join
+    assert_equal '8ff79d8115f9fe38d18be858c66aa08a1cc27a66', t.value
+  end
+
   def test_write_conv
     assert_equal nil, @wr.kgio_write(10)
     assert_equal "10", @rd.kgio_read(2)
@@ -107,6 +146,8 @@ module LibReadWriteTest
   def test_trywrite_return_wait_writable
     tmp = []
     tmp << @wr.kgio_trywrite("HI") until tmp[-1] == Kgio::WaitWritable
+    assert Kgio::WaitWritable === tmp[-1]
+    assert(!(Kgio::WaitReadable === tmp[-1]))
     assert_equal Kgio::WaitWritable, tmp.pop
     assert tmp.size > 0
     penultimate = tmp.pop

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kgio
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - kgio hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +00:00
+date: 2010-10-08 00:00:00 +00:00
 default_executable: 
 dependencies: []