raindrops 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0af4113866b77c7647e455f5d1fe195dbc332187
-  data.tar.gz: 44ec9c3ce3460d29a1eddb7276c90af906de335e
+  metadata.gz: 0632eff3853589bfe99f749a3db3d12fa991220a
+  data.tar.gz: 19c74eeede4492633f1e3b189b24e4a085fbe40f
 SHA512:
-  metadata.gz: 6cb3d104e6bdd3b7d0ff11b079f9d67d0f67023e03be3f04f262323dafe89dd04c46468dafc56b5f2b25890474f7fbd031b53c805a3830b5a93f2db7948fff6c
-  data.tar.gz: 31a20c3c91f156822f1091a759ed576d57dc4fffd53deda79eff3b382e46d90bce9f92030e870e0386d3ec768a51ee72e566150b3ec2800c87e1f8ac8d1d537b
+  metadata.gz: a818ad3da0618365d832b5979de131a6fbafe3737877e4a4e95891b993ae6f0c90fd8938cb60494c95cd8ffaf67dd75a017549878f46739442f2739512f3b272
+  data.tar.gz: 00b463e110ee126cfbda005af3b6f20c084120428aea74982795b1102dcab9487b461b35834cf3a71885c7d11fea29a3a1596d7f010e93e5210b376c5f6cad96

data/.gitattributes

@@ -0,0 +1,4 @@
+*.gemspec diff=ruby
+*.rb diff=ruby
+*.ru diff=ruby
+Rakefile diff=ruby

data/.olddoc.yml

@@ -5,3 +5,5 @@ rdoc_url: http://raindrops.bogomips.org/
 public_email: raindrops-public@bogomips.org
 private_email: raindrops@bogomips.org
 ml_url: http://bogomips.org/raindrops-public/
+nntp_url:
+  - nntp://news.public-inbox.org/inbox.comp.lang.ruby.raindrops

data/GIT-VERSION-GEN

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

data/README

@@ -37,12 +37,15 @@ and "tcp_diag" kernel modules are loaded as they do not autoload correctly
 
 == Install
 
-We recommend GCC 4+ (or compatible) to support the
-{atomic builtins}[http://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html]
-(__sync_{add,sub}_and_fetch()).  For non-GCC 4+ users, we also support
-compilation with the
-{libatomic_ops}[http://www.hpl.hp.com/research/linux/atomic_ops/]
-package starting with Raindrops 0.4.0.
+We recommend GCC 4+ (or compatible) to support the __sync builtins
+(__sync_{add,sub}_and_fetch()):
+
+http://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html
+
+For non-GCC 4+ users, we also support compilation with the libatomic_ops
+package starting with Raindrops 0.4.0:
+
+https://github.com/ivmai/libatomic_ops
 
 If you're using a packaged Ruby distribution, make sure you have a C
 compiler and the matching Ruby development libraries and headers.
@@ -74,7 +77,7 @@ You can get the latest source via git from the following locations:
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://bogomips.org/raindrops.git (cgit)
+* http://bogomips.org/raindrops.git
 * http://repo.or.cz/w/raindrops.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are
@@ -86,13 +89,14 @@ git itself.  See the Documentation/SubmittingPatches document
 distributed with git on on patch submission guidelines to follow.  Just
 don't email the git mailing list or maintainer with raindrops patches.
 
-raindrops is licensed under the LGPL+2.1 or later:
+raindrops is licensed under the LGPL-2.1+
 
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull
 requests) go to the mailing list: mailto:raindrops-public@bogomips.org
 
-Mailing list archives are available here:
+Mailing list archives are available over HTTP and NNTP:
 
 http://bogomips.org/raindrops-public/
+nntp://news.public-inbox.org/inbox.comp.lang.ruby.raindrops

data/ext/raindrops/extconf.rb

@@ -47,7 +47,7 @@
 end or have_header('atomic_ops.h') or abort <<-SRC
 
 libatomic_ops is required if GCC 4+ is not used.
-See http://www.hpl.hp.com/research/linux/atomic_ops/
+See https://github.com/ivmai/libatomic_ops
 
 Users of Debian-based distros may run:
 

data/ext/raindrops/linux_inet_diag.c

@@ -618,6 +618,13 @@ static VALUE tcp_stats(struct nogvl_args *args, VALUE addr)
 	return rb_listen_stats(&args->stats);
 }
 
+static int drop_placeholders(st_data_t k, st_data_t v, st_data_t ign)
+{
+	if ((VALUE)v == Qtrue)
+		return ST_DELETE;
+	return ST_CONTINUE;
+}
+
 /*
  * call-seq:
  *      Raindrops::Linux.tcp_listener_stats([addrs[, sock]]) => hash
@@ -658,10 +665,9 @@ static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self)
 	case T_ARRAY: {
 		long i;
 		long len = RARRAY_LEN(addrs);
-		VALUE cur;
 
 		if (len == 1) {
-			cur = rb_ary_entry(addrs, 0);
+			VALUE cur = rb_ary_entry(addrs, 0);
 
 			rb_hash_aset(rv, cur, tcp_stats(&args, cur));
 			return rv;
@@ -671,7 +677,7 @@ static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self)
 			VALUE cur = rb_ary_entry(addrs, i);
 
 			parse_addr(&check, cur);
-			rb_hash_aset(rv, cur, Qtrue);
+			rb_hash_aset(rv, cur, Qtrue /* placeholder */);
 		}
 		/* fall through */
 	}
@@ -689,6 +695,9 @@ static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self)
 	st_foreach(args.table, NIL_P(addrs) ? st_to_hash : st_AND_hash, rv);
 	st_free_table(args.table);
 
+	if (RHASH_SIZE(rv) > 1)
+		rb_hash_foreach(rv, drop_placeholders, Qfalse);
+
 	/* let GC deal with corner cases */
 	if (argc < 2) rb_io_close(sock);
 	return rv;

data/lib/raindrops/aggregate/last_data_recv.rb

@@ -13,10 +13,6 @@
 # - Kgio::TCPServer#kgio_accept
 # - Kgio::TCPServer#kgio_tryaccept
 module Raindrops::Aggregate::LastDataRecv
-  # :stopdoc:
-  TCP_Info = Raindrops::TCP_Info
-  # :startdoc:
-
   # The integer value of +last_data_recv+ is sent to this object.
   # This is usually a duck type compatible with the \Aggregate class,
   # but can be *anything* that accepts the *<<* method.
@@ -78,7 +74,7 @@ def accept_nonblock
   # +last_data_recv+ to be accurate
   def count!(io)
     if io
-      x = TCP_Info.new(io)
+      x = Raindrops::TCP_Info.new(io)
       @raindrops_aggregate << x.last_data_recv
     end
     io

data/lib/raindrops/linux.rb

@@ -8,7 +8,6 @@
 # Instead of snapshotting, Raindrops::Aggregate::LastDataRecv may be used
 # to aggregate statistics from +all+ accepted sockets as they arrive
 # based on the +last_data_recv+ field in Raindrops::TCP_Info
-require 'pathname'
 
 module Raindrops::Linux
 
@@ -46,7 +45,8 @@ def unix_listener_stats(paths = nil)
         path.force_encoding(Encoding::BINARY) if defined?(Encoding)
         if File.symlink?(path)
           link = path
-          path = Pathname.new(link).realpath.to_s
+          path = File.readlink(link)
+          path.force_encoding(Encoding::BINARY) if defined?(Encoding)
           rv[link] = rv[path] # vivify ListenerStats
         else
           rv[path] # vivify ListenerStats

data/lib/raindrops/middleware.rb

@@ -77,11 +77,9 @@ class Raindrops::Middleware
   # and both counters are updated atomically.
   #
   # This is supported on all operating systems supported by Raindrops
-  class Stats < Raindrops::Struct.new(:calling, :writing)
-  end
+  Stats = Raindrops::Struct.new(:calling, :writing)
 
   # :stopdoc:
-  PATH_INFO = "PATH_INFO"
   require "raindrops/middleware/proxy"
   # :startdoc:
 
@@ -111,7 +109,7 @@ def initialize(app, opts = {})
 
   # standard Rack endpoint
   def call(env) # :nodoc:
-    env[PATH_INFO] == @path and return stats_response
+    env['PATH_INFO'] == @path and return stats_response
     begin
       @stats.incr_calling
 

data/pkg.mk

@@ -86,7 +86,7 @@ fix-perms:
 gem: $(pkggem)
 
 install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
+	gem install --local $(CURDIR)/$<
 
 $(pkggem): manifest fix-perms
 	gem build $(rfpackage).gemspec

data/raindrops.gemspec

@@ -24,7 +24,6 @@
   s.add_development_dependency('io-extra', [ '~> 1.2', '>= 1.2.3'])
   s.add_development_dependency('posix_mq', '~> 2.0')
   s.add_development_dependency('rack', '~> 1.2')
-  s.add_development_dependency('unicorn', '>= 0.98')
   s.add_development_dependency('olddoc', '~> 1.0')
 
   s.licenses = %w(LGPL-2.1+)

data/test/test_linux.rb

@@ -214,6 +214,13 @@ def test_tcp_multi
     assert_equal 0, stats[addr1].active
     assert_equal 1, stats[addr2].queued
     assert_equal 1, stats[addr2].active
+
+    # make sure we don't leave "true" placeholders in results if a
+    # listener becomes invalid (even momentarily).
+    s2.close
+    stats = tcp_listener_stats(addrs)
+    assert stats.values.all? { |x| x.instance_of?(Raindrops::ListenStats) },
+      "placeholders left: #{stats.inspect}"
   end
 
   # tries to overflow buffers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raindrops
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - raindrops hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aggregate
@@ -86,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: unicorn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.98'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.98'
 - !ruby/object:Gem::Dependency
   name: olddoc
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +129,7 @@ extra_rdoc_files:
 - ext/raindrops/linux_tcp_info.c
 files:
 - ".document"
+- ".gitattributes"
 - ".gitignore"
 - ".manifest"
 - ".olddoc.yml"
@@ -219,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: real-time stats for preforking Rack servers