sleepy_penguin 1.2.0 → 1.3.0

data/.gitignore

@@ -19,3 +19,4 @@ pkg/
 tags
 TAGS
 /LATEST
+/tmp

data/.wrongdoc.yml

@@ -1,4 +1,4 @@
 ---
-cgit_url: http://git.bogomips.org/cgit/sleepy_penguin.git
-git_url: git://git.bogomips.org/sleepy_penguin.git
+cgit_url: http://bogomips.org/sleepy_penguin.git
+git_url: git://bogomips.org/sleepy_penguin.git
 rdoc_url: http://bogomips.org/sleepy_penguin/

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,155 +1,11 @@
-# use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
-RUBY = ruby
-RAKE = rake
-RSYNC = rsync
-
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN
--include GIT-VERSION-FILE
--include local.mk
-ifeq ($(DLEXT),) # "so" for Linux
-  DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
-endif
-ifeq ($(RUBY_VERSION),)
-  RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
-endif
-
-install:
-	$(prep_setup_rb)
-	$(RM) -r .install-tmp
-	mkdir .install-tmp
-	$(RUBY) setup.rb all
-	$(RM) $^
-	$(RM) -r .install-tmp
-	$(prep_setup_rb)
-
-setup_rb_files := .config InstalledFiles
-prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C $(ext) clean
-
-extdir := ext/sleepy_penguin
-clean:
-	-$(MAKE) -C $(extdir) clean
-	$(RM) $(setup_rb_files) $(extdir)/Makefile
-
-pkg_extra := GIT-VERSION-FILE NEWS ChangeLog LATEST
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	wrongdoc prepare
-
-.manifest: ChangeLog
-	(git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
-		LC_ALL=C sort > $@+
-	cmp $@+ $@ || mv $@+ $@
-	$(RM) $@+
-
-doc: .document .wrongdoc.yml
-	find lib ext -type f -name '*.rbc' -exec rm -f '{}' ';'
-	$(RM) -r doc
-	wrongdoc all
-	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
-
-ifneq ($(VERSION),)
+RSYNC_DEST := bogomips.org:/srv/bogomips/sleepy_penguin
 rfproject := rainbows
 rfpackage := sleepy_penguin
-pkggem := pkg/$(rfpackage)-$(VERSION).gem
-pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
-release_notes := release_notes-$(VERSION)
-release_changes := release_changes-$(VERSION)
-
-release-notes: $(release_notes)
-release-changes: $(release_changes)
-$(release_changes):
-	wrongdoc release_changes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-$(release_notes):
-	wrongdoc release_notes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-
-# ensures we're actually on the tagged $(VERSION), only used for release
-verify:
-	test x"$(shell umask)" = x0022
-	git rev-parse --verify refs/tags/v$(VERSION)^{}
-	git diff-index --quiet HEAD^0
-	test `git rev-parse --verify HEAD^0` = \
-	     `git rev-parse --verify refs/tags/v$(VERSION)^{}`
-
-fix-perms:
-	-git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
-	-git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
-
-gem: $(pkggem)
-
-install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
-
-$(pkggem): .manifest fix-perms
-	gem build $(rfpackage).gemspec
-	mkdir -p pkg
-	mv $(@F) $@
-
-$(pkgtgz): distdir = $(basename $@)
-$(pkgtgz): HEAD = v$(VERSION)
-$(pkgtgz): .manifest fix-perms
-	@test -n "$(distdir)"
-	$(RM) -r $(distdir)
-	mkdir -p $(distdir)
-	tar cf - `cat .manifest` | (cd $(distdir) && tar xf -)
-	cd pkg && tar cf - $(basename $(@F)) | gzip -9 > $(@F)+
-	mv $@+ $@
-
-package: $(pkgtgz) $(pkggem)
-
-test-release: verify package $(release_notes) $(release_changes)
-release: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	# push gem to RubyGems.org
-	gem push $(pkggem)
-	# in case of gem downloads from RubyForge releases page
-	-rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+include pkg.mk
+ifneq ($(VERSION),)
+release::
 	$(RAKE) raa_update VERSION=$(VERSION)
 	$(RAKE) publish_news VERSION=$(VERSION)
-else
-gem install-gem: GIT-VERSION-FILE
-	$(MAKE) $@ VERSION=$(GIT_VERSION)
 endif
-
-ext := $(extdir)/sleepy_penguin_ext.$(DLEXT)
-$(extdir)/Makefile: $(extdir)/extconf.rb
-	cd $(@D) && $(RUBY) extconf.rb
-
-c_files := $(wildcard $(extdir)/*.[ch] $(extdir)/*/*.h)
-$(ext): $(c_files) $(extdir)/Makefile
-	$(MAKE) -C $(@D)
-
-all:: test
-
-build: $(ext)
-test_units := $(wildcard test/test_*.rb)
-test: test-unit
-test-unit: $(test_units)
-$(test_units): build
-	$(RUBY) -I lib:$(extdir) $@
-
-# this requires GNU coreutils variants
-publish_doc:
-	-git set-file-times
-	$(MAKE) doc
-	find doc/images -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:06' doc/rdoc.css
-	$(MAKE) doc_gz
-	chmod 644 $$(find doc -type f)
-	$(RSYNC) -av doc/ bogomips.org:/srv/bogomips/sleepy_penguin/
-	git ls-files | xargs touch
-
-# Create gzip variants of the same timestamp as the original so nginx
-# "gzip_static on" can serve the gzipped versions directly.
-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
-
-.PHONY: .FORCE-GIT-VERSION-FILE doc test $(test_units)
+.PHONY: .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest

data/README

@@ -36,13 +36,13 @@ Unpack it, and run "ruby setup.rb"
 
 You can get the latest source via git from the following locations:
 
-  git://git.bogomips.org/sleepy_penguin.git
+  git://bogomips.org/sleepy_penguin.git
   git://repo.or.cz/sleepy_penguin.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://git.bogomips.org/cgit/sleepy_penguin.git (cgit)
+* http://bogomips.org/sleepy_penguin.git (cgit)
 * http://repo.or.cz/w/sleepy_penguin.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are

data/Rakefile

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
-cgit_url = "http://git.bogomips.org/cgit/sleepy_penguin.git"
-git_url = 'git://git.bogomips.org/sleepy_penguin.git'
+require 'wrongdoc'
+cgit_url = Wrongdoc.config[:cgit_url]
+git_url = Wrongdoc.config[:git_url]
 
 desc "post news article to rubyforge"
 task :publish_news do

data/ext/sleepy_penguin/epoll.c

@@ -51,6 +51,7 @@ struct rb_epoll {
 	struct epoll_event *events;
 	VALUE io;
 	VALUE marks;
+	VALUE flag_cache;
 	int flags;
 };
 
@@ -95,6 +96,7 @@ static void gcmark(void *ptr)
 
 	rb_gc_mark(ep->io);
 	rb_gc_mark(ep->marks);
+	rb_gc_mark(ep->flag_cache);
 }
 
 static void gcfree(void *ptr)
