sleepy_penguin 2.0.0 → 3.0.0

data/.document

@@ -4,7 +4,6 @@ TODO
 NEWS
 ChangeLog
 lib
-ext/sleepy_penguin/init.c
 ext/sleepy_penguin/epoll.c
 ext/sleepy_penguin/eventfd.c
 ext/sleepy_penguin/init.c

data/GIT-VERSION-GEN

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

data/ext/sleepy_penguin/epoll.c

@@ -1,13 +1,14 @@
 #include "sleepy_penguin.h"
 #include <sys/epoll.h>
 #include <pthread.h>
+#include <time.h>
 #include "missing_epoll.h"
 #ifdef HAVE_RUBY_ST_H
 #  include <ruby/st.h>
 #else
 #  include <st.h>
 #endif
-
+#include "missing_rb_thread_fd_close.h"
 #define EP_RECREATE (-2)
 
 static st_table *active;
@@ -15,6 +16,15 @@ static const int step = 64; /* unlikely to grow unless you're huge */
 static VALUE cEpoll_IO;
 static ID id_for_fd;
 
+static uint64_t now_ms(void)
+{
+	struct timespec now;
+
+	clock_gettime(CLOCK_MONOTONIC, &now);
+
+	return now.tv_sec * 1000 + (now.tv_nsec + 500000) / 1000000;
+}
+
 static void pack_event_data(struct epoll_event *event, VALUE obj)
 {
 	event->data.ptr = (void *)obj;
@@ -65,7 +75,7 @@ static void gcfree(void *ptr)
 		st_delete(active, &key, NULL);
 	}
 	if (NIL_P(ep->io) && ep->fd >= 0) {
-		/* can't raise during GC */
+		/* can't raise during GC, and close() never fails in Linux */
 		(void)close(ep->fd);
 		errno = 0;
 	}
@@ -108,12 +118,18 @@ static void my_epoll_create(struct rb_epoll *ep)
 	ep->flag_cache = rb_ary_new();
 }
 
+static int ep_fd_check(struct rb_epoll *ep)
+{
+	if (ep->fd == -1)
+		rb_raise(rb_eIOError, "closed epoll descriptor");
+	return 1;
+}
+
 static void ep_check(struct rb_epoll *ep)
 {
 	if (ep->fd == EP_RECREATE)
 		my_epoll_create(ep);
-	if (ep->fd == -1)
-		rb_raise(rb_eIOError, "closed");
+	ep_fd_check(ep);
 	assert(TYPE(ep->marks) == T_ARRAY && "marks not initialized");
 	assert(TYPE(ep->flag_cache) == T_ARRAY && "flag_cache not initialized");
 }
@@ -303,6 +319,23 @@ 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)
+{
+	uint64_t now;
+
+	ep_fd_check(ep);
+	if (ep->timeout < 0)
+		return 0;
+	if (ep->timeout == 0)
+		return 1;
+
+	now = now_ms();
+	if (now > expire_at)
+		return 1;
+	ep->timeout = (int)(expire_at - now);
+	return 0;
+}
+
 #if defined(HAVE_RB_THREAD_BLOCKING_REGION)
 static VALUE nogvl_wait(void *args)
 {
@@ -314,7 +347,12 @@ static VALUE nogvl_wait(void *args)
 
 static VALUE real_epwait(struct rb_epoll *ep)
 {
-	int n = (int)rb_sp_io_region(nogvl_wait, ep);
+	int n;
+	uint64_t expire_at = ep->timeout > 0 ? now_ms() + ep->timeout : 0;
+
+	do {
+		n = (int)rb_sp_fd_region(nogvl_wait, ep, ep->fd);
+	} while (n == -1 && errno == EINTR && ! epoll_expired_p(expire_at, ep));
 
 	return epwait_result(ep, n);
 }
@@ -343,9 +381,11 @@ static int safe_epoll_wait(struct rb_epoll *ep)
 {
 	int n;
 
-	TRAP_BEG;
-	n = epoll_wait(ep->fd, ep->events, ep->maxevents, 0);
-	TRAP_END;
+	do {
+		TRAP_BEG;
+		n = epoll_wait(ep->fd, ep->events, ep->maxevents, 0);
+		TRAP_END;
+	} while (n == -1 && errno == EINTR && ep_fd_check(ep));
 
 	return n;
 }
@@ -515,15 +555,18 @@ static VALUE epclose(VALUE self)
 	}
 
 	if (NIL_P(ep->io)) {
+		ep_fd_check(ep);
+
 		if (ep->fd == EP_RECREATE) {
-			ep->fd = -1;
-		} else if (ep->fd == -1) {
-			rb_raise(rb_eIOError, "closed");
+			ep->fd = -1; /* success */
 		} else {
-			int e = close(ep->fd);
+			int err;
+			int fd = ep->fd;
 
 			ep->fd = -1;
-			if (e == -1)
+			rb_thread_fd_close(fd);
+			err = close(fd);
+			if (err == -1)
 				rb_sys_fail("close");
 		}
 	} else {
@@ -599,6 +642,15 @@ static VALUE init_copy(VALUE copy, VALUE orig)
 	return copy;
 }
 
