raindrops 0.11.0 → 0.12.0

data/.wrongdoc.yml

@@ -2,3 +2,5 @@
 cgit_url: http://bogomips.org/raindrops.git
 git_url: git://bogomips.org/raindrops.git
 rdoc_url: http://raindrops.bogomips.org/
+public_email: raindrops@librelist.org
+private_email: raindrops@bogomips.org

data/GIT-VERSION-GEN

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

data/README

@@ -2,10 +2,10 @@
 
 Raindrops is a real-time stats toolkit to show statistics for Rack HTTP
 servers.  It is designed for preforking servers such as Rainbows! and
-Unicorn, but should support any Rack HTTP server under Ruby 1.9, 1.8 and
-Rubinius on platforms supporting POSIX shared memory.  It may also be
-used as a generic scoreboard for sharing atomic counters across multiple
-processes.
+Unicorn, but should support any Rack HTTP server under Ruby 2.0, 1.9,
+1.8 and Rubinius on platforms supporting POSIX shared memory.  It may
+also be used as a generic scoreboard for sharing atomic counters across
+multiple processes.
 
 == Features
 

data/ext/raindrops/extconf.rb

@@ -20,6 +20,7 @@ int main(int argc, char * const argv[]) {
         unsigned long i = 0;
         __sync_lock_test_and_set(&i, 0);
         __sync_lock_test_and_set(&i, 1);
+        __sync_bool_compare_and_swap(&i, 0, 1);
         __sync_add_and_fetch(&i, argc);
         __sync_sub_and_fetch(&i, argc);
         return 0;
@@ -30,7 +31,17 @@ SRC
     $defs.push(format("-DHAVE_GCC_ATOMIC_BUILTINS"))
     true
   else
-    false
+    # some compilers still target 386 by default, but we need at least 486
+    # to run atomic builtins.
+    prev_cflags = $CFLAGS
+    $CFLAGS += " -march=i486 "
+    if try_link(src)
+      $defs.push(format("-DHAVE_GCC_ATOMIC_BUILTINS"))
+      true
+    else
+      prev_cflags = $CFLAGS
+      false
+    end
   end
 end or have_header('atomic_ops.h') or abort <<-SRC
 

data/ext/raindrops/linux_inet_diag.c

@@ -586,8 +586,6 @@ static VALUE tcp_stats(struct nogvl_args *args, VALUE addr)
  */
 static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self)
 {
-	VALUE *ary;
-	long i;
 	VALUE rv = rb_hash_new();
 	struct nogvl_args args;
 	VALUE addrs, sock;
@@ -610,20 +608,26 @@ static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self)
 	case T_STRING:
 		rb_hash_aset(rv, addrs, tcp_stats(&args, addrs));
 		return rv;
-	case T_ARRAY:
-		ary = RARRAY_PTR(addrs);
-		i = RARRAY_LEN(addrs);
-		if (i == 1) {
-			rb_hash_aset(rv, *ary, tcp_stats(&args, *ary));
+	case T_ARRAY: {
+		long i;
+		long len = RARRAY_LEN(addrs);
+		VALUE cur;
+
+		if (len == 1) {
+			cur = rb_ary_entry(addrs, 0);
+
+			rb_hash_aset(rv, cur, tcp_stats(&args, cur));
 			return rv;
 		}
-		for (; --i >= 0; ary++) {
+		for (i = 0; i < len; i++) {
 			union any_addr check;
+			VALUE cur = rb_ary_entry(addrs, i);
 
-			parse_addr(&check, *ary);
-			rb_hash_aset(rv, *ary, Qtrue);
+			parse_addr(&check, cur);
+			rb_hash_aset(rv, cur, Qtrue);
 		}
 		/* fall through */
+	}
 	case T_NIL:
 		args.table = st_init_strtable();
 		gen_bytecode_all(&args.iov[2]);

data/test/test_watcher.rb

@@ -154,7 +154,12 @@ class TestWatcher < Test::Unit::TestCase
     assert_equal before, headers["X-Last-Peak-At"], headers.inspect
 
     @ios << @srv.accept
-    assert_raises(Errno::EAGAIN) { @srv.accept_nonblock }
+    begin
+      @srv.accept_nonblock
+      assert false, "we should not get here"
+    rescue => e
+      assert_kind_of Errno::EAGAIN, e
+    end
     sleep 0.1
     env = @req.class.env_for "/queued/#@addr.txt"
     status, headers, body = @app.call(env.dup)

metadata

@@ -2,7 +2,7 @@
 name: !binary |-
   cmFpbmRyb3Bz
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: !binary |-
@@ -133,13 +133,13 @@ description: ! 'Raindrops is a real-time stats toolkit to show statistics for Ra
 
   servers.  It is designed for preforking servers such as Rainbows! and
 
-  Unicorn, but should support any Rack HTTP server under Ruby 1.9, 1.8 and
+  Unicorn, but should support any Rack HTTP server under Ruby 2.0, 1.9,
 
-  Rubinius on platforms supporting POSIX shared memory.  It may also be
+  1.8 and Rubinius on platforms supporting POSIX shared memory.  It may
 
-  used as a generic scoreboard for sharing atomic counters across multiple
+  also be used as a generic scoreboard for sharing atomic counters across
 
-  processes.'
+  multiple processes.'
 email: !binary |-
   cmFpbmRyb3BzQGxpYnJlbGlzdC5vcmc=
 executables: []