@@ -124,7 +126,8 @@ static VALUE alloc(VALUE klass)
 	self = Data_Make_Struct(klass, struct rb_epoll, gcmark, gcfree, ep);
 	ep->fd = -1;
 	ep->io = Qnil;
-	ep->marks = rb_ary_new();
+	ep->marks = Qnil;
+	ep->flag_cache = Qnil;
 	ep->capa = step;
 	ep->flags = EPOLL_CLOEXEC;
 	ep->events = xmalloc(sizeof(struct epoll_event) * ep->capa);
@@ -145,6 +148,8 @@ static void my_epoll_create(struct rb_epoll *ep)
 			rb_sys_fail("epoll_create1");
 	}
 	st_insert(active, (st_data_t)ep->fd, (st_data_t)ep);
+	ep->marks = rb_ary_new();
+	ep->flag_cache = rb_ary_new();
 }
 
 static void ep_check(struct rb_epoll *ep)
@@ -153,11 +158,15 @@ static void ep_check(struct rb_epoll *ep)
 		my_epoll_create(ep);
 	if (ep->fd == -1)
 		rb_raise(rb_eIOError, "closed");
+	assert(TYPE(ep->marks) == T_ARRAY && "marks not initialized");
+	assert(TYPE(ep->flag_cache) == T_ARRAY && "flag_cache not initialized");
 }
 
 /*
  * creates a new Epoll object with an optional +flags+ argument.
- * +flags+ may currently be +Epoll::CLOEXEC+ or 0 (or nil)
+ * +flags+ may currently be Epoll::CLOEXEC or +0+ (or +nil+)
+ * Epoll::CLOEXEC will be set by default if +nil+ or no
+ * argument is passed.
  */
 static VALUE init(int argc, VALUE *argv, VALUE self)
 {
@@ -204,8 +213,17 @@ static VALUE ctl(VALUE self, VALUE io, VALUE flags, int op)
 		if (rv == -1)
 			rb_sys_fail("epoll_ctl");
 	}