+/* occasionally it's still useful to lookup aliased IO objects
+ * based on for debugging */
+static int my_fileno(VALUE obj)
+{
+	if (T_FIXNUM == TYPE(obj))
+		return FIX2INT(obj);
+	return rb_sp_fileno(obj);
+}
+
 /*
  * call-seq:
  *	epoll.io_for(io)	-> object
@@ -611,7 +663,7 @@ static VALUE io_for(VALUE self, VALUE obj)
 {
 	struct rb_epoll *ep = ep_get(self);
 
-	return rb_ary_entry(ep->marks, rb_sp_fileno(obj));
+	return rb_ary_entry(ep->marks, my_fileno(obj));
 }
 
 /*
@@ -625,7 +677,7 @@ static VALUE flags_for(VALUE self, VALUE obj)
 {
 	struct rb_epoll *ep = ep_get(self);
 
-	return rb_ary_entry(ep->flag_cache, rb_sp_fileno(obj));
+	return rb_ary_entry(ep->flag_cache, my_fileno(obj));
 }
 
 /*
@@ -640,7 +692,7 @@ static VALUE include_p(VALUE self, VALUE obj)
 {
 	struct rb_epoll *ep = ep_get(self);
 
-	return NIL_P(rb_ary_entry(ep->marks, rb_sp_fileno(obj))) ? Qfalse : Qtrue;
+	return NIL_P(rb_ary_entry(ep->marks, my_fileno(obj))) ? Qfalse : Qtrue;
 }
 
 /*
@@ -713,8 +765,8 @@ void sleepy_penguin_init_epoll(void)
 	 * Document-class: SleepyPenguin::Epoll::IO
 	 *
 	 * Epoll::IO is an internal class.  Its only purpose is to be
-	 * compatible with IO.select and related methods  and should not
-	 * be used directly, use Epoll instead.
+	 * compatible with IO.select and related methods and should
+	 * never be used directly, use Epoll instead.
 	 */
 	cEpoll_IO = rb_define_class_under(cEpoll, "IO", rb_cIO);
 	rb_define_method(cEpoll, "initialize", init, -1);

data/ext/sleepy_penguin/eventfd.c

@@ -1,7 +1,6 @@
 #ifdef HAVE_SYS_EVENTFD_H
 #include "sleepy_penguin.h"
 #include <sys/eventfd.h>
-static ID id_for_fd;
 
 /*
  * call-seq:
@@ -21,7 +20,7 @@ static ID id_for_fd;
  */
 static VALUE s_new(int argc, VALUE *argv, VALUE klass)
 {
-	VALUE _initval, _flags;
+	VALUE _initval, _flags, rv;
 	unsigned initval;
 	int flags;
 	int fd;
@@ -40,7 +39,8 @@ static VALUE s_new(int argc, VALUE *argv, VALUE klass)
 			rb_sys_fail("eventfd");
 	}
 
-	return rb_funcall(klass, id_for_fd, 1, INT2NUM(fd));
+	rv = INT2FIX(fd);
+	return rb_call_super(1, &rv);
 }
 
 struct efd_args {
@@ -87,7 +87,7 @@ static VALUE incr(int argc, VALUE *argv, VALUE self)
 	RTEST(nonblock) ? rb_sp_set_nonblock(x.fd) : blocking_io_prepare(x.fd);
 	x.val = (uint64_t)NUM2ULL(value);
 retry:
-	w = (ssize_t)rb_sp_io_region(efd_write, &x);
+	w = (ssize_t)rb_sp_fd_region(efd_write, &x, x.fd);
 	if (w == -1) {
 		if (errno == EAGAIN && RTEST(nonblock))
 			return Qfalse;
@@ -113,7 +113,7 @@ retry:
  * the counter becomes non-zero unless +nonblock+ is +true+, in which
  * case it returns +nil+.
  */
-static VALUE getvalue(int argc, VALUE argv, VALUE self)
+static VALUE getvalue(int argc, VALUE *argv, VALUE self)
 {
 	struct efd_args x;
 	ssize_t w;
@@ -123,11 +123,11 @@ static VALUE getvalue(int argc, VALUE argv, VALUE self)
 	x.fd = rb_sp_fileno(self);
 	RTEST(nonblock) ? rb_sp_set_nonblock(x.fd) : blocking_io_prepare(x.fd);
 retry:
-	w = (ssize_t)rb_sp_io_region(efd_read, &x);
+	w = (ssize_t)rb_sp_fd_region(efd_read, &x, x.fd);
 	if (w == -1) {
 		if (errno == EAGAIN && RTEST(nonblock))
 			return Qnil;
-		if (rb_io_wait_readable(x.fd))
+		if (rb_io_wait_readable(x.fd = rb_sp_fileno(self)))
 			goto retry;
 		rb_sys_fail("read(eventfd)");
 	}
@@ -157,7 +157,7 @@ void sleepy_penguin_init_eventfd(void)
 	 * the maximum value that may be stored in an EventFD,
 	 * currently 0xfffffffffffffffe
 	 */
-	rb_define_const(cEventFD, "MAX", ULL2NUM(0xfffffffffffffffe));
+	rb_define_const(cEventFD, "MAX", ULL2NUM(0xfffffffffffffffeULL));
 
 #ifdef EFD_NONBLOCK
 	NODOC_CONST(cEventFD, "NONBLOCK", INT2NUM(EFD_NONBLOCK));
@@ -170,6 +170,5 @@ void sleepy_penguin_init_eventfd(void)
 #endif
 	rb_define_method(cEventFD, "value", getvalue, -1);
 	rb_define_method(cEventFD, "incr", incr, -1);
-	id_for_fd = rb_intern("for_fd");
 }
 #endif /* HAVE_SYS_EVENTFD_H */

data/ext/sleepy_penguin/extconf.rb

@@ -7,9 +7,9 @@ have_header('sys/timerfd.h')
 have_header('sys/inotify.h')
 have_header('sys/signalfd.h')
 have_header('ruby/io.h') and have_struct_member('rb_io_t', 'fd', 'ruby/io.h')
-have_func('rb_memerror') or abort 'need rb_memerror()'
-have_func('rb_io_close') or abort 'need rb_io_close()'
 have_func('epoll_create1', %w(sys/epoll.h))
 have_func('rb_thread_blocking_region')
+have_func('rb_thread_io_blocking_region')
+have_func('rb_thread_fd_close')
 have_library('pthread')
 create_makefile('sleepy_penguin_ext')

data/ext/sleepy_penguin/inotify.c

@@ -3,12 +3,8 @@
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
 #include "missing_inotify.h"
-#if defined(RFILE) && defined(HAVE_ST_FD) && \
-    defined(HAVE_RB_THREAD_BLOCKING_REGION)
-#  define NOGVL_CLOSE
-#endif
 
-static ID id_for_fd, id_inotify_buf, id_inotify_tmp, id_mask;
+static ID id_inotify_buf, id_inotify_tmp, id_mask;
 static VALUE cEvent, checks;
 
 /*
@@ -38,7 +34,8 @@ static VALUE s_new(int argc, VALUE *argv, VALUE klass)
 			rb_sys_fail("inotify_init1");
 	}
 
-	rv = rb_funcall(klass, id_for_fd, 1, INT2NUM(fd));
+	rv = INT2FIX(fd);
+	rv = rb_call_super(1, &rv);
 	rb_ivar_set(rv, id_inotify_buf, rb_str_new(0, 128));
 	rb_ivar_set(rv, id_inotify_tmp, rb_ary_new());
 
@@ -184,7 +181,7 @@ static VALUE take(int argc, VALUE *argv, VALUE self)
 	else
 		blocking_io_prepare(args.fd);
 	do {
-		r = rb_sp_io_region(inread, &args);
+		r = rb_sp_fd_region(inread, &args, args.fd);
 		if (r == 0 /* Linux < 2.6.21 */
 		    ||
 		    (r < 0 && errno == EINVAL) /* Linux >= 2.6.21 */
@@ -202,6 +199,7 @@ static VALUE take(int argc, VALUE *argv, VALUE self)
 			if (errno == EAGAIN && RTEST(nonblock)) {
 				return Qnil;
 			} else {
+				args.fd = rb_sp_fileno(self);
 				if (!rb_io_wait_readable(args.fd))
 					rb_sys_fail("read(inotify)");
 			}
@@ -260,9 +258,7 @@ static VALUE events(VALUE self)
  */
 static VALUE init_copy(VALUE dest, VALUE orig)
 {
-	VALUE tmp;
-
-	dest = rb_call_super(1, &orig); /* copy all other ivars as-is */
+	rb_call_super(1, &orig); /* copy all other ivars as-is */
 	rb_ivar_set(dest, id_inotify_buf, rb_str_new(0, 128));
 
 	return dest;
@@ -284,36 +280,6 @@ static VALUE each(VALUE self)
 	return self;
 }
 
-#if defined(NOGVL_CLOSE)
-static VALUE fptr_close(void *ptr)
-{
-	rb_io_t *fptr = ptr;
-	return (VALUE)close(fptr->fd);
-}
-
-/*
- * call-seq:
- *	ino.close	-> nil
- *
- * Closes the underlying file descriptor and releases resources used by the
- * kernel.  Unlike other file descriptors, Inotify descriptors can take
- * a long time to close(2).  Calling this explicitly releases the GVL under
- * Ruby 1.9
- */
-static VALUE nogvl_close(VALUE self)
-{
-	rb_io_t *fptr;
-
-	GetOpenFile(self, fptr);
-
-	if ((int)rb_sp_io_region(fptr_close, fptr) < 0)
-		rb_sys_fail("close(inotify)");
-	fptr->fd = -1;
-
-	return Qnil;
-}
-#endif /* NOGVL_CLOSE */
-
 void sleepy_penguin_init_inotify(void)
 {
 	VALUE mSleepyPenguin, cInotify;
@@ -346,9 +312,6 @@ void sleepy_penguin_init_inotify(void)
 	rb_define_method(cInotify, "initialize_copy", init_copy, 1);
 	rb_define_method(cInotify, "take", take, -1);
 	rb_define_method(cInotify, "each", each, 0);
-#ifdef NOGVL_CLOSE
-	rb_define_method(cInotify, "close", nogvl_close, 0);
-#endif
 
 	/*
 	 * Document-class: SleepyPenguin::Inotify::Event
@@ -376,7 +339,6 @@ void sleepy_penguin_init_inotify(void)
 	cEvent = rb_define_class_under(cInotify, "Event", cEvent);
 	rb_define_method(cEvent, "events", events, 0);
 	rb_define_singleton_method(cInotify, "new", s_new, -1);
-	id_for_fd = rb_intern("for_fd");
 	id_inotify_buf = rb_intern("@inotify_buf");
 	id_inotify_tmp = rb_intern("@inotify_tmp");
 	id_mask = rb_intern("mask");

data/ext/sleepy_penguin/missing_rb_thread_fd_close.h

@@ -0,0 +1,4 @@
+#ifndef HAVE_RB_THREAD_FD_CLOSE
+#define HAVE_RB_THREAD_FD_CLOSE
+#  define rb_thread_fd_close(fd) for (;0;)
+#endif

data/ext/sleepy_penguin/signalfd.c

@@ -2,7 +2,7 @@
 #include "sleepy_penguin.h"
 #include <signal.h>
 #include <sys/signalfd.h>
-static ID id_for_fd, id_list;
+static ID id_list;
 static VALUE ssi_members;
 static VALUE cSigInfo;
 
@@ -123,7 +123,7 @@ static VALUE update_bang(int argc, VALUE *argv, VALUE self)
  */
 static VALUE s_new(int argc, VALUE *argv, VALUE klass)
 {
-	VALUE vmask, vflags;
+	VALUE vmask, vflags, rv;
 	sigset_t mask;
 	int flags;
 	int fd;
@@ -142,7 +142,9 @@ static VALUE s_new(int argc, VALUE *argv, VALUE klass)
 			rb_sys_fail("signalfd");
 	}
 
-	return rb_funcall(klass, id_for_fd, 1, INT2NUM(fd));
+
+	rv = INT2FIX(fd);
+	return rb_call_super(1, &rv);
 }
 
 static VALUE ssi_alloc(VALUE klass)
@@ -193,11 +195,11 @@ static VALUE sfd_take(int argc, VALUE *argv, VALUE self)
 		blocking_io_prepare(fd);
 retry:
 	ssi->ssi_fd = fd;
-	r = (ssize_t)rb_sp_io_region(sfd_read, ssi);
+	r = (ssize_t)rb_sp_fd_region(sfd_read, ssi, fd);
 	if (r == -1) {
 		if (errno == EAGAIN && RTEST(nonblock))
 			return Qnil;
-		if (rb_io_wait_readable(fd))
+		if (rb_io_wait_readable(fd = rb_sp_fileno(self)))
 			goto retry;
 		rb_sys_fail("read(signalfd)");
 	}
@@ -238,6 +240,9 @@ void sleepy_penguin_init_signalfd(void)
 	/*
 	 * Document-class: SleepyPenguin::SignalFD
 	 *
+	 * Use of this class is NOT recommended.  Ruby itself has a great
+	 * signal handling API and its implementation conflicts with this.
+	 *
 	 * A SignalFD is an IO object for accepting signals.  It provides
 	 * an alternative to Signal.trap that may be monitored using
 	 * IO.select or Epoll.
@@ -290,7 +295,6 @@ void sleepy_penguin_init_signalfd(void)
 
 	rb_define_method(cSignalFD, "take", sfd_take, -1);
 	rb_define_method(cSignalFD, "update!", update_bang, -1);
-	id_for_fd = rb_intern("for_fd");
 	ssi_members = rb_ary_new();
 
 	NODOC_CONST(cSigInfo, "MEMBERS", ssi_members);

data/ext/sleepy_penguin/sleepy_penguin.h

@@ -30,6 +30,13 @@ VALUE rb_sp_io_region(rb_blocking_function_t *func, void *data);
 #  define blocking_io_prepare(fd) rb_sp_set_nonblock((fd))
 #endif
 
+#ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
+#  define rb_sp_fd_region(fn,data,fd) \
+          rb_thread_io_blocking_region((fn),(data),(fd))
+#else
+#  define rb_sp_fd_region(fn,data,fd) rb_sp_io_region(fn,data)
+#endif
+
 #define NODOC_CONST(klass,name,value) \
   rb_define_const((klass),(name),(value))
 #endif /* SLEEPY_PENGUIN_H */

data/ext/sleepy_penguin/timerfd.c

@@ -2,7 +2,6 @@
 #include "sleepy_penguin.h"
 #include <sys/timerfd.h>
 #include "value2timespec.h"
-static ID id_for_fd;
 
 /*
  * call-seq:
@@ -22,7 +21,7 @@ static ID id_for_fd;
  */
 static VALUE s_new(int argc, VALUE *argv, VALUE klass)
 {
-	VALUE cid, fl;
+	VALUE cid, fl, rv;
 	int clockid, flags;
 	int fd;
 
@@ -40,7 +39,8 @@ static VALUE s_new(int argc, VALUE *argv, VALUE klass)
 			rb_sys_fail("timerfd_create");
 	}
 
-	return rb_funcall(klass, id_for_fd, 1, INT2NUM(fd));
+	rv = INT2FIX(fd);
+	return rb_call_super(1, &rv);
 }
 
 static VALUE itimerspec2ary(struct itimerspec *its)
@@ -125,11 +125,11 @@ static VALUE expirations(int argc, VALUE *argv, VALUE self)
 	else
 		blocking_io_prepare(fd);
 retry:
-	r = (ssize_t)rb_sp_io_region(tfd_read, &buf);
+	r = (ssize_t)rb_sp_fd_region(tfd_read, &buf, fd);
 	if (r == -1) {
 		if (errno == EAGAIN && RTEST(nonblock))
 			return Qnil;
-		if (rb_io_wait_readable(fd))
+		if (rb_io_wait_readable(fd = rb_sp_fileno(self)))
 			goto retry;
 		rb_sys_fail("read(timerfd)");
 	}
@@ -165,6 +165,5 @@ void sleepy_penguin_init_timerfd(void)
 	rb_define_method(cTimerFD, "settime", settime, 3);
 	rb_define_method(cTimerFD, "gettime", gettime, 0);
 	rb_define_method(cTimerFD, "expirations", expirations, -1);
-	id_for_fd = rb_intern("for_fd");
 }
 #endif /* HAVE_SYS_TIMERFD_H */

data/ext/sleepy_penguin/util.c

@@ -110,12 +110,6 @@ int rb_sp_fileno(VALUE io)
 {
 	rb_io_t *fptr;
 
-	switch (TYPE(io)) {
-	case T_FIXNUM: return FIX2INT(io);
-	case T_FILE:
-		GetOpenFile(io, fptr);
-		return FPTR_TO_FD(fptr);
-	}
 	io = rb_convert_type(io, T_FILE, "IO", "to_io");
 	GetOpenFile(io, fptr);
 	return FPTR_TO_FD(fptr);

data/pkg.mk

@@ -44,6 +44,8 @@ $(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile
 	$(MAKE) -C $(@D)
 lib := $(lib):$(ext_pfx)/$(ext)
 build: $(ext_dl)
+else
+build:
 endif
 
 pkg_extra += GIT-VERSION-FILE NEWS ChangeLog LATEST
@@ -67,7 +69,7 @@ doc:: .document .wrongdoc.yml $(pkg_extra)
 	$(RM) -r doc
 	$(WRONGDOC) all
 	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
+	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 pkggem := pkg/$(rfpackage)-$(VERSION).gem
@@ -145,7 +147,7 @@ test_units := $(wildcard test/test_*.rb)
 test: test-unit
 test-unit: $(test_units)
 $(test_units): build
-	$(RUBY) -I $(lib) $@
+	$(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS)
 
 # this requires GNU coreutils variants
 ifneq ($(RSYNC_DEST),)
@@ -165,5 +167,9 @@ doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+check-warnings:
+	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
+	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
 .PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+.PHONY: check-warnings

data/test/test_epoll.rb

@@ -63,7 +63,7 @@ class TestEpoll < Test::Unit::TestCase
       exit!(1)
     }
     res = Process.waitall
-    res.each { |(pid,status)| assert status.success? }
+    res.each { |(_,status)| assert status.success? }
   end
 
   def test_tcp_connect_nonblock_edge
@@ -127,28 +127,33 @@ class TestEpoll < Test::Unit::TestCase
     assert_equal 2, tmp.size
   end
 
-  def test_signal_safe
+  def test_signal_safe_wait_forever
     time = {}
-    trap(:USR1) { time[:USR1] = Time.now; sleep 0.1; @wr.write '.' }
+    trap(:USR1) do
+      time[:USR1] = Time.now
+      sleep 0.5
+      @wr.write '.'
+    end
     @ep.add @rd, Epoll::IN
     tmp = []
     pid = fork do
-      sleep 0.1 # slightly racy :<
+      sleep 0.5 # slightly racy :<
       Process.kill(:USR1, Process.ppid)
     end
     time[:START_WAIT] = Time.now
-    begin
-      @ep.wait { |flags, obj| tmp << [ flags, obj ]; time[:EP] = Time.now }
-    rescue Errno::EINTR
-      retry
+    assert_nothing_raised do
+      @ep.wait do |flags, obj|
+        tmp << [ flags, obj ]
+        time[:EP] = Time.now
+      end
     end
     assert_equal([[Epoll::IN, @rd]], tmp)
     _, status = Process.waitpid2(pid)
-    assert status.success?
-    assert((time[:USR1] - time[:START_WAIT]) >= 0.1)
-    assert((time[:USR1] - time[:START_WAIT]) < 0.15)
-    assert((time[:EP] - time[:USR1]) >= 0.1)
-    assert((time[:EP] - time[:USR1]) < 0.15)
+    assert status.success?, status.inspect
+    usr1_delay = time[:USR1] - time[:START_WAIT]
+    assert_in_delta(0.5, usr1_delay, 0.1, "usr1_delay=#{usr1_delay}")
+    ep_delay = time[:EP] - time[:USR1]
+    assert_in_delta(0.5, ep_delay, 0.1, "ep1_delay=#{ep_delay}")
     ensure
       trap(:USR1, 'DEFAULT')
   end unless RBX
@@ -212,7 +217,7 @@ class TestEpoll < Test::Unit::TestCase
     assert_nothing_raised do
       4096.times do
         ep = Epoll.new
-        io = ep.to_io
+        assert_kind_of IO, ep.to_io
       end
     end
     assert ! @ep.closed?
@@ -295,7 +300,6 @@ class TestEpoll < Test::Unit::TestCase
       break
     end while true
     @ep.add(@wr, Epoll::OUT | Epoll::IN)
-    i = 0
     assert_equal 0, @ep.wait(nil, 0) { |flags,event| assert false }
   end
 
@@ -384,4 +388,13 @@ class TestEpoll < Test::Unit::TestCase
     assert ! @ep.include?(@wr)
     assert ! @ep.include?(@wr.fileno)
   end
+
+  def test_cross_thread_close
+    tmp = []
+    thr = Thread.new { sleep(1); @ep.close }
+    assert_raises(IOError) do
+      @ep.wait { |flags, obj| tmp << [ flags, obj ] }
+    end
+    assert_nil thr.value
+  end if RUBY_VERSION == "1.9.3"
 end

data/test/test_epoll_gc.rb

@@ -21,7 +21,7 @@ class TestEpollGC < Test::Unit::TestCase
 
   def add_pipe(m, depth = 0)
     if depth > 6000
-      rd, wr = IO.pipe
+      _, wr = IO.pipe
       warn "wr: #{wr.fileno}"
       @ep.__send__(m, wr, Epoll::OUT)
     else

data/test/test_epoll_optimizations.rb

@@ -29,19 +29,19 @@ class TestEpollOptimizations < Test::Unit::TestCase
     assert_nil err
     lines = io.readlines; io.close
     assert_equal 1, lines.grep(/^epoll_ctl/).size
-    assert_match /EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0]
+    assert_match(/EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0])
 
     io, err = Strace.me { @ep.set(@wr, Epoll::OUT | Epoll::ONESHOT) }
     assert_nil err
     lines = io.readlines; io.close
     assert_equal 1, lines.grep(/^epoll_ctl/).size
-    assert_match /EPOLL_CTL_MOD/, lines.grep(/^epoll_ctl/)[0]
+    assert_match(/EPOLL_CTL_MOD/, lines.grep(/^epoll_ctl/)[0])
 
     io, err = Strace.me { @ep.set(@wr, Epoll::OUT) }
     assert_nil err
     lines = io.readlines; io.close
     assert_equal 1, lines.grep(/^epoll_ctl/).size
-    assert_match /EPOLL_CTL_MOD/, lines.grep(/^epoll_ctl/)[0]
+    assert_match(/EPOLL_CTL_MOD/, lines.grep(/^epoll_ctl/)[0])
     @wr.close
     @rd.close
 
@@ -50,7 +50,7 @@ class TestEpollOptimizations < Test::Unit::TestCase
     assert_nil err
     lines = io.readlines; io.close
     assert_equal 1, lines.grep(/^epoll_ctl/).size
-    assert_match /EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0]
+    assert_match(/EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0])
   end
 
   def test_delete
@@ -61,7 +61,7 @@ class TestEpollOptimizations < Test::Unit::TestCase
     assert_nil err
     lines = io.readlines; io.close
     assert_equal 1, lines.grep(/^epoll_ctl/).size
-    assert_match %r{=\s+0$}, lines.grep(/^epoll_ctl/)[0]
+    assert_match(%r{=\s+0$}, lines.grep(/^epoll_ctl/)[0])
 
     rv = true
     io, err = Strace.me { rv = @ep.delete(@wr) }
@@ -98,18 +98,6 @@ class TestEpollOptimizations < Test::Unit::TestCase
     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
@@ -134,7 +122,7 @@ class TestEpollOptimizations < Test::Unit::TestCase
     assert_equal tmp, rv
     assert_nil err
     assert_equal 1, lines.grep(/^epoll_ctl/).size
-    assert_match %r{=\s+0$}, lines.grep(/^epoll_ctl/)[0]
+    assert_match(%r{=\s+0$}, lines.grep(/^epoll_ctl/)[0])
     assert_equal 0, lines.grep(/ENOENT/).size
   end
 

data/test/test_inotify.rb

@@ -36,7 +36,7 @@ class TestInotify < Test::Unit::TestCase
     assert a.fileno != b.fileno
     abuf = a.instance_variable_get(:@inotify_buf)
     bbuf = b.instance_variable_get(:@inotify_buf)
-    assert abuf.object_id != bbuf.object_id
+    assert abuf.object_id != bbuf.object_id, "#{a.inspect} #{b.inspect}"
 
     atmp = a.instance_variable_get(:@inotify_tmp)
     btmp = b.instance_variable_get(:@inotify_tmp)
@@ -115,27 +115,4 @@ class TestInotify < Test::Unit::TestCase
     end
     assert_equal 0, nr
   end
-
-  def test_close_threadable
-    ino = Inotify.new
-    tmp = []
-    thr = Thread.new do
-      until ino.closed?
-        tmp << Time.now
-        Thread.pass
-      end
-    end
-    t0 = Time.now
-    ino.close
-    t1 = Time.now
-    between = []
-    thr.join
-    tmp.each do |t|
-      if t > t0 && t < t1
-        between << t
-      end
-    end
-    assert tmp.size > 0, "tmp.size=#{tmp.size}"
-    assert between.size > 0, "between.size=#{between.size}"
-  end if RUBY_VERSION.to_f >= 1.9
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sleepy_penguin
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
-  - 2
+  - 3
   - 0
   - 0
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors: 
 - sleepy_penguin hackers
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +00:00
-default_executable: 
+date: 2011-05-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wrongdoc
@@ -66,9 +65,9 @@ extra_rdoc_files:
 - lib/sleepy_penguin.rb
 - lib/sleepy_penguin/signalfd/sig_info.rb
 - lib/sleepy_penguin/sp.rb
-- ext/sleepy_penguin/init.c
 - ext/sleepy_penguin/epoll.c
 - ext/sleepy_penguin/eventfd.c
+- ext/sleepy_penguin/init.c
 - ext/sleepy_penguin/inotify.c
 - ext/sleepy_penguin/signalfd.c
 - ext/sleepy_penguin/timerfd.c
@@ -95,6 +94,7 @@ files:
 - ext/sleepy_penguin/inotify.c
 - ext/sleepy_penguin/missing_epoll.h
 - ext/sleepy_penguin/missing_inotify.h
+- ext/sleepy_penguin/missing_rb_thread_fd_close.h
 - ext/sleepy_penguin/signalfd.c
 - ext/sleepy_penguin/sleepy_penguin.h
 - ext/sleepy_penguin/timerfd.c
@@ -114,7 +114,6 @@ files:
 - test/test_signalfd.rb
 - test/test_signalfd_siginfo.rb
 - test/test_timerfd.rb
-has_rdoc: true
 homepage: http://bogomips.org/sleepy_penguin/
 licenses: []
 
@@ -148,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.6.1
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Linux I/O events for Ruby