sleepy_penguin 3.0.0 → 3.0.1

data/ChangeLog

@@ -1,5 +1,29 @@
 ChangeLog from http://bogomips.org/sleepy_penguin.git
 
+   commit ee4481de83bb8d208ff99aed9b5fff393115114c
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri May 20 19:39:58 2011 -0700
+   
+       sleepy_penguin 3.0.1 - really avoids EINTR
+       
+       One bugfix:
+       
+       * epoll: avoid race condition in EINTR checking
+       
+         Even if we timeout while getting an EINTR, we'll retry
+         epoll_wait() with a zero timeout like IO.select does in Ruby to
+         avoid raising Errno::EINTR.
+   
+   commit 2fb791b331b286f2af86d807028818d493f0f556
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri May 20 19:34:39 2011 -0700
+   
+       epoll: avoid race condition in EINTR checking
+       
+       Even if we timeout while getting an EINTR, we'll retry
+       epoll_wait() with a zero timeout like IO.select does in Ruby to
+       avoid raising Errno::EINTR.
+   
    commit 96503a9d386e422ee594f8579a5a76e970c90a6c
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Fri May 20 17:15:19 2011 -0700

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 3.0.0
+GIT_VERSION = 3.0.1

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v3.0.0.GIT
+DEF_VER=v3.0.1.GIT
 
 LF='
 '

data/LATEST

@@ -1,12 +1,10 @@
-=== sleepy_penguin 3.0.0 / 2011-05-21 00:22 UTC
+=== sleepy_penguin 3.0.1 - really avoids EINTR / 2011-05-21 02:40 UTC
 
-  Epoll#wait always waits the specified amount of time and never
-  raises Errno::EINTR.
+  One bugfix:
 
-  Disabled operations on Fixnum file descriptors, only IO objects
-  may be passed to Epoll methods.
+  * epoll: avoid race condition in EINTR checking
 
-  Cross-thread Epoll#close behavior matches Ruby 1.9.3dev.
-
-  Improved Rubinius support (lightly tested).
+    Even if we timeout while getting an EINTR, we'll retry
+    epoll_wait() with a zero timeout like IO.select does in Ruby to
+    avoid raising Errno::EINTR.
 

data/NEWS

@@ -1,3 +1,13 @@
+=== sleepy_penguin 3.0.1 - really avoids EINTR / 2011-05-21 02:40 UTC
+
+  One bugfix:
+
+  * epoll: avoid race condition in EINTR checking
+
+    Even if we timeout while getting an EINTR, we'll retry
+    epoll_wait() with a zero timeout like IO.select does in Ruby to
+    avoid raising Errno::EINTR.
+
 === sleepy_penguin 3.0.0 / 2011-05-21 00:22 UTC
 
   Epoll#wait always waits the specified amount of time and never

data/ext/sleepy_penguin/epoll.c

@@ -319,21 +319,19 @@ static VALUE epwait_result(struct rb_epoll *ep, int n)
 	return INT2NUM(n);
 }
 
-static int epoll_expired_p(uint64_t expire_at, struct rb_epoll *ep)
+static int epoll_resume_p(uint64_t expire_at, struct rb_epoll *ep)
 {
 	uint64_t now;
 
 	ep_fd_check(ep);
-	if (ep->timeout < 0)
+
+	if (errno != EINTR)
 		return 0;
-	if (ep->timeout == 0)
+	if (ep->timeout < 0)
 		return 1;
-
 	now = now_ms();
-	if (now > expire_at)
-		return 1;
-	ep->timeout = (int)(expire_at - now);
-	return 0;
+	ep->timeout = now > expire_at ? 0 : (int)(expire_at - now);
+	return 1;
 }
 
 #if defined(HAVE_RB_THREAD_BLOCKING_REGION)
@@ -350,9 +348,9 @@ static VALUE real_epwait(struct rb_epoll *ep)
 	int n;
 	uint64_t expire_at = ep->timeout > 0 ? now_ms() + ep->timeout : 0;
 
-	do {
+	do
 		n = (int)rb_sp_fd_region(nogvl_wait, ep, ep->fd);
-	} while (n == -1 && errno == EINTR && ! epoll_expired_p(expire_at, ep));
+	while (n == -1 && epoll_resume_p(expire_at, ep));
 
 	return epwait_result(ep, n);
 }

data/test/test_epoll.rb

@@ -139,6 +139,7 @@ class TestEpoll < Test::Unit::TestCase
     pid = fork do
       sleep 0.5 # slightly racy :<
       Process.kill(:USR1, Process.ppid)
+      exit!(0)
     end
     time[:START_WAIT] = Time.now
     assert_nothing_raised do
@@ -397,4 +398,30 @@ class TestEpoll < Test::Unit::TestCase
     end
     assert_nil thr.value
   end if RUBY_VERSION == "1.9.3"
+
+  def test_epoll_wait_signal_torture
+    usr1 = 0
+    empty = 0
+    nr = 1000
+    @ep.add(@rd, Epoll::IN)
+    tmp = []
+    trap(:USR1) { usr1 += 1 }
+    pid = fork do
+      trap(:USR1, "DEFAULT")
+      sleep 0.1
+      ppid = Process.ppid
+      nr.times { Process.kill(:USR1, ppid); sleep 0.01 }
+      @wr.syswrite('.')
+      exit!(0)
+    end
+    while tmp.empty?
+      assert_nothing_raised { @ep.wait(nil, 100) { |flags,obj| tmp << obj } }
+      empty += 1
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?, status.inspect
+    assert usr1 > 0, "usr1: #{usr1}"
+    ensure
+      trap(:USR1, "DEFAULT")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sleepy_penguin
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - sleepy_penguin hackers