-	if (op == EPOLL_CTL_ADD)
+	switch (op) {
+	case EPOLL_CTL_ADD:
 		rb_ary_store(ep->marks, fd, io);
+		/* fall-through */
+	case EPOLL_CTL_MOD:
+		rb_ary_store(ep->flag_cache, fd, flags);
+		break;
+	case EPOLL_CTL_DEL:
+		rb_ary_store(ep->marks, fd, Qnil);
+		rb_ary_store(ep->flag_cache, fd, Qnil);
+	}
 
 	return INT2NUM(rv);
 }
@@ -220,23 +238,44 @@ static VALUE set(VALUE self, VALUE io, VALUE flags)
 	struct rb_epoll *ep = ep_get(self);
 	int fd = my_fileno(io);
 	int rv;
+	VALUE cur_io = rb_ary_entry(ep->marks, fd);
 
 	ep_check(ep);
 	event.events = NUM2UINT(flags);
 	pack_event_data(&event, io);
 
-	rv = epoll_ctl(ep->fd, EPOLL_CTL_MOD, fd, &event);
-	if (rv == -1) {
-		if (errno == ENOENT) {
-			rv = epoll_ctl(ep->fd, EPOLL_CTL_ADD, fd, &event);
-			if (rv == -1)
-				rb_sys_fail("epoll_ctl - add");
+	if (cur_io == io) {
+		VALUE cur_flags = rb_ary_entry(ep->flag_cache, fd);
+		uint32_t cur_events;
+
+		assert(!NIL_P(cur_flags) && "cur_flags nil but cur_io is not");
+		cur_events = NUM2UINT(cur_flags);
+
+		if (!(cur_events & EPOLLONESHOT) && cur_events == event.events)
+			return Qnil;
 
-			rb_ary_store(ep->marks, fd, io);
-			return INT2NUM(rv);
+fallback_mod:
+		rv = epoll_ctl(ep->fd, EPOLL_CTL_MOD, fd, &event);
+		if (rv == -1) {
+			if (errno != ENOENT)
+				rb_sys_fail("epoll_ctl - mod");
+			errno = 0;
+			rb_warn("epoll flag_cache failed (mod -> add)");
+			goto fallback_add;
 		}
-		rb_sys_fail("epoll_ctl - mod");
+	} else {
+fallback_add:
+		rv = epoll_ctl(ep->fd, EPOLL_CTL_ADD, fd, &event);
+		if (rv == -1) {
+			if (errno != EEXIST)
+				rb_sys_fail("epoll_ctl - add");
+			errno = 0;
+			rb_warn("epoll flag_cache failed (add -> mod)");
+			goto fallback_mod;
+		}
+		rb_ary_store(ep->marks, fd, io);
 	}
+	rb_ary_store(ep->flag_cache, fd, flags);
 
 	return INT2NUM(rv);
 }
@@ -252,16 +291,27 @@ static VALUE delete(VALUE self, VALUE io)
 	struct rb_epoll *ep = ep_get(self);
 	int fd = my_fileno(io);
 	int rv;
+	VALUE cur_io;
 
 	ep_check(ep);
+	cur_io = rb_ary_entry(ep->marks, fd);
+	if (NIL_P(cur_io) || my_io_closed(cur_io))
+		return Qnil;
+
 	rv = epoll_ctl(ep->fd, EPOLL_CTL_DEL, fd, NULL);
 	if (rv == -1) {
-		if (errno != ENOENT)
+		/* beware of IO.for_fd-created descriptors */
+		if (errno == ENOENT || errno == EBADF) {
+			errno = 0;
+			io = Qnil;
+		} else {
 			rb_sys_fail("epoll_ctl - del");
-		errno = 0;
-		return Qnil;
+		}
 	}
-	return INT2NUM(rv);
+	rb_ary_store(ep->marks, fd, Qnil);
+	rb_ary_store(ep->flag_cache, fd, Qnil);
+
+	return io;
 }
 
 static VALUE epwait_result(struct rb_epoll *ep, int n)
@@ -380,6 +430,7 @@ static int epwait_timed(struct rb_epoll *ep)
 		if (n > 0 || (n == -1 && errno != EINTR))
 			return n;
 
+		/* XXX use CLOCK_MONOTONIC if people care about 1.8... */
 		gettimeofday(&now, NULL);
 		timersub(&now, &t0, &diff);
 		timersub(&tv, &diff, &tv);
@@ -521,7 +572,12 @@ static VALUE init_copy(VALUE copy, VALUE orig)
 	       NIL_P(b->io) && "Ruby broken?");
 
 	ep_check(a);
+	assert(NIL_P(b->marks) && "mark array not nil");
+	assert(NIL_P(b->flag_cache) && "flag_cache not nil");
 	b->marks = a->marks;
+	b->flag_cache = a->flag_cache;
+	assert(TYPE(b->marks) == T_ARRAY && "mark array not initialized");
+	assert(TYPE(b->flag_cache) == T_ARRAY && "flag_cache not initialized");
 	b->flags = a->flags;
 	b->fd = cloexec_dup(a);
 	if (b->fd == -1) {
@@ -537,6 +593,43 @@ static VALUE init_copy(VALUE copy, VALUE orig)
 	return copy;
 }
 
+static VALUE io_for(VALUE self, VALUE obj)
+{
+	struct rb_epoll *ep = ep_get(self);
+
+	return rb_ary_entry(ep->marks, my_fileno(obj));
+}
+
+/*
+ * :call-seq:
+ *
+ *	epoll.flags_for(io) => Integer
+ *
+ * Returns the flags currently watched for in current Epoll object.
+ */
+static VALUE flags_for(VALUE self, VALUE obj)
+{
+	struct rb_epoll *ep = ep_get(self);
+
+	return rb_ary_entry(ep->flag_cache, my_fileno(obj));
+}
+
+/*
+ * :call-seq:
+ *
+ *	epoll.include?(io) => true or false
+ *
+ * Returns whether or not a given IO is watched and prevented from being
+ * garbage-collected by the current Epoll object.  This may include
+ * closed IO objects.
+ */
+static VALUE include_p(VALUE self, VALUE obj)
+{
+	struct rb_epoll *ep = ep_get(self);
+
+	return NIL_P(rb_ary_entry(ep->marks, my_fileno(obj))) ? Qfalse : Qtrue;
+}
+
 /*
  * we close (or lose to GC) epoll descriptors at fork to avoid leakage
  * and invalid objects being referenced later in the child
@@ -582,17 +675,46 @@ void sleepy_penguin_init_epoll(void)
 	rb_define_method(cEpoll, "mod", mod, 2);
 	rb_define_method(cEpoll, "del", del, 1);
 	rb_define_method(cEpoll, "delete", delete, 1);
+	rb_define_method(cEpoll, "io_for", io_for, 1);
+	rb_define_method(cEpoll, "flags_for", flags_for, 1);
+	rb_define_method(cEpoll, "include?", include_p, 1);
 	rb_define_method(cEpoll, "set", set, 2);
 	rb_define_method(cEpoll, "wait", epwait, -1);
+
+	/* specifies wheter close-on-exec flag is set for Epoll.new */
 	rb_define_const(cEpoll, "CLOEXEC", INT2NUM(EPOLL_CLOEXEC));
+
+	/* watch for read/recv operations */
 	rb_define_const(cEpoll, "IN", INT2NUM(EPOLLIN));
+
+	/* watch for write/send operations */
 	rb_define_const(cEpoll, "OUT", INT2NUM(EPOLLOUT));
+
+#ifdef EPOLLRDHUP
+	/* watch a specified IO for shutdown(SHUT_WR) on the remote-end */
 	rb_define_const(cEpoll, "RDHUP", INT2NUM(EPOLLRDHUP));
+#endif
+	/* watch for urgent read(2) data */
 	rb_define_const(cEpoll, "PRI", INT2NUM(EPOLLPRI));
+
+	/*
+	 * watch for errors, there is no need to specify this,
+	 * it is always monitored when an IO is watched
+	 */
 	rb_define_const(cEpoll, "ERR", INT2NUM(EPOLLERR));
+
+	/*
+	 * watch for hangups, there is no need to specify this,
+	 * it is always monitored when an IO is watched
+	 */
 	rb_define_const(cEpoll, "HUP", INT2NUM(EPOLLHUP));
+
+	/* notifications are only Edge Triggered, see epoll(7) */
 	rb_define_const(cEpoll, "ET", INT2NUM(EPOLLET));
+
+	/* unwatch the descriptor once any event has fired */
 	rb_define_const(cEpoll, "ONESHOT", INT2NUM(EPOLLONESHOT));
+
 	id_for_fd = rb_intern("for_fd");
 	active = st_init_numtable();
 

data/ext/sleepy_penguin/extconf.rb

@@ -4,6 +4,7 @@ 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('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('epoll_create1', %w(sys/epoll.h))

data/ext/sleepy_penguin/sleepy_penguin.h

@@ -26,12 +26,24 @@
 #  endif
 #endif
 
+#if defined(RFILE) && defined(HAVE_ST_FD)
+static int my_io_closed(VALUE io)
+{
+	return RFILE(io)->fptr->fd < 0;
+}
+#else
+static int my_io_closed(VALUE io)
+{
+	return rb_funcall(io, rb_intern("closed?"), 0) == Qtrue;
+}
+#endif
+
 static int my_fileno(VALUE io)
 {
 	rb_io_t *fptr;
 
 	switch (TYPE(io)) {
-	case T_FIXNUM: return NUM2INT(io);
+	case T_FIXNUM: return FIX2INT(io);
 	case T_FILE:
 		GetOpenFile(io, fptr);
 		return FPTR_TO_FD(fptr);

data/lib/sleepy_penguin.rb

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

data/pkg.mk

@@ -0,0 +1,166 @@
+RUBY = ruby
+RAKE = rake
+RSYNC = rsync
+
+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"]')
+RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
+RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
+lib := lib
+
+ifeq ($(shell test -f script/isolate_for_tests && echo t),t)
+isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/isolate.mk
+$(isolate_libs): script/isolate_for_tests
+	@$(RUBY) script/isolate_for_tests
+-include $(isolate_libs)
+lib := $(lib):$(ISOLATE_LIBS)
+endif
+
+ext := $(firstword $(wildcard ext/*))
+ifneq ($(ext),)
+ext_pfx := tmp/ext/$(RUBY_ENGINE)-$(RUBY_VERSION)
+ext_h := $(wildcard $(ext)/*/*.h $(ext)/*.h)
+ext_src := $(wildcard $(ext)/*.c $(ext_h))
+ext_pfx_src := $(addprefix $(ext_pfx)/,$(ext_src))
+ext_d := $(ext_pfx)/$(ext)/.d
+$(ext)/extconf.rb: $(wildcard $(ext)/*.h)
+	@>> $@
+$(ext_d):
+	@mkdir -p $(@D)
+	@> $@
+$(ext_pfx)/$(ext)/%: $(ext)/% $(ext_d)
+	install -m 644 $< $@
+$(ext_pfx)/$(ext)/Makefile: $(ext)/extconf.rb $(ext_d) $(ext_h)
+	$(RM) -f $(@D)/*.o
+	cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb
+ext_sfx := _ext.$(DLEXT)
+ext_dl := $(ext_pfx)/$(ext)/$(notdir $(ext)_ext.$(DLEXT))
+$(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile
+	@echo $^ == $@
+	$(MAKE) -C $(@D)
+lib := $(lib):$(ext_pfx)/$(ext)
+build: $(ext_dl)
+endif
+
+pkg_extra := GIT-VERSION-FILE NEWS ChangeLog LATEST
+ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
+	wrongdoc prepare
+
+manifest:
+	$(RM) .manifest
+	$(MAKE) .manifest
+
+.manifest: ChangeLog
+	(git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
+		LC_ALL=C sort > $@+
+	cmp $@+ $@ || mv $@+ $@
+	$(RM) $@+
+
+doc: .document .wrongdoc.yml
+	find lib ext -type f -name '*.rbc' -exec rm -f '{}' ';'
+	$(RM) -r doc
+	wrongdoc all
+	install -m644 COPYING doc/COPYING
+	install -m644 $(shell grep '^[A-Z]' .document) doc/
+
+ifneq ($(VERSION),)
+pkggem := pkg/$(rfpackage)-$(VERSION).gem
+pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
+release_notes := release_notes-$(VERSION)
+release_changes := release_changes-$(VERSION)
+
+release-notes: $(release_notes)
+release-changes: $(release_changes)
+$(release_changes):
+	wrongdoc release_changes > $@+
+	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
+$(release_notes):
+	wrongdoc release_notes > $@+
+	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
+
+# ensures we're actually on the tagged $(VERSION), only used for release
+verify:
+	test x"$(shell umask)" = x0022
+	git rev-parse --verify refs/tags/v$(VERSION)^{}
+	git diff-index --quiet HEAD^0
+	test $$(git rev-parse --verify HEAD^0) = \
+	     $$(git rev-parse --verify refs/tags/v$(VERSION)^{})
+
+fix-perms:
+	-git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
+	-git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
+
+gem: $(pkggem)
+
+install-gem: $(pkggem)
+	gem install $(CURDIR)/$<
+
+$(pkggem): manifest fix-perms
+	gem build $(rfpackage).gemspec
+	mkdir -p pkg
+	mv $(@F) $@
+
+$(pkgtgz): distdir = $(basename $@)
+$(pkgtgz): HEAD = v$(VERSION)
+$(pkgtgz): manifest fix-perms
+	@test -n "$(distdir)"
+	$(RM) -r $(distdir)
+	mkdir -p $(distdir)
+	tar cf - $$(cat .manifest) | (cd $(distdir) && tar xf -)
+	cd pkg && tar cf - $(basename $(@F)) | gzip -9 > $(@F)+
+	mv $@+ $@
+
+package: $(pkgtgz) $(pkggem)
+
+test-release:: verify package $(release_notes) $(release_changes)
+	# make tgz release on RubyForge
+	@echo rubyforge add_release -f \
+	  -n $(release_notes) -a $(release_changes) \
+	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
+	@echo gem push $(pkggem)
+	@echo rubyforge add_file \
+	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+release:: verify package $(release_notes) $(release_changes)
+	# make tgz release on RubyForge
+	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
+	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
+	# push gem to RubyGems.org
+	gem push $(pkggem)
+	# in case of gem downloads from RubyForge releases page
+	rubyforge add_file \
+	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+else
+gem install-gem: GIT-VERSION-FILE
+	$(MAKE) $@ VERSION=$(GIT_VERSION)
+endif
+
+all:: test
+test_units := $(wildcard test/test_*.rb)
+test: test-unit
+test-unit: $(test_units)
+$(test_units): build
+	$(RUBY) -I $(lib) $@
+
+# this requires GNU coreutils variants
+ifneq ($(RSYNC_DEST),)
+publish_doc:
+	-git set-file-times
+	$(MAKE) doc
+	find doc/images -type f | \
+		TZ=UTC xargs touch -d '1970-01-01 00:00:06' doc/rdoc.css
+	$(MAKE) doc_gz
+	$(RSYNC) -av doc/ $(RSYNC_DEST)/
+	git ls-files | xargs touch
+endif
+
+# Create gzip variants of the same timestamp as the original so nginx
+# "gzip_static on" can serve the gzipped versions directly.
+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
+
+.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest

data/script/isolate_for_tests

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+# scripts/Makefiles can read and eval the output of this script and
+# use it as RUBYLIB
+require 'rubygems'
+require 'isolate'
+fp = File.open(__FILE__, "rb")
+fp.flock(File::LOCK_EX)
+
+ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
+opts = {
+  :system => false,
+  # we want "ruby-1.8.7" and not "ruby-1.8", so disable :multiruby
+  :multiruby => false,
+  :path => "tmp/isolate/#{ruby_engine}-#{RUBY_VERSION}",
+}
+
+pid = fork do
+  Isolate.now!(opts) do
+    gem 'strace_me', '1.0.0'
+  end
+end
+_, status = Process.waitpid2(pid)
+status.success? or abort status.inspect
+lib_paths = Dir["#{opts[:path]}/gems/*-*/{lib,ext}"]
+lib_paths.map! { |x| File.expand_path(x) }
+dst = "tmp/isolate/#{ruby_engine}-#{RUBY_VERSION}/isolate.mk"
+File.open("#{dst}.#$$", "w") do |fp|
+  fp.puts "ISOLATE_LIBS=#{lib_paths.join(':')}"
+end
+File.rename("#{dst}.#$$", dst)

data/sleepy_penguin.gemspec

@@ -7,7 +7,7 @@ name, summary, title = readme_metadata
 Gem::Specification.new do |s|
   s.name = %q{sleepy_penguin}
   s.version = ENV["VERSION"].dup
-  s.homepage = 'http://bogomips.org/sleepy_penguin/'
+  s.homepage = Wrongdoc.config[:rdoc_url]
   s.authors = ["#{name} hackers"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = readme_description
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   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('strace_me', '~> 1.0')
 
   # s.license = %w(LGPL) # disabled for compatibility with older RubyGems
 end

data/test/test_epoll.rb

@@ -154,6 +154,8 @@ class TestEpoll < Test::Unit::TestCase
   end
 
   def test_rdhup
+    defined?(Epoll::RDHUP) or
+      return warn "skipping test, EPOLLRDHUP not available"
     rd, wr = UNIXSocket.pair
     @ep.add rd, Epoll::RDHUP
     tmp = []
@@ -318,7 +320,35 @@ class TestEpoll < Test::Unit::TestCase
     assert_nil @ep.delete(@rd)
     assert_nil @ep.delete(@wr)
     assert_nothing_raised { @ep.add @rd, Epoll::IN }
-    assert_equal 0, @ep.delete(@rd)
+    assert_equal @rd, @ep.delete(@rd)
     assert_nil @ep.delete(@rd)
   end
+
+  def test_io_for
+    @ep.add @rd, Epoll::IN
+    assert_equal @rd, @ep.io_for(@rd.fileno)
+    assert_equal @rd, @ep.io_for(@rd)
+    @ep.del @rd
+    assert_nil @ep.io_for(@rd.fileno)
+    assert_nil @ep.io_for(@rd)
+  end
+
+  def test_flags_for
+    @ep.add @rd, Epoll::IN
+    assert_equal Epoll::IN, @ep.flags_for(@rd.fileno)
+    assert_equal Epoll::IN, @ep.flags_for(@rd)
+
+    @ep.del @rd
+    assert_nil @ep.flags_for(@rd.fileno)
+    assert_nil @ep.flags_for(@rd)
+  end
+
+  def test_include?
+    assert ! @ep.include?(@rd)
+    @ep.add @rd, Epoll::IN
+    assert @ep.include?(@rd)
+    assert @ep.include?(@rd.fileno)
+    assert ! @ep.include?(@wr)
+    assert ! @ep.include?(@wr.fileno)
+  end
 end

data/test/test_epoll_optimizations.rb

@@ -0,0 +1,127 @@
+require 'test/unit'
+require 'strace'
+$-w = true
+
+require 'sleepy_penguin'
+
+class TestEpollOptimizations < Test::Unit::TestCase
+  include SleepyPenguin
+  RBX = defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'rbx')
+  IO_PURGATORY = []
+
+  def setup
+    @rd, @wr = IO.pipe
+    @ep = Epoll.new
+  end
+
+  def teardown
+    [ @ep, @rd, @wr ].each { |io| io.close unless io.closed? }
+  end
+
+  def test_set
+    io, err = Strace.me do
+      @ep.set(@wr, Epoll::OUT)
+      @ep.set(@wr, Epoll::OUT)
+    end
+    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]
+
+    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]
+
+    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]
+    @wr.close
+    @rd.close
+
+    @rd, @wr = IO.pipe
+    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_ADD/, lines.grep(/^epoll_ctl/)[0]
+  end
+
+  def test_delete
+    @ep.set(@wr, Epoll::OUT)
+    rv = true
+    io, err = Strace.me { rv = @ep.delete(@wr) }
+    assert_equal @wr, rv
+    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]
+
+    rv = true
+    io, err = Strace.me { rv = @ep.delete(@wr) }
+    assert_nil rv
+    assert_nil err
+    lines = io.readlines; io.close
+    assert_equal 0, lines.grep(/^epoll_ctl/).size
+  end
+
+  def test_delete_closed
+    a = @wr.fileno
+    @ep.set(@wr, Epoll::OUT)
+    @rd.close
+    @wr.close
+    @rd, @wr = IO.pipe
+    assert_equal a, @wr.fileno
+    rv = true
+    io, err = Strace.me { rv = @ep.delete(@wr) }
+    lines = io.readlines; io.close
+    assert_nil err
+    assert_nil rv
+    assert_equal 0, lines.grep(/^epoll_ctl/).size
+  end
+
+  def test_delete_aliased_a
+    tmp = IO.for_fd @wr.fileno
+    IO_PURGATORY << tmp
+    @ep.set(tmp, Epoll::OUT)
+    rv = nil
+    io, err = Strace.me { rv = @ep.delete(@wr) }
+    lines = io.readlines; io.close
+    assert_equal @wr, rv
+    assert_nil err
+    assert_equal 1, lines.grep(/^epoll_ctl/).size
+    assert_match %r{=\s+0$}, lines.grep(/^epoll_ctl/)[0]
+    assert_equal 0, lines.grep(/ENOENT/).size
+  end
+
+  def test_delete_aliased_b
+    tmp = IO.for_fd @wr.fileno
+    IO_PURGATORY << tmp
+    @ep.set(@wr, Epoll::OUT)
+    rv = nil
+    io, err = Strace.me { rv = @ep.delete(tmp) }
+    lines = io.readlines; io.close
+    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_equal 0, lines.grep(/ENOENT/).size
+  end
+
+  def test_delete_aliased_closed
+    tmp = IO.for_fd @wr.fileno
+    IO_PURGATORY << tmp
+    @ep.set(tmp, Epoll::OUT)
+    @wr.close
+    rv = nil
+    io, err = Strace.me { rv = @ep.delete(tmp) }
+    lines = io.readlines; io.close
+    assert_nil rv
+    assert_nil err
+    assert_equal 1, lines.grep(/^epoll_ctl/).size
+    assert_equal 1, lines.grep(/EBADF/).size
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sleepy_penguin
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - sleepy_penguin hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +00:00
+date: 2011-01-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,21 @@ dependencies:
         version: "1.3"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: strace_me
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id002
 description: |-
   sleepy_penguin provides access to newer, Linux-only system calls to wait
   on events from traditionally non-I/O sources.  Bindings to the eventfd,
@@ -78,10 +93,13 @@ files:
 - ext/sleepy_penguin/timerfd.c
 - ext/sleepy_penguin/value2timespec.h
 - lib/sleepy_penguin.rb
+- pkg.mk
+- script/isolate_for_tests
 - setup.rb
 - sleepy_penguin.gemspec
 - test/test_epoll.rb
 - test/test_epoll_gc.rb
+- test/test_epoll_optimizations.rb
 - test/test_eventfd.rb
 - test/test_timerfd.rb
 has_rdoc: true
@@ -93,7 +111,7 @@ rdoc_options:
 - -t
 - sleepy_penguin - Linux I/O events for Ruby
 - -W
-- http://git.bogomips.org/cgit/sleepy_penguin.git/tree/%s
+- http://bogomips.org/sleepy_penguin.git/tree/%s
 require_paths: 
 - lib
 - ext
@@ -123,6 +141,7 @@ signing_key:
 specification_version: 3
 summary: Linux I/O events for Ruby
 test_files: 
+- test/test_epoll_optimizations.rb
 - test/test_epoll.rb
 - test/test_eventfd.rb
 - test/test_epoll_gc.rb