kgio 2.4.0 → 2.4.1

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.4.0.GIT
+DEF_VER=v2.4.1.GIT
 
 LF='
 '

data/ext/kgio/poll.c

@@ -40,8 +40,6 @@ static int retryable(struct poll_args *a)
 
 	if (a->timeout < 0)
 		return 1;
-	if (a->timeout == 0)
-		return 0;
 
 	clock_gettime(hopefully_CLOCK_MONOTONIC, &ts);
 
@@ -53,7 +51,9 @@ static int retryable(struct poll_args *a)
 	}
 	a->timeout -= ts.tv_sec * 1000;
 	a->timeout -= ts.tv_nsec / 1000000;
-	return (a->timeout >= 0);
+	if (a->timeout < 0)
+		a->timeout = 0;
+	return 1;
 }
 
 static int num2timeout(VALUE timeout)

data/test/test_poll.rb

@@ -90,4 +90,31 @@ class TestPoll < Test::Unit::TestCase
     ensure
       trap(:USR1, orig)
   end
+
+  def test_poll_signal_torture
+    usr1 = 0
+    empty = 0
+    nr = 100
+    set = { @rd => Kgio::POLLIN }
+    trap(:USR1) { usr1 += 1 }
+    pid = fork do
+      trap(:USR1, "DEFAULT")
+      sleep 0.1
+      ppid = Process.ppid
+      nr.times { Process.kill(:USR1, ppid); sleep 0.05 }
+      @wr.syswrite('.')
+      exit!(0)
+    end
+
+    assert_nothing_raised do
+      empty += 1 until Kgio.poll(set.dup, 100)
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?, status.inspect
+    assert usr1 > 0, "usr1: #{usr1}"
+    rescue Object => err
+      p [ :err, err ]
+    ensure
+      trap(:USR1, "DEFAULT")
+  end
 end if Kgio.respond_to?(:poll)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kgio
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  version: 2.4.1
 platform: ruby
 authors: 
 - kgio hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 Z
+date: 2011-05-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wrongdoc
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: kinder, gentler I/O for Ruby