raindrops 0.6.1 → 0.7.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.6.1.GIT
+DEF_VER=v0.7.0.GIT
 
 LF='
 '

data/Gemfile

@@ -2,6 +2,5 @@ source(ENV["GEM_SOURCE"] || :rubygems)
 gem 'aggregate', '~> 0.2'
 gem 'io-extra', '~> 1.2.3'
 gem 'posix_mq', '~> 1.0'
-gem 'wrongdoc', '~> 1.5'
 gem 'rack', '~> 1.2'
 gem 'unicorn', '>= 0.98'

data/README

@@ -62,7 +62,7 @@ Unpack it, and run "ruby setup.rb"
 
 See Raindrops::Middleware and Raindrops::LastDataRecv documentation for
 use Rack servers.  The entire library is fully-documented and we are
-responsive on the mailing list (mailto:raindrops@librelist.com) if you
+responsive on the mailing list (mailto:raindrops@librelist.org) if you
 have any questions or comments.
 
 == Development
@@ -96,7 +96,7 @@ similar in spirit to the existing LGPL).
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull
-requests) go to the mailing list: mailto:raindrops@librelist.com
+requests) go to the mailing list: mailto:raindrops@librelist.org
 
 The mailing list is mirrored to Gmane, all information about the
 group is here:

data/examples/linux-listener-stats.rb

@@ -21,7 +21,7 @@ queued_thresh = -1
 trap(:INT) { exit 130 }
 trap(:PIPE) { exit 0 }
 
-opts = OptionParser.new('', 24, '  ') do |opts|
+OptionParser.new('', 24, '  ') do |opts|
   opts.banner = usage
   opts.on('-d', '--delay=DELAY', Float) { |n| delay = n }
   opts.on('-t', '--queued-threshold=INT', Integer) { |n| queued_thresh = n }

data/ext/raindrops/extconf.rb

@@ -7,7 +7,7 @@ have_func('munmap', 'sys/mman.h') or abort 'munmap() not found'
 $CPPFLAGS += " -D_GNU_SOURCE "
 have_func('mremap', 'sys/mman.h')
 
-$CPPFLAGS += " -D_BSD_SOURCE -D_XOPEN_SOURCE=600 "
+$CPPFLAGS += " -D_BSD_SOURCE "
 have_func("getpagesize", "unistd.h")
 have_func('rb_thread_blocking_region')
 have_func('rb_thread_io_blocking_region')

data/ext/raindrops/linux_inet_diag.c

@@ -54,6 +54,13 @@ rb_thread_blocking_region(
 #include <linux/rtnetlink.h>
 #include <linux/inet_diag.h>
 
+union any_addr {
+	struct sockaddr_storage ss;
+	struct sockaddr sa;
+	struct sockaddr_in in;
+	struct sockaddr_in6 in6;
+};
+
 static size_t page_size;
 static unsigned g_seq;
 static VALUE cListenStats, cIDSock;
@@ -169,7 +176,7 @@ static const char *addr_any(sa_family_t family)
 static void bug_warn(void)
 {
 	fprintf(stderr, "Please report how you produced this at "\
-	                "raindrops@librelist.com\n");
+	                "raindrops@librelist.org\n");
 	fflush(stderr);
 }
 
@@ -180,30 +187,27 @@ static struct listen_stats *stats_for(st_table *table, struct inet_diag_msg *r)
 	struct listen_stats *stats;
 	size_t keylen;
 	size_t portlen = sizeof("65535");
-	struct sockaddr_storage ss = { 0 };
+	union any_addr sa = { 0 };
 	socklen_t len = sizeof(struct sockaddr_storage);
 	int rc;
 	int flags = NI_NUMERICHOST | NI_NUMERICSERV;
 
-	switch ((ss.ss_family = r->idiag_family)) {
+	switch ((sa.ss.ss_family = r->idiag_family)) {
 	case AF_INET: {
-		struct sockaddr_in *in = (struct sockaddr_in *)&ss;
-
-		in->sin_port = r->id.idiag_sport;
-		in->sin_addr.s_addr = r->id.idiag_src[0];
+		sa.in.sin_port = r->id.idiag_sport;
+		sa.in.sin_addr.s_addr = r->id.idiag_src[0];
 		keylen = INET_ADDRSTRLEN;
 		alloca_len = keylen + 1 + portlen;
 		key = alloca(alloca_len);
 		key[keylen] = 0; /* will be ':' later */
 		port = key + keylen + 1;
-		rc = getnameinfo((struct sockaddr *)&ss, len,
+		rc = getnameinfo(&sa.sa, len,
 				 key, keylen, port, portlen, flags);
 		break;
 		}
 	case AF_INET6: {
-		struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&ss;
-		in6->sin6_port = r->id.idiag_sport;
-		memcpy(&in6->sin6_addr, &r->id.idiag_src, sizeof(__be32[4]));
+		sa.in6.sin6_port = r->id.idiag_sport;
+		memcpy(&sa.in6.sin6_addr, &r->id.idiag_src, sizeof(__be32[4]));
 		keylen = INET6_ADDRSTRLEN;
 		          /* [            ] */
 		alloca_len = 1 + keylen + 1 + 1 + portlen;
@@ -211,7 +215,7 @@ static struct listen_stats *stats_for(st_table *table, struct inet_diag_msg *r)
 		*key = '[';
 		key[1 + keylen + 1] = 0; /* will be ':' later */
 		port = 1 + key + keylen + 1 + 1;
-		rc = getnameinfo((struct sockaddr *)&ss, len,
+		rc = getnameinfo(&sa.sa, len,
 				 key + 1, keylen, port, portlen, flags);
 		break;
 		}
@@ -227,7 +231,7 @@ static struct listen_stats *stats_for(st_table *table, struct inet_diag_msg *r)
 	keylen = strlen(key);
 	portlen = strlen(port);
 
-	switch (ss.ss_family) {
+	switch (sa.ss.ss_family) {
 	case AF_INET:
 		key[keylen] = ':';
 		memmove(key + keylen + 1, port, portlen + 1);
@@ -249,7 +253,7 @@ static struct listen_stats *stats_for(st_table *table, struct inet_diag_msg *r)
 
 	if (r->idiag_state == TCP_ESTABLISHED) {
 		int n = snprintf(key, alloca_len, "%s:%u",
-				 addr_any(ss.ss_family),
+				 addr_any(sa.ss.ss_family),
 				 ntohs(r->id.idiag_sport));
 		if (n <= 0) {
 			fprintf(stderr, "BUG: snprintf: %d\n", n);
@@ -433,7 +437,7 @@ out:
 }
 
 /* populates sockaddr_storage struct by parsing +addr+ */
-static void parse_addr(struct sockaddr_storage *inet, VALUE addr)
+static void parse_addr(union any_addr *inet, VALUE addr)
 {
 	char *host_ptr;
 	char *check;
@@ -449,7 +453,6 @@ static void parse_addr(struct sockaddr_storage *inet, VALUE addr)
 	host_ptr = StringValueCStr(addr);
 	host_len = RSTRING_LEN(addr);
 	if (*host_ptr == '[') { /* ipv6 address format (rfc2732) */
-		struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)inet;
 		rbracket = memchr(host_ptr + 1, ']', host_len - 1);
 
 		if (rbracket == NULL)
@@ -461,15 +464,14 @@ static void parse_addr(struct sockaddr_storage *inet, VALUE addr)
 		colon = rbracket + 1;
 		host_ptr++;
 		*rbracket = 0;
-		inet->ss_family = af = AF_INET6;
-		dst = &in6->sin6_addr;
-		portdst = &in6->sin6_port;
+		inet->ss.ss_family = af = AF_INET6;
+		dst = &inet->in6.sin6_addr;
+		portdst = &inet->in6.sin6_port;
 	} else { /* ipv4 */
-		struct sockaddr_in *in = (struct sockaddr_in *)inet;
 		colon = memchr(host_ptr, ':', host_len);
-		inet->ss_family = af = AF_INET;
-		dst = &in->sin_addr;
-		portdst = &in->sin_port;
+		inet->ss.ss_family = af = AF_INET;
+		dst = &inet->in.sin_addr;
+		portdst = &inet->in.sin_port;
 	}
 
 	if (!colon)
@@ -506,7 +508,7 @@ static void gen_bytecode_all(struct iovec *iov)
 }
 
 /* generates inet_diag bytecode to match a single addr */
-static void gen_bytecode(struct iovec *iov, struct sockaddr_storage *inet)
+static void gen_bytecode(struct iovec *iov, union any_addr *inet)
 {
 	struct inet_diag_bc_op *op;
 	struct inet_diag_hostcond *cond;
@@ -519,25 +521,22 @@ static void gen_bytecode(struct iovec *iov, struct sockaddr_storage *inet)
 	op->no = sizeof(struct inet_diag_bc_op) + OPLEN;
 
 	cond = (struct inet_diag_hostcond *)(op + 1);
-	cond->family = inet->ss_family;
-	switch (inet->ss_family) {
+	cond->family = inet->ss.ss_family;
+	switch (inet->ss.ss_family) {
 	case AF_INET: {
-		struct sockaddr_in *in = (struct sockaddr_in *)inet;
-
-		cond->port = ntohs(in->sin_port);
-		cond->prefix_len = in->sin_addr.s_addr == 0 ? 0 :
-				   sizeof(in->sin_addr.s_addr) * CHAR_BIT;
-		*cond->addr = in->sin_addr.s_addr;
+		cond->port = ntohs(inet->in.sin_port);
+		cond->prefix_len = inet->in.sin_addr.s_addr == 0 ? 0 :
+				   sizeof(inet->in.sin_addr.s_addr) * CHAR_BIT;
+		*cond->addr = inet->in.sin_addr.s_addr;
 		}
 		break;
 	case AF_INET6: {
-		struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)inet;
-
-		cond->port = ntohs(in6->sin6_port);
-		cond->prefix_len = memcmp(&in6addr_any, &in6->sin6_addr,
+		cond->port = ntohs(inet->in6.sin6_port);
+		cond->prefix_len = memcmp(&in6addr_any, &inet->in6.sin6_addr,
 				          sizeof(struct in6_addr)) == 0 ?
-				  0 : sizeof(in6->sin6_addr) * CHAR_BIT;
-		memcpy(&cond->addr, &in6->sin6_addr, sizeof(struct in6_addr));
+				  0 : sizeof(inet->in6.sin6_addr) * CHAR_BIT;
+		memcpy(&cond->addr, &inet->in6.sin6_addr,
+		       sizeof(struct in6_addr));
 		}
 		break;
 	default:
@@ -559,7 +558,7 @@ static void nl_errcheck(VALUE r)
 
 static VALUE tcp_stats(struct nogvl_args *args, VALUE addr)
 {
-	struct sockaddr_storage query_addr;
+	union any_addr query_addr;
 
 	parse_addr(&query_addr, addr);
 	gen_bytecode(&args->iov[2], &query_addr);
@@ -617,7 +616,7 @@ static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self)
 			return rv;
 		}
 		for (; --i >= 0; ary++) {
-			struct sockaddr_storage check;
+			union any_addr check;
 
 			parse_addr(&check, *ary);
 			rb_hash_aset(rv, *ary, Qtrue);

data/lib/raindrops.rb

@@ -12,7 +12,7 @@
 # Unlike many classes in this package, the core Raindrops class is
 # intended to be portable to all reasonably modern *nix systems
 # supporting mmap().  Please let us know if you have portability
-# issues, patches or pull requests at mailto:raindrops@librelist.com
+# issues, patches or pull requests at mailto:raindrops@librelist.org
 class Raindrops
 
   # Used to represent the number of +active+ and +queued+ sockets for

data/lib/raindrops/aggregate/last_data_recv.rb

@@ -46,7 +46,8 @@ module Raindrops::Aggregate::LastDataRecv
   # for accuracy.
   def self.extended(obj)
     obj.raindrops_aggregate = default_aggregate
-    obj.setsockopt Socket::SOL_TCP, tcp_defer_accept = 9, seconds = 60
+    # obj.setsockopt Socket::SOL_TCP, tcp_defer_accept = 9, seconds = 60
+    obj.setsockopt Socket::SOL_TCP, 9, 60
   end
 
   # :stopdoc:

data/lib/raindrops/aggregate/pmq.rb

@@ -229,11 +229,11 @@ class Raindrops::Aggregate::PMQ
   def outliers_high; aggregate.outliers_high; end
 
   # proxy for \Aggregate#to_s
-  def to_s(*args); aggregate.to_s *args; end
+  def to_s(*args); aggregate.to_s(*args); end
 
   # proxy for \Aggregate#each
-  def each; aggregate.each { |*args| yield *args }; end
+  def each; aggregate.each { |*args| yield(*args) }; end
 
   # proxy for \Aggregate#each_nonzero
-  def each_nonzero; aggregate.each_nonzero { |*args| yield *args }; end
+  def each_nonzero; aggregate.each_nonzero { |*args| yield(*args) }; end
 end

data/lib/raindrops/last_data_recv.rb

@@ -4,8 +4,8 @@ require "raindrops"
 # This is highly experimental!
 #
 # A self-contained Rack application for aggregating in the
-# +tcpi_last_data_recv+ field in +struct tcp_info+ if
-# /usr/include/linux/tcp.h.  This is only useful for \Linux 2.6 and later.
+# +tcpi_last_data_recv+ field in +struct+ +tcp_info+ defined in
+# +/usr/include/linux/tcp.h+.  This is only useful for \Linux 2.6 and later.
 # This primarily supports Unicorn and derived servers, but may also be
 # used with any Ruby web server using the core TCPServer class in Ruby.
 #

data/lib/raindrops/watcher.rb

@@ -72,19 +72,19 @@ require "aggregate"
 # - active_min - do not stream a line until this active count is reached
 # - queued_min - do not stream a line until this queued count is reached
 #
-# == Response headers (mostly the same as Raindrops::LastDataRecv)
+# == Response headers (mostly the same names as Raindrops::LastDataRecv)
 #
-# - X-Count   - number of requests received
+# - X-Count   - number of samples polled
 # - X-Last-Reset - date since the last reset
 #
 # The following headers are only present if X-Count is greater than one.
 #
-# - X-Min     - lowest last_data_recv time recorded (in milliseconds)
-# - X-Max     - highest last_data_recv time recorded (in milliseconds)
-# - X-Mean    - mean last_data_recv time recorded (rounded, in milliseconds)
-# - X-Std-Dev - standard deviation of last_data_recv times
-# - X-Outliers-Low - number of low outliers (hopefully many!)
-# - X-Outliers-High - number of high outliers (hopefully zero!)
+# - X-Min     - lowest number of connections recorded
+# - X-Max     - highest number of connections recorded
+# - X-Mean    - mean number of connections recorded
+# - X-Std-Dev - standard deviation of connection count
+# - X-Outliers-Low - number of low outliers (hopefully many for queued)
+# - X-Outliers-High - number of high outliers (hopefully zero for queued)
 #
 # = Demo Server
 #
@@ -228,6 +228,7 @@ class Raindrops::Watcher
   end
 
   def get(env)
+    retried = false
     case env["PATH_INFO"]
     when "/"
       index
@@ -247,7 +248,7 @@ class Raindrops::Watcher
       not_found
     end
     rescue Errno::EDOM
-      raise if defined?(retried)
+      raise if retried
       retried = true
       wait_snapshot
       retry

data/pkg.mk

@@ -69,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
@@ -167,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/raindrops.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.authors = ["raindrops hackers"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = readme_description
-  s.email = %q{raindrops@librelist.com}
+  s.email = %q{raindrops@librelist.org}
   s.extensions = %w(ext/raindrops/extconf.rb)
   s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest

data/test/ipv6_enabled.rb

@@ -5,6 +5,5 @@ def ipv6_enabled?
   rescue => e
     warn "skipping IPv6 tests, host does not seem to be IPv6 enabled:"
     warn "  #{e.class}: #{e}"
-    return false
-    ipv6_enabled = false
+    false
 end

data/test/test_aggregate_pmq.rb

@@ -49,7 +49,7 @@ class TestAggregatePMQ < Test::Unit::TestCase
         pmq.flush
       }
     }
-    workers.each { |pid| assert Process.waitpid2(pid).last.success? }
+    workers.each { |wpid| assert Process.waitpid2(wpid).last.success? }
     pmq.stop_master_loop
     assert Process.waitpid2(pid).last.success?
     assert_equal 400, pmq.count

data/test/test_linux.rb

@@ -11,6 +11,14 @@ class TestLinux < Test::Unit::TestCase
 
   TEST_ADDR = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
 
+  def setup
+    @to_close = []
+  end
+
+  def teardown
+    @to_close.each { |io| io.close unless io.closed? }
+  end
+
   def test_unix
     tmp = Tempfile.new("\xde\xad\xbe\xef") # valid path, really :)
     File.unlink(tmp.path)
@@ -20,19 +28,19 @@ class TestLinux < Test::Unit::TestCase
     assert_equal 0, stats[tmp.path].active
     assert_equal 0, stats[tmp.path].queued
 
-    uc0 = UNIXSocket.new(tmp.path)
+    @to_close << UNIXSocket.new(tmp.path)
     stats = unix_listener_stats([tmp.path])
     assert_equal 1, stats.size
     assert_equal 0, stats[tmp.path].active
     assert_equal 1, stats[tmp.path].queued
 
-    uc1 = UNIXSocket.new(tmp.path)
+    @to_close << UNIXSocket.new(tmp.path)
     stats = unix_listener_stats([tmp.path])
     assert_equal 1, stats.size
     assert_equal 0, stats[tmp.path].active
     assert_equal 2, stats[tmp.path].queued
 
-    ua0 = us.accept
+    @to_close << us.accept
     stats = unix_listener_stats([tmp.path])
     assert_equal 1, stats.size
     assert_equal 1, stats[tmp.path].active
@@ -43,17 +51,17 @@ class TestLinux < Test::Unit::TestCase
     tmp = Tempfile.new("\xde\xad\xbe\xef") # valid path, really :)
     File.unlink(tmp.path)
     us = UNIXServer.new(tmp.path)
-    uc0 = UNIXSocket.new(tmp.path)
+    @to_close << UNIXSocket.new(tmp.path)
     stats = unix_listener_stats
     assert_equal 0, stats[tmp.path].active
     assert_equal 1, stats[tmp.path].queued
 
-    uc1 = UNIXSocket.new(tmp.path)
+    @to_close << UNIXSocket.new(tmp.path)
     stats = unix_listener_stats
     assert_equal 0, stats[tmp.path].active
     assert_equal 2, stats[tmp.path].queued
 
-    ua0 = us.accept
+    @to_close << us.accept
     stats = unix_listener_stats
     assert_equal 1, stats[tmp.path].active
     assert_equal 1, stats[tmp.path].queued
@@ -69,13 +77,13 @@ class TestLinux < Test::Unit::TestCase
     assert_equal 0, stats[addr].queued
     assert_equal 0, stats[addr].active
 
-    c = TCPSocket.new(TEST_ADDR, port)
+    @to_close << TCPSocket.new(TEST_ADDR, port)
     stats = tcp_listener_stats(addrs)
     assert_equal 1, stats.size
     assert_equal 1, stats[addr].queued
     assert_equal 0, stats[addr].active
 
-    sc = s.accept
+    @to_close << s.accept
     stats = tcp_listener_stats(addrs)
     assert_equal 1, stats.size
     assert_equal 0, stats[addr].queued
@@ -93,13 +101,13 @@ class TestLinux < Test::Unit::TestCase
     assert_equal 0, stats[addr].queued
     assert_equal 0, stats[addr].active
 
-    c = TCPSocket.new(TEST_ADDR, port)
+    @to_close << TCPSocket.new(TEST_ADDR, port)
     stats = tcp_listener_stats(addrs, nlsock)
     assert_equal 1, stats.size
     assert_equal 1, stats[addr].queued
     assert_equal 0, stats[addr].active
 
-    sc = s.accept
+    @to_close << s.accept
     stats = tcp_listener_stats(addrs, nlsock)
     assert_equal 1, stats.size
     assert_equal 0, stats[addr].queued
@@ -121,7 +129,7 @@ class TestLinux < Test::Unit::TestCase
     assert_equal 0, stats[addr2].queued
     assert_equal 0, stats[addr2].active
 
-    c1 = TCPSocket.new(TEST_ADDR, port1)
+    @to_close << TCPSocket.new(TEST_ADDR, port1)
     stats = tcp_listener_stats(addrs)
     assert_equal 2, stats.size
     assert_equal 1, stats[addr1].queued
@@ -137,7 +145,7 @@ class TestLinux < Test::Unit::TestCase
     assert_equal 0, stats[addr2].queued
     assert_equal 0, stats[addr2].active
 
-    c2 = TCPSocket.new(TEST_ADDR, port2)
+    @to_close << TCPSocket.new(TEST_ADDR, port2)
     stats = tcp_listener_stats(addrs)
     assert_equal 2, stats.size
     assert_equal 0, stats[addr1].queued
@@ -145,7 +153,7 @@ class TestLinux < Test::Unit::TestCase
     assert_equal 1, stats[addr2].queued
     assert_equal 0, stats[addr2].active
 
-    c3 = TCPSocket.new(TEST_ADDR, port2)
+    @to_close << TCPSocket.new(TEST_ADDR, port2)
     stats = tcp_listener_stats(addrs)
     assert_equal 2, stats.size
     assert_equal 0, stats[addr1].queued
@@ -153,7 +161,7 @@ class TestLinux < Test::Unit::TestCase
     assert_equal 2, stats[addr2].queued
     assert_equal 0, stats[addr2].active
 
-    sc2 = s2.accept
+    @to_close << s2.accept
     stats = tcp_listener_stats(addrs)
     assert_equal 2, stats.size
     assert_equal 0, stats[addr1].queued
@@ -184,7 +192,7 @@ class TestLinux < Test::Unit::TestCase
       fork do
         rda.close
         wrb.close
-        socks = (1..nr_sock).map { s.accept }
+        @to_close.concat((1..nr_sock).map { s.accept })
         wra.syswrite('.')
         wra.close
         rdb.sysread(1) # wait for parent to nuke us
@@ -195,7 +203,7 @@ class TestLinux < Test::Unit::TestCase
       fork do
         rda.close
         wrb.close
-        socks = (1..nr_sock).map { TCPSocket.new(TEST_ADDR, port) }
+        @to_close.concat((1..nr_sock).map { TCPSocket.new(TEST_ADDR, port) })
         wra.syswrite('.')
         wra.close
         rdb.sysread(1) # wait for parent to nuke us
@@ -209,7 +217,7 @@ class TestLinux < Test::Unit::TestCase
     expect = { addr => Raindrops::ListenStats[nr_sock * nr_proc, 0] }
     assert_equal expect, stats
 
-    uno_mas = TCPSocket.new(TEST_ADDR, port)
+    @to_close << TCPSocket.new(TEST_ADDR, port)
     stats = tcp_listener_stats(addrs)
     expect = { addr => Raindrops::ListenStats[nr_sock * nr_proc, 1] }
     assert_equal expect, stats
@@ -221,6 +229,6 @@ class TestLinux < Test::Unit::TestCase
 
     wrb.syswrite('.' * (nr_proc * 2)) # broadcast a wakeup
     statuses = Process.waitall
-    statuses.each { |(pid,status)| assert status.success?, status.inspect }
+    statuses.each { |(_,status)| assert status.success?, status.inspect }
   end if ENV["STRESS"].to_i != 0
 end if RUBY_PLATFORM =~ /linux/

data/test/test_linux_ipv6.rb

@@ -22,13 +22,13 @@ class TestLinuxIPv6 < Test::Unit::TestCase
     assert_equal 0, stats[addr].queued
     assert_equal 0, stats[addr].active
 
-    c = TCPSocket.new(TEST_ADDR, port)
+    @to_close << TCPSocket.new(TEST_ADDR, port)
     stats = tcp_listener_stats(addrs)
     assert_equal 1, stats.size
     assert_equal 1, stats[addr].queued
     assert_equal 0, stats[addr].active
 
-    sc = s.accept
+    @to_close << s.accept
     stats = tcp_listener_stats(addrs)
     assert_equal 1, stats.size
     assert_equal 0, stats[addr].queued
@@ -48,7 +48,7 @@ class TestLinuxIPv6 < Test::Unit::TestCase
     assert_equal 0, stats[addr2].queued
     assert_equal 0, stats[addr2].active
 
-    c1 = TCPSocket.new(TEST_ADDR, port1)
+    @to_close << TCPSocket.new(TEST_ADDR, port1)
     stats = tcp_listener_stats(addrs)
     assert_equal 2, stats.size
     assert_equal 1, stats[addr1].queued
@@ -64,7 +64,7 @@ class TestLinuxIPv6 < Test::Unit::TestCase
     assert_equal 0, stats[addr2].queued
     assert_equal 0, stats[addr2].active
 
-    c2 = TCPSocket.new(TEST_ADDR, port2)
+    @to_close << TCPSocket.new(TEST_ADDR, port2)
     stats = tcp_listener_stats(addrs)
     assert_equal 2, stats.size
     assert_equal 0, stats[addr1].queued
@@ -72,7 +72,7 @@ class TestLinuxIPv6 < Test::Unit::TestCase
     assert_equal 1, stats[addr2].queued
     assert_equal 0, stats[addr2].active
 
-    c3 = TCPSocket.new(TEST_ADDR, port2)
+    @to_close << TCPSocket.new(TEST_ADDR, port2)
     stats = tcp_listener_stats(addrs)
     assert_equal 2, stats.size
     assert_equal 0, stats[addr1].queued
@@ -80,7 +80,7 @@ class TestLinuxIPv6 < Test::Unit::TestCase
     assert_equal 2, stats[addr2].queued
     assert_equal 0, stats[addr2].active
 
-    sc2 = s2.accept
+    @to_close << s2.accept
     stats = tcp_listener_stats(addrs)
     assert_equal 2, stats.size
     assert_equal 0, stats[addr1].queued
@@ -116,7 +116,7 @@ class TestLinuxIPv6 < Test::Unit::TestCase
       fork do
         rda.close
         wrb.close
-        socks = (1..nr_sock).map { s.accept }
+        @to_close.concat((1..nr_sock).map { s.accept })
         wra.syswrite('.')
         wra.close
         rdb.sysread(1) # wait for parent to nuke us
@@ -127,7 +127,7 @@ class TestLinuxIPv6 < Test::Unit::TestCase
       fork do
         rda.close
         wrb.close
-        socks = (1..nr_sock).map { TCPSocket.new(TEST_ADDR, port) }
+        @to_close.concat((1..nr_sock).map { TCPSocket.new(TEST_ADDR, port) })
         wra.syswrite('.')
         wra.close
         rdb.sysread(1) # wait for parent to nuke us
@@ -141,7 +141,7 @@ class TestLinuxIPv6 < Test::Unit::TestCase
     expect = { addr => Raindrops::ListenStats[nr_sock * nr_proc, 0] }
     assert_equal expect, stats
 
-    uno_mas = TCPSocket.new(TEST_ADDR, port)
+    @to_close << TCPSocket.new(TEST_ADDR, port)
     stats = tcp_listener_stats(addrs)
     expect = { addr => Raindrops::ListenStats[nr_sock * nr_proc, 1] }
     assert_equal expect, stats
@@ -153,6 +153,6 @@ class TestLinuxIPv6 < Test::Unit::TestCase
 
     wrb.syswrite('.' * (nr_proc * 2)) # broadcast a wakeup
     statuses = Process.waitall
-    statuses.each { |(pid,status)| assert status.success?, status.inspect }
+    statuses.each { |(_,status)| assert status.success?, status.inspect }
   end if ENV["STRESS"].to_i != 0
 end if RUBY_PLATFORM =~ /linux/ && ipv6_enabled?

data/test/test_linux_middleware.rb

@@ -11,12 +11,17 @@ class TestLinuxMiddleware < Test::Unit::TestCase
     @resp_headers = { 'Content-Type' => 'text/plain', 'Content-Length' => '0' }
     @response = [ 200, @resp_headers, [] ]
     @app = lambda { |env| @response }
+    @to_close = []
+  end
+
+  def teardown
+    @to_close.each { |io| io.close unless io.closed? }
   end
 
   def test_unix_listener
     tmp = Tempfile.new("")
     File.unlink(tmp.path)
-    us = UNIXServer.new(tmp.path)
+    @to_close << UNIXServer.new(tmp.path)
     app = Raindrops::Middleware.new(@app, :listeners => [tmp.path])
     linux_extra = "#{tmp.path} active: 0\n#{tmp.path} queued: 0\n"
     response = app.call("PATH_INFO" => "/_raindrops")
@@ -37,8 +42,8 @@ class TestLinuxMiddleware < Test::Unit::TestCase
   def test_unix_listener_queued
     tmp = Tempfile.new("")
     File.unlink(tmp.path)
-    us = UNIXServer.new(tmp.path)
-    uc = UNIXSocket.new(tmp.path)
+    @to_close << UNIXServer.new(tmp.path)
+    @to_close << UNIXSocket.new(tmp.path)
     app = Raindrops::Middleware.new(@app, :listeners => [tmp.path])
     linux_extra = "#{tmp.path} active: 0\n#{tmp.path} queued: 1\n"
     response = app.call("PATH_INFO" => "/_raindrops")

data/test/test_linux_tcp_info.rb

@@ -49,7 +49,7 @@ class TestLinuxTCP_Info < Test::Unit::TestCase
     s = TCPServer.new(TEST_ADDR, 0)
     c = TCPSocket.new TEST_ADDR, s.addr[1]
     c.syswrite "."
-    sleep delay
+    sleep(delay * 1.2)
     a = s.accept
     i = Raindrops::TCP_Info.new(a)
     assert i.last_data_recv >= delay_ms, "#{i.last_data_recv} < #{delay_ms}"

data/test/test_middleware_unicorn.rb

@@ -24,7 +24,7 @@ class TestMiddlewareUnicorn < Test::Unit::TestCase
     s = TCPSocket.new @host, @port
     s.write "GET /_raindrops HTTP/1.0\r\n\r\n"
     resp = s.read
-    head, body = resp.split /\r\n\r\n/, 2
+    _, body = resp.split(/\r\n\r\n/, 2)
     assert_match %r{^#@addr_regexp active: 1$}, body
     assert_match %r{^#@addr_regexp queued: 0$}, body
   end

data/test/test_middleware_unicorn_ipv6.rb

@@ -24,7 +24,7 @@ class TestMiddlewareUnicornIPv6 < Test::Unit::TestCase
     s = TCPSocket.new @host, @port
     s.write "GET /_raindrops HTTP/1.0\r\n\r\n"
     resp = s.read
-    head, body = resp.split /\r\n\r\n/, 2
+    _, body = resp.split(/\r\n\r\n/, 2)
     assert_match %r{^#@addr_regexp active: 1$}, body
     assert_match %r{^#@addr_regexp queued: 0$}, body
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: raindrops
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - raindrops hackers
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +00:00
-default_executable: 
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -41,7 +40,7 @@ description: |-
   Rubinius on platforms supporting POSIX shared memory.  It may also be
   used as a generic scoreboard for sharing atomic counters across multiple
   processes.
-email: raindrops@librelist.com
+email: raindrops@librelist.org
 executables: []
 
 extensions: 
@@ -123,7 +122,6 @@ files:
 - test/test_raindrops_gc.rb
 - test/test_struct.rb
 - test/test_watcher.rb
-has_rdoc: true
 homepage: http://raindrops.bogomips.org/
 licenses: []
 
@@ -156,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.6.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: real-time stats for preforking Rack servers