sleepy_penguin 1.3.0 → 1.3.1

data/GIT-VERSION-GEN

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

data/ext/sleepy_penguin/epoll.c

@@ -289,11 +289,15 @@ fallback_add:
 static VALUE delete(VALUE self, VALUE io)
 {
 	struct rb_epoll *ep = ep_get(self);
-	int fd = my_fileno(io);
+	int fd;
 	int rv;
 	VALUE cur_io;
 
 	ep_check(ep);
+	if (my_io_closed(io))
+		goto out;
+
+	fd = my_fileno(io);
 	cur_io = rb_ary_entry(ep->marks, fd);
 	if (NIL_P(cur_io) || my_io_closed(cur_io))
 		return Qnil;
@@ -308,6 +312,7 @@ static VALUE delete(VALUE self, VALUE io)
 			rb_sys_fail("epoll_ctl - del");
 		}
 	}
+out:
 	rb_ary_store(ep->marks, fd, Qnil);
 	rb_ary_store(ep->flag_cache, fd, Qnil);
 

data/ext/sleepy_penguin/sleepy_penguin.h

@@ -26,18 +26,37 @@
 #  endif
 #endif
 
+static int fixint_closed_p(VALUE io)
+{
+	return (fcntl(FIX2INT(io), F_GETFD) == -1 && errno == EBADF);
+}
+
 #if defined(RFILE) && defined(HAVE_ST_FD)
-static int my_io_closed(VALUE io)
+static int my_rb_io_closed(VALUE io)
 {
 	return RFILE(io)->fptr->fd < 0;
 }
 #else
-static int my_io_closed(VALUE io)
+static int my_rb_io_closed(VALUE io)
 {
 	return rb_funcall(io, rb_intern("closed?"), 0) == Qtrue;
 }
 #endif
 
+static int my_io_closed(VALUE io)
+{
+	switch (TYPE(io)) {
+	case T_FIXNUM:
+		return fixint_closed_p(io);
+	case T_FILE:
+		break;
+	default:
+		io = rb_convert_type(io, T_FILE, "IO", "to_io");
+	}
+
+	return my_rb_io_closed(io);
+}
+
 static int my_fileno(VALUE io)
 {
 	rb_io_t *fptr;

data/lib/sleepy_penguin.rb

@@ -1,7 +1,7 @@
 # -*- encoding: binary -*-
 module SleepyPenguin
 
-  # the version of sleepy_penguin, currently 1.3.0
-  SLEEPY_PENGUIN_VERSION = '1.3.0'
+  # the version of sleepy_penguin, currently 1.3.1
+  SLEEPY_PENGUIN_VERSION = '1.3.1'
 end
 require 'sleepy_penguin_ext'

data/test/test_epoll_optimizations.rb

@@ -83,6 +83,30 @@ class TestEpollOptimizations < Test::Unit::TestCase
     assert_equal 0, lines.grep(/^epoll_ctl/).size
   end
 
+  def test_delete_closed_proxy
+    obj = Struct.new(:to_io).new(@wr)
+    rv = nil
+    @ep.add(obj, Epoll::OUT)
+    @wr.close
+    io, err = Strace.me { rv = @ep.delete(obj) }
+    lines = io.readlines; io.close
+    assert_nil err
+    assert_equal obj, rv
+    assert_equal 0, lines.grep(/^epoll_ctl/).size
+  end
+
+  def test_delete_closed_fileno
+    fileno = @wr.fileno
+    @ep.add(fileno, Epoll::OUT)
+    @wr.close
+    rv = nil
+    io, err = Strace.me { rv = @ep.delete(fileno) }
+    lines = io.readlines; io.close
+    assert_nil err
+    assert_equal fileno, rv
+    assert_equal 0, lines.grep(/^epoll_ctl/).size
+  end
+
   def test_delete_aliased_a
     tmp = IO.for_fd @wr.fileno
     IO_PURGATORY << tmp

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sleepy_penguin
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - sleepy_penguin hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +00:00
+date: 2011-01-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency