sleepy_penguin 1.3.1 → 1.4.0

data/.manifest

@@ -17,6 +17,7 @@ ext/sleepy_penguin/epoll.c
 ext/sleepy_penguin/eventfd.c
 ext/sleepy_penguin/extconf.rb
 ext/sleepy_penguin/init.c
+ext/sleepy_penguin/inotify.c
 ext/sleepy_penguin/nonblock.h
 ext/sleepy_penguin/sleepy_penguin.h
 ext/sleepy_penguin/timerfd.c
@@ -30,4 +31,5 @@ test/test_epoll.rb
 test/test_epoll_gc.rb
 test/test_epoll_optimizations.rb
 test/test_eventfd.rb
+test/test_inotify.rb
 test/test_timerfd.rb

data/ChangeLog

@@ -1,5 +1,124 @@
 ChangeLog from http://bogomips.org/sleepy_penguin.git
 
+   commit bba86c017d101c365c5a22b8e2b734ff7216ce56
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Feb 4 22:24:59 2011 +0000
+   
+       sleepy_penguin 1.4.0 - Linux I/O events for Ruby
+       
+       * Epoll#wait: do not automatically retry on EINTR
+       * preliminary Inotify support
+       * Epoll.new no longer defaults to close-on-exec
+       
+       TODO: FANotify + SignalFD
+   
+   commit 4465548dd80cf779af53bbfee133f0be5f8f2791
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Feb 4 22:23:12 2011 +0000
+   
+       TODO: update with fanotify item
+       
+       The fscking all notification system!
+   
+   commit 6b54faf7d855b7d9eb45bf437b022e2774f39826
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Feb 4 22:19:23 2011 +0000
+   
+       bump wrongdoc dependency
+       
+       wrongdoc 1.5 is nicer
+   
+   commit 67fa5292823f4c38a35dd83c4948441ce8438d40
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Feb 4 22:16:07 2011 +0000
+   
+       safety fix for Inotify#dup
+       
+       We do not want to share buffers between inotify descriptors.
+   
+   commit 92a666f3ff27539655e9130db16bd1587db061de
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Feb 4 22:02:25 2011 +0000
+   
+       Epoll.new does not default to close-on-exec
+       
+       No need to differ from other file descriptors, even though
+       it would be better if *all* file descriptors would default to
+       O_CLOEXEC.
+   
+   commit 6540be80d8dca8cf93e74273d04211c1a73a674e
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Feb 4 22:00:29 2011 +0000
+   
+       require rb_memerror and rb_io_close
+       
+       The latest Rubinius supports both of these as do all MRI
+   
+   commit 9f51099a6651d314d1ff5a435b6bc349d3472486
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Feb 4 21:57:45 2011 +0000
+   
+       epoll.c: safer replacement function naming
+       
+       This can avoid confusion/conflicts in case we link with newer
+       versions that have the missing symbols.
+   
+   commit 2cc41c38dc270ff764a5cc58fd81fbdacde9ff4b
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Fri Feb 4 10:58:40 2011 +0000
+   
+       preliminary inotify support
+       
+       It seems to basically work...
+   
+   commit 7812324579b430fa604905410b506e9e88fdda55
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Fri Feb 4 06:24:20 2011 +0000
+   
+       quiet build warnings for older systems
+       
+       Harmless, but still
+   
+   commit 7fbb141402974a91ff925e3f303b1bc2c698b0d4
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Fri Feb 4 06:21:07 2011 +0000
+   
+       epoll.c: fix uninitialized fd variable
+       
+       Oops :x   This changes/fixes some minor misbehavior.
+   
+   commit c02141cbfa965a19b236e4f9a09856bd2fcacca0
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Fri Feb 4 06:00:20 2011 +0000
+   
+       Epoll#wait: do not automatically retry on EINTR
+       
+       It's often used to drive event loops and EINTR should be
+       retried by the user (like IO.select and not like
+       IO#read_nonblock).
+   
+   commit 9dda070b66753e04a179e0cd36d1eff29195a7cb
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Feb 2 18:29:09 2011 -0800
+   
+       pkg.mk: use RbConfig instead of Config
+       
+       Config is deprecated
+   
+   commit fecdb9a57523cd2d38fc76fa8609388712aa075e
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Thu Jan 27 21:45:06 2011 +0000
+   
+       pkg.mk: allow WRONGDOC variable to be overriden
+       
+       This makes life easier for the wrongdoc package itself
+   
+   commit 01e7012f27109295f7cc158f561091b07b831762
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Thu Jan 27 06:18:35 2011 +0000
+   
+       pkg.mk: update in case we get rid of C ext
+   
    commit 2c3c2b788c89b1ede5445bc930dd9dbb9a658c50
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Fri Jan 21 16:51:23 2011 -0800

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 1.3.1
+GIT_VERSION = 1.4.0

data/GIT-VERSION-GEN

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

data/LATEST

@@ -1,7 +1,8 @@
-=== sleepy_penguin 1.3.1 - safety checks for delete / 2011-01-22 00:52 UTC
+=== sleepy_penguin 1.4.0 - Linux I/O events for Ruby / 2011-02-04 22:27 UTC
 
-  One bugfix for Epoll#delete:
+  * Epoll#wait: do not automatically retry on EINTR
+  * preliminary Inotify support
+  * Epoll.new no longer defaults to close-on-exec
 
-  Eric Wong (1):
-        safer closed checks for proxied objects
+  TODO: FANotify + SignalFD
 

data/NEWS

@@ -1,3 +1,11 @@
+=== sleepy_penguin 1.4.0 - Linux I/O events for Ruby / 2011-02-04 22:27 UTC
+
+  * Epoll#wait: do not automatically retry on EINTR
+  * preliminary Inotify support
+  * Epoll.new no longer defaults to close-on-exec
+
+  TODO: FANotify + SignalFD
+
 === sleepy_penguin 1.3.1 - safety checks for delete / 2011-01-22 00:52 UTC
 
   One bugfix for Epoll#delete:

data/TODO

@@ -1,3 +1,3 @@
-* SignalFD interface
+* FANotify interface
 
-* Inotify? Several libraries already support it, but it fits this project, too
+* SignalFD interface

data/ext/sleepy_penguin/epoll.c

@@ -13,21 +13,6 @@
 
 #define EP_RECREATE (-2)
 
-#ifndef HAVE_RB_MEMERROR
-static void rb_memerror(void)
-{
-	static const char e[] = "[FATAL] failed to allocate memory\n";
-	write(2, e, sizeof(e) - 1);
-	abort();
-}
-#endif
-#ifndef HAVE_RB_IO_CLOSE
-static VALUE rb_io_close(VALUE io)
-{
-	return rb_funcall(io, rb_intern("close"), 0);
-}
-#endif
-
 static st_table *active;
 static const int step = 64; /* unlikely to grow unless you're huge */
 static VALUE cEpoll_IO;
@@ -70,7 +55,7 @@ static struct rb_epoll *ep_get(VALUE self)
  * Don't worry about thread-safety since current Ruby 1.9 won't
  * call this without GVL.
  */
-static int epoll_create1(int flags)
+static int my_epoll_create1(int flags)
 {
 	int fd = epoll_create(1024); /* size ignored since 2.6.8 */
 
@@ -88,6 +73,7 @@ err:
 		return -1;
 	}
 }
+#define epoll_create1 my_epoll_create1
 #endif
 
 static void gcmark(void *ptr)
@@ -129,7 +115,7 @@ static VALUE alloc(VALUE klass)
 	ep->marks = Qnil;
 	ep->flag_cache = Qnil;
 	ep->capa = step;
-	ep->flags = EPOLL_CLOEXEC;
+	ep->flags = 0;
 	ep->events = xmalloc(sizeof(struct epoll_event) * ep->capa);
 
 	return self;
@@ -176,7 +162,7 @@ static VALUE init(int argc, VALUE *argv, VALUE self)
 
 	rb_scan_args(argc, argv, "01", &fl);
 	if (NIL_P(fl)) {
-		flags = EPOLL_CLOEXEC;
+		flags = 0;
 	} else {
 		switch (TYPE(fl)) {
 		case T_FIXNUM:
@@ -289,7 +275,7 @@ fallback_add:
 static VALUE delete(VALUE self, VALUE io)
 {
 	struct rb_epoll *ep = ep_get(self);
-	int fd;
+	int fd = my_fileno(io);
 	int rv;
 	VALUE cur_io;
 
@@ -297,7 +283,6 @@ static VALUE delete(VALUE self, VALUE io)
 	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;
@@ -355,12 +340,7 @@ static VALUE nogvl_wait(void *args)
 
 static VALUE real_epwait(struct rb_epoll *ep)
 {
-	int n;
-
-	do {
-		n = (int)rb_thread_blocking_region(nogvl_wait, ep,
-		                                   RUBY_UBF_IO, 0);
-	} while (n == -1 && errno == EINTR);
+	int n = (int)rb_thread_blocking_region(nogvl_wait, ep, RUBY_UBF_IO, 0);
 
 	return epwait_result(ep, n);
 }
@@ -403,7 +383,7 @@ static int epwait_forever(struct rb_epoll *ep)
 	do {
 		(void)rb_io_wait_readable(ep->fd);
 		n = safe_epoll_wait(ep);
-	} while (n == 0 || (n == -1 && errno == EINTR));
+	} while (n == 0);
 
 	return n;
 }
@@ -426,13 +406,7 @@ static int epwait_timed(struct rb_epoll *ep)
 		gettimeofday(&t0, NULL);
 		(void)rb_thread_select(ep->fd + 1, &rfds, NULL, NULL, &tv);
 		n = safe_epoll_wait(ep);
-
-		/*
-		 * if we got EINTR from epoll_wait /and/ timed out
-		 * just consider it a timeout and don't raise an error
-		 */
-
-		if (n > 0 || (n == -1 && errno != EINTR))
+		if (n != 0)
 			return n;
 
 		/* XXX use CLOCK_MONOTONIC if people care about 1.8... */

data/ext/sleepy_penguin/extconf.rb

@@ -4,9 +4,10 @@ have_header("pthread.h") or abort 'pthread.h not found'
 have_header('sys/eventfd.h')
 have_header('sys/signalfd.h')
 have_header('sys/timerfd.h')
+have_header('sys/inotify.h')
 have_header('ruby/io.h') and have_struct_member('rb_io_t', 'fd', 'ruby/io.h')
-have_func('rb_memerror')
-have_func('rb_io_close')
+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_library('pthread')

data/ext/sleepy_penguin/init.c

@@ -3,13 +3,19 @@ void sleepy_penguin_init_epoll(void);
 #ifdef HAVE_SYS_TIMERFD_H
 void sleepy_penguin_init_timerfd(void);
 #else
-#  define sleepy_penguin_init_timerfd() if(0)
+#  define sleepy_penguin_init_timerfd() for(;0;)
 #endif
 
 #ifdef HAVE_SYS_EVENTFD_H
 void sleepy_penguin_init_eventfd(void);
 #else
-#  define sleepy_penguin_init_eventfd() if(0)
+#  define sleepy_penguin_init_eventfd() for(;0;)
+#endif
+
+#ifdef HAVE_SYS_INOTIFY_H
+void sleepy_penguin_init_inotify(void);
+#else
+#  define sleepy_penguin_init_inotify() for(;0;)
 #endif
 
 void Init_sleepy_penguin_ext(void)
@@ -17,4 +23,5 @@ void Init_sleepy_penguin_ext(void)
 	sleepy_penguin_init_epoll();
 	sleepy_penguin_init_timerfd();
 	sleepy_penguin_init_eventfd();
+	sleepy_penguin_init_inotify();
 }

data/ext/sleepy_penguin/inotify.c

@@ -0,0 +1,293 @@
+#ifdef HAVE_SYS_INOTIFY_H
+#include "sleepy_penguin.h"
+#include "nonblock.h"
+#include <sys/inotify.h>
+#include <sys/ioctl.h>
+static ID id_for_fd, id_inotify_buf, id_inotify_tmp, id_mask;
+static VALUE cEvent, checks;
+
+#ifndef IN_CLOEXEC
+#  define IN_CLOEXEC 02000000
+#endif
+#ifndef IN_NONBLOCK
+#  define IN_NONBLOCK O_NONBLOCK
+#endif
+#ifndef IN_ATTRIB
+#  define IN_ATTRIB 0x00000004
+#endif
+#ifndef IN_ONLYDIR
+#  define IN_ONLYDIR 0x01000000
+#endif
+#ifndef IN_DONT_FOLLOW
+#  define IN_DONT_FOLLOW 0x02000000
+#endif
+#ifndef IN_EXCL_UNLINK
+#  define IN_EXCL_UNLINK 0x04000000
+#endif
+#ifndef IN_MASK_ADD
+#  define IN_MASK_ADD 0x20000000
+#endif
+#ifndef IN_ONESHOT
+#  define IN_ONESHOT 0x80000000
+#endif
+
+#ifndef HAVE_INOTIFY_INIT1
+/*
+ * fake inotify_init1() since some systems don't have it
+ * Don't worry about thread-safety since current Ruby 1.9 won't
+ * call this without GVL.
+ */
+static int my_inotify_init1(int flags)
+{
+	int fd = inotify_init();
+	int tmp;
+
+	if (fd < 0)
+		return fd;
+	if ((flags & IN_CLOEXEC) && (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1))
+		goto fcntl_err;
+	if (flags & IN_NONBLOCK) {
+		tmp = fcntl(fd, F_GETFL);
+		if (tmp == -1)
+			goto fcntl_err;
+		if ((fcntl(fd, F_SETFL, tmp | O_NONBLOCK) != 0))
+			goto fcntl_err;
+	}
+
+	return fd;
+fcntl_err:
+	tmp = errno;
+	close(fd);
+	errno = tmp;
+	rb_sys_fail("fcntl");
+}
+# define inotify_init1 my_inotify_init1
+#endif /* HAVE_INOTIFY_INIT1 */
+
+static VALUE s_init(int argc, VALUE *argv, VALUE klass)
+{
+	VALUE _flags, rv;
+	int flags;
+	int fd;
+
+	rb_scan_args(argc, argv, "01", &_flags);
+	flags = NIL_P(_flags) ? 0 : NUM2INT(_flags);
+
+	fd = inotify_init1(flags);
+	if (fd == -1) {
+		if (errno == EMFILE || errno == ENFILE || errno == ENOMEM) {
+			rb_gc();
+			fd = inotify_init1(flags);
+		}
+		if (fd == -1)
+			rb_sys_fail("inotify_init1");
+	}
+
+	rv = rb_funcall(klass, id_for_fd, 1, INT2NUM(fd));
+	rb_ivar_set(rv, id_inotify_buf, rb_str_new(0, 128));
+	rb_ivar_set(rv, id_inotify_tmp, rb_ary_new());
+
+	return rv;
+}
+
+static VALUE add_watch(VALUE self, VALUE path, VALUE vmask)
+{
+	int fd = my_fileno(self);
+	const char *pathname = StringValuePtr(path);
+	uint32_t mask = NUM2UINT(vmask);
+	int rc = inotify_add_watch(fd, pathname, mask);
+
+	if (rc == -1) {
+		if (errno == ENOMEM) {
+			rb_gc();
+			rc = inotify_add_watch(fd, pathname, mask);
+		}
+		if (rc == -1)
+			rb_sys_fail("inotify_add_watch");
+	}
+	return UINT2NUM((uint32_t)rc);
+}
+
+static VALUE rm_watch(VALUE self, VALUE vwd)
+{
+	uint32_t wd = NUM2UINT(vwd);
+	int fd = my_fileno(self);
+	int rc = inotify_rm_watch(fd, wd);
+
+	if (rc == -1)
+		rb_sys_fail("inotify_rm_watch");
+	return INT2NUM(rc);
+}
+
+static size_t event_len(struct inotify_event *e)
+{
+	return sizeof(struct inotify_event) + e->len;
+}
+
+static VALUE event_new(struct inotify_event *e)
+{
+	VALUE wd = INT2NUM(e->wd);
+	VALUE mask = UINT2NUM(e->mask);
+	VALUE cookie = UINT2NUM(e->cookie);
+	VALUE name;
+
+	/* name may be zero-padded, so we do strlen() */
+	name = e->len ? rb_str_new(e->name, strlen(e->name)) : Qnil;
+
+	return rb_struct_new(cEvent, wd, mask, cookie, name);
+}
+
+static VALUE take(int argc, VALUE *argv, VALUE self)
+{
+	int fd = my_fileno(self);
+	VALUE buf = rb_ivar_get(self, id_inotify_buf);
+	VALUE tmp = rb_ivar_get(self, id_inotify_tmp);
+	struct inotify_event *ptr;
+	struct inotify_event *e, *end;
+	long len;
+	ssize_t r;
+	VALUE rv = Qnil;
+	VALUE nonblock;
+
+	if (RARRAY_LEN(tmp) > 0)
+		return rb_ary_shift(tmp);
+
+	rb_scan_args(argc, argv, "01", &nonblock);
+
+	len = RSTRING_LEN(buf);
+	ptr = (struct inotify_event *)RSTRING_PTR(buf);
+	do {
+		set_nonblock(fd);
+		r = read(fd, ptr, len);
+		if (r == 0 || (r < 0 && errno == EINVAL)) {
+			int newlen;
+			if (len > 0x10000)
+				rb_raise(rb_eRuntimeError, "path too long");
+			if (ioctl(fd, FIONREAD, &newlen) != 0)
+				rb_sys_fail("ioctl(inotify,FIONREAD)");
+			rb_str_resize(buf, newlen);
+			ptr = (struct inotify_event *)RSTRING_PTR(buf);
+			len = newlen;
+		} else if (r < 0) {
+			if (errno == EAGAIN) {
+				if (RTEST(nonblock))
+					return Qnil;
+				rb_io_wait_readable(fd);
+			} else {
+				rb_sys_fail("read(inotify)");
+			}
+		} else {
+			end = (struct inotify_event *)((char *)ptr + r);
+			for (e = ptr; e < end; ) {
+				VALUE event = event_new(e);
+				if (NIL_P(rv))
+					rv = event;
+				else
+					rb_ary_push(tmp, event);
+				e = (struct inotify_event *)
+				    ((char *)e + event_len(e));
+			}
+		}
+	} while (NIL_P(rv));
+
+	return rv;
+}
+
+static VALUE events(VALUE self)
+{
+	long len = RARRAY_LEN(checks);
+	VALUE *ptr = RARRAY_PTR(checks);
+	VALUE pair;
+	VALUE sym;
+	VALUE rv = rb_ary_new();
+	uint32_t mask;
+	uint32_t event_mask = NUM2UINT(rb_funcall(self, id_mask, 0));
+
+	for (; (len -= 2) >= 0;) {
+		sym = *ptr++;
+		mask = NUM2UINT(*ptr++);
+		if ((event_mask & mask) == mask)
+			rb_ary_push(rv, sym);
+	}
+
+	return rv;
+}
+
+static VALUE init_copy(VALUE dest, VALUE orig)
+{
+	VALUE tmp;
+
+	dest = rb_call_super(1, &orig);
+	rb_ivar_set(dest, id_inotify_buf, rb_str_new(0, 128));
+
+	return dest;
+}
+
+void sleepy_penguin_init_inotify(void)
+{
+	VALUE mSleepyPenguin, cInotify;
+
+	mSleepyPenguin = rb_define_module("SleepyPenguin");
+	cInotify = rb_define_class_under(mSleepyPenguin, "Inotify", rb_cIO);
+	rb_define_method(cInotify, "add_watch", add_watch, 2);
+	rb_define_method(cInotify, "rm_watch", rm_watch, 1);
+	rb_define_method(cInotify, "initialize_copy", init_copy, 1);
+	rb_define_method(cInotify, "take", take, -1);
+	cEvent = rb_struct_define(NULL, "wd", "mask", "cookie", "name", NULL);
+	rb_define_const(cInotify, "Event", cEvent);
+	rb_define_method(cEvent, "events", events, 0);
+	rb_define_singleton_method(cInotify, "new", s_init, -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");
+	checks = rb_ary_new();
+	rb_global_variable(&checks);
+#define IN(x) rb_define_const(cInotify,#x,UINT2NUM(IN_##x))
+#define IN2(x) do { \
+	VALUE val = UINT2NUM(IN_##x); \
+	rb_define_const(cInotify,#x,val); \
+	rb_ary_push(checks, ID2SYM(rb_intern(#x))); \
+	rb_ary_push(checks, val); \
+} while (0)
+
+	rb_define_const(cInotify, "FIONREAD", INT2NUM(FIONREAD));
+
+	IN(ALL_EVENTS);
+
+/* events a user can watch for */
+	IN2(ACCESS);
+	IN2(MODIFY);
+	IN2(ATTRIB);
+	IN2(CLOSE_WRITE);
+	IN2(CLOSE_NOWRITE);
+	IN2(OPEN);
+	IN2(MOVED_FROM);
+	IN2(MOVED_TO);
+	IN2(CREATE);
+	IN2(DELETE);
+	IN2(DELETE_SELF);
+	IN2(MOVE_SELF);
+
+/* sent as needed to any watch */
+	IN2(UNMOUNT);
+	IN2(Q_OVERFLOW);
+	IN2(IGNORED);
+	IN2(ISDIR);
+
+/* helpers */
+	IN(CLOSE);
+	IN(MOVE);
+
+/* special flags */
+	IN(ONLYDIR);
+	IN(DONT_FOLLOW);
+	IN(EXCL_UNLINK);
+	IN(MASK_ADD);
+	IN(ONESHOT);
+
+/* for inotify_init1() */
+	IN(NONBLOCK);
+	IN(CLOEXEC);
+}
+#endif /* HAVE_SYS_INOTIFY_H */

data/lib/sleepy_penguin.rb

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

data/pkg.mk

@@ -1,12 +1,13 @@
 RUBY = ruby
 RAKE = rake
 RSYNC = rsync
+WRONGDOC = wrongdoc
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
 -include GIT-VERSION-FILE
 -include local.mk
-DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
+DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts RbConfig::CONFIG["DLEXT"]')
 RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 lib := lib
@@ -47,7 +48,7 @@ endif
 
 pkg_extra := GIT-VERSION-FILE NEWS ChangeLog LATEST
 ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	wrongdoc prepare
+	$(WRONGDOC) prepare
 
 manifest:
 	$(RM) .manifest
@@ -59,10 +60,11 @@ manifest:
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
 
-doc: .document .wrongdoc.yml
-	find lib ext -type f -name '*.rbc' -exec rm -f '{}' ';'
+doc:: .document .wrongdoc.yml
+	find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
+	-find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
-	wrongdoc all
+	$(WRONGDOC) all
 	install -m644 COPYING doc/COPYING
 	install -m644 $(shell grep '^[A-Z]' .document) doc/
 
@@ -75,10 +77,10 @@ release_changes := release_changes-$(VERSION)
 release-notes: $(release_notes)
 release-changes: $(release_changes)
 $(release_changes):
-	wrongdoc release_changes > $@+
+	$(WRONGDOC) release_changes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 $(release_notes):
-	wrongdoc release_notes > $@+
+	$(WRONGDOC) release_notes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 
 # ensures we're actually on the tagged $(VERSION), only used for release

data/sleepy_penguin.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.summary = summary
   s.test_files = Dir['test/test_*.rb']
   s.extensions = %w(ext/sleepy_penguin/extconf.rb)
-  s.add_development_dependency('wrongdoc', '~> 1.3')
+  s.add_development_dependency('wrongdoc', '~> 1.5')
   s.add_development_dependency('strace_me', '~> 1.0')
 
   # s.license = %w(LGPL) # disabled for compatibility with older RubyGems

data/test/test_epoll.rb

@@ -129,7 +129,11 @@ class TestEpoll < Test::Unit::TestCase
       Process.kill(:USR1, Process.ppid)
     end
     time[:START_WAIT] = Time.now
-    @ep.wait { |flags, obj| tmp << [ flags, obj ]; time[:EP] = Time.now }
+    begin
+      @ep.wait { |flags, obj| tmp << [ flags, obj ]; time[:EP] = Time.now }
+    rescue Errno::EINTR
+      retry
+    end
     assert_equal([[Epoll::IN, @rd]], tmp)
     _, status = Process.waitpid2(pid)
     assert status.success?
@@ -313,7 +317,7 @@ class TestEpoll < Test::Unit::TestCase
   def test_new
     @ep.close
     io = Epoll.new.to_io
-    assert((io.fcntl(Fcntl::F_GETFD) & Fcntl::FD_CLOEXEC) == Fcntl::FD_CLOEXEC)
+    assert_equal 0, io.fcntl(Fcntl::F_GETFD)
   end
 
   def test_delete

data/test/test_epoll_optimizations.rb

@@ -90,8 +90,8 @@ class TestEpollOptimizations < Test::Unit::TestCase
     @wr.close
     io, err = Strace.me { rv = @ep.delete(obj) }
     lines = io.readlines; io.close
-    assert_nil err
-    assert_equal obj, rv
+    assert_kind_of IOError, err
+    assert_nil rv
     assert_equal 0, lines.grep(/^epoll_ctl/).size
   end
 

data/test/test_inotify.rb

@@ -0,0 +1,62 @@
+require 'test/unit'
+require 'fcntl'
+require 'tempfile'
+$-w = true
+require 'sleepy_penguin'
+
+class TestInotify < Test::Unit::TestCase
+  include SleepyPenguin
+
+  def test_new
+    ino = Inotify.new
+    assert_kind_of(IO, ino)
+  end
+
+  def test_dup
+    a = Inotify.new
+    b = a.dup
+    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
+
+    atmp = a.instance_variable_get(:@inotify_tmp)
+    btmp = b.instance_variable_get(:@inotify_tmp)
+    assert_equal atmp.object_id, btmp.object_id
+  end
+
+  def test_new_nonblock
+    ino = Inotify.new Inotify::NONBLOCK
+    flags = ino.fcntl(Fcntl::F_GETFL) & Fcntl::O_NONBLOCK
+    assert_equal(Fcntl::O_NONBLOCK, flags)
+  end
+
+  def test_new_cloeexec
+    ino = Inotify.new Inotify::CLOEXEC
+    flags = ino.fcntl(Fcntl::F_GETFD) & Fcntl::FD_CLOEXEC
+    assert_equal(Fcntl::FD_CLOEXEC, flags)
+  end
+
+  def test_add_take
+    ino = Inotify.new Inotify::CLOEXEC
+    tmp1 = Tempfile.new 'take'
+    tmp2 = Tempfile.new 'take'
+    wd = ino.add_watch File.dirname(tmp1.path), Inotify::MOVE
+    assert_kind_of Integer, wd
+    File.rename tmp1.path, tmp2.path
+    event = ino.take
+    assert_equal wd, event.wd
+    assert_kind_of Inotify::Event, event
+    assert_equal File.basename(tmp1.path), event.name
+    others = ino.instance_variable_get(:@inotify_tmp)
+    assert_kind_of Array, others
+    assert_equal 1, others.size
+    assert_equal File.basename(tmp2.path), others[0].name
+    assert_equal [ :MOVED_FROM ], event.events
+    assert_equal [ :MOVED_TO ], others[0].events
+    assert_equal wd, others[0].wd
+    second_id = others[0].object_id
+    assert_equal second_id, ino.take.object_id
+    assert_nil ino.take(true)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sleepy_penguin
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - sleepy_penguin hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 +00:00
+date: 2011-02-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 5
         segments: 
         - 1
-        - 3
-        version: "1.3"
+        - 5
+        version: "1.5"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - ext/sleepy_penguin/eventfd.c
 - ext/sleepy_penguin/extconf.rb
 - ext/sleepy_penguin/init.c
+- ext/sleepy_penguin/inotify.c
 - ext/sleepy_penguin/nonblock.h
 - ext/sleepy_penguin/sleepy_penguin.h
 - ext/sleepy_penguin/timerfd.c
@@ -101,6 +102,7 @@ files:
 - test/test_epoll_gc.rb
 - test/test_epoll_optimizations.rb
 - test/test_eventfd.rb
+- test/test_inotify.rb
 - test/test_timerfd.rb
 has_rdoc: true
 homepage: http://bogomips.org/sleepy_penguin/
@@ -143,6 +145,7 @@ summary: Linux I/O events for Ruby
 test_files: 
 - test/test_epoll_optimizations.rb
 - test/test_epoll.rb
+- test/test_inotify.rb
 - test/test_eventfd.rb
 - test/test_epoll_gc.rb
 - test/test_timerfd.rb