raindrops 0.13.0 → 0.19.2

data/test/test_linux_all_tcp_listen_stats_leak.rb

@@ -37,7 +37,7 @@ def test_leak
     end
     cur_kb = rss_kb
     p [ :cur_kb, cur_kb ]
-    ensure
-      s.close
+  ensure
+    s.close
   end
 end if ENV["STRESS"].to_i != 0

data/test/test_linux_ipv6.rb

@@ -12,6 +12,14 @@ class TestLinuxIPv6 < Test::Unit::TestCase
 
   TEST_ADDR = ENV["TEST_HOST6"] || "::1"
 
+  def setup
+    @to_close = []
+  end
+
+  def teardown
+    @to_close.each { |io| io.close unless io.closed? }
+  end
+
   def test_tcp
     s = TCPServer.new(TEST_ADDR, 0)
     port = s.addr[1]

data/test/test_raindrops.rb

@@ -134,7 +134,7 @@ def test_resize_mremap
     assert_equal 0, rd[rd.capa - 1]
     assert_equal 1, rd.incr(rd.capa - 1)
     assert_raises(ArgumentError) { rd[rd.capa] }
-    rescue RangeError
+  rescue RangeError
   end # if RUBY_PLATFORM =~ /linux/
 
   def test_evaporate

data/test/{test_linux_tcp_info.rb → test_tcp_info.rb}

@@ -5,15 +5,15 @@
 require 'socket'
 require 'pp'
 $stderr.sync = $stdout.sync = true
-class TestLinuxTCP_Info < Test::Unit::TestCase
+class TestTCP_Info < Test::Unit::TestCase
 
   TEST_ADDR = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
 
   # Linux kernel commit 5ee3afba88f5a79d0bff07ddd87af45919259f91
   TCP_INFO_useful_listenq = `uname -r`.strip >= '2.6.24'
 
-
-  def test_tcp_server
+  def test_tcp_server_unacked
+    return if RUBY_PLATFORM !~ /linux/ # unacked not implemented on others...
     s = TCPServer.new(TEST_ADDR, 0)
     rv = Raindrops::TCP_Info.new s
     c = TCPSocket.new TEST_ADDR, s.addr[1]
@@ -29,10 +29,8 @@ def test_tcp_server
     tmp.get!(s)
     assert_equal before, tmp.object_id
 
-    ensure
-      c.close if c
-      a.close if a
-      s.close
+  ensure
+    [ c, a, s ].compact.each(&:close)
   end
 
   def test_accessors
@@ -42,12 +40,14 @@ def test_accessors
     assert tcp_info_methods.size >= 32
     tcp_info_methods.each do |m|
       next if m.to_sym == :get!
+      next if ! tmp.respond_to?(m)
       val = tmp.__send__ m
       assert_kind_of Integer, val
       assert val >= 0
     end
-    ensure
-      s.close
+    assert tmp.respond_to?(:state), 'every OS knows about TCP state, right?'
+  ensure
+    s.close
   end
 
   def test_tcp_server_delayed
@@ -60,9 +60,29 @@ def test_tcp_server_delayed
     a = s.accept
     i = Raindrops::TCP_Info.new(a)
     assert i.last_data_recv >= delay_ms, "#{i.last_data_recv} < #{delay_ms}"
-    ensure
-      c.close if c
-      a.close if a
-      s.close
+  ensure
+    c.close if c
+    a.close if a
+    s.close
+  end
+
+  def test_tcp_server_state_closed
+    s = TCPServer.new(TEST_ADDR, 0)
+    c = TCPSocket.new(TEST_ADDR, s.addr[1])
+    i = Raindrops::TCP_Info.allocate
+    a = s.accept
+    i.get!(a)
+    state = i.state
+    if Raindrops.const_defined?(:TCP)
+      assert_equal state, Raindrops::TCP[:ESTABLISHED]
+    end
+    c = c.close
+    sleep(0.01) # wait for kernel to update state
+    i.get!(a)
+    assert_not_equal state, i.state
+  ensure
+    s.close if s
+    c.close if c
+    a.close if a
   end
-end if RUBY_PLATFORM =~ /linux/
+end if defined? Raindrops::TCP_Info

data/test/test_watcher.rb

@@ -2,6 +2,11 @@
 require "test/unit"
 require "rack"
 require "raindrops"
+begin
+  require 'aggregate'
+rescue LoadError => e
+  warn "W: #{e} skipping #{__FILE__}"
+end
 
 class TestWatcher < Test::Unit::TestCase
   TEST_ADDR = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
@@ -113,28 +118,28 @@ def test_tail_queued_min
 
   def test_x_current_header
     env = @req.class.env_for "/active/#@addr.txt"
-    status, headers, body = @app.call(env)
+    _status, headers, _body = @app.call(env)
     assert_equal "0", headers["X-Current"], headers.inspect
 
     env = @req.class.env_for "/queued/#@addr.txt"
-    status, headers, body = @app.call(env)
+    _status, headers, _body = @app.call(env)
     assert_equal "1", headers["X-Current"], headers.inspect
 
     @ios << @srv.accept
     sleep 0.1
 
     env = @req.class.env_for "/queued/#@addr.txt"
-    status, headers, body = @app.call(env)
+    _status, headers, _body = @app.call(env)
     assert_equal "0", headers["X-Current"], headers.inspect
 
     env = @req.class.env_for "/active/#@addr.txt"
-    status, headers, body = @app.call(env)
+    _status, headers, _body = @app.call(env)
     assert_equal "1", headers["X-Current"], headers.inspect
   end
 
   def test_peaks
     env = @req.class.env_for "/active/#@addr.txt"
-    status, headers, body = @app.call(env.dup)
+    _status, headers, _body = @app.call(env.dup)
     start = headers["X-First-Peak-At"]
     assert headers["X-First-Peak-At"], headers.inspect
     assert headers["X-Last-Peak-At"], headers.inspect
@@ -143,14 +148,14 @@ def test_peaks
     before = headers["X-Last-Peak-At"]
 
     env = @req.class.env_for "/queued/#@addr.txt"
-    status, headers, body = @app.call(env)
+    _status, headers, _body = @app.call(env)
     assert_nothing_raised { Time.parse(headers["X-First-Peak-At"]) }
     assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) }
     assert_equal before, headers["X-Last-Peak-At"], "should not change"
 
     sleep 2
     env = @req.class.env_for "/active/#@addr.txt"
-    status, headers, body = @app.call(env.dup)
+    _status, headers, _body = @app.call(env.dup)
     assert_equal before, headers["X-Last-Peak-At"], headers.inspect
 
     @ios << @srv.accept
@@ -162,7 +167,7 @@ def test_peaks
     end
     sleep 0.1
     env = @req.class.env_for "/queued/#@addr.txt"
-    status, headers, body = @app.call(env.dup)
+    _status, headers, _body = @app.call(env.dup)
     assert headers["X-Last-Peak-At"], headers.inspect
     assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) }
     assert before != headers["X-Last-Peak-At"]
@@ -172,10 +177,10 @@ def test_peaks
     sleep 2
 
     env = @req.class.env_for "/queued/#@addr.txt"
-    status, headers, body = @app.call(env)
+    _status, headers, _body = @app.call(env)
     assert_equal "0", headers["X-Current"]
     assert_nothing_raised { Time.parse(headers["X-Last-Peak-At"]) }
     assert_equal queued_before, headers["X-Last-Peak-At"], "should not change"
     assert_equal start, headers["X-First-Peak-At"]
   end
-end if RUBY_PLATFORM =~ /linux/
+end if RUBY_PLATFORM =~ /linux/ && defined?(Aggregate)

metadata

@@ -1,207 +1,101 @@
 --- !ruby/object:Gem::Specification
-name: !binary |-
-  cmFpbmRyb3Bz
+name: raindrops
 version: !ruby/object:Gem::Version
-  version: 0.13.0
-  prerelease: 
+  version: 0.19.2
 platform: ruby
 authors:
-- !binary |-
-  cmFpbmRyb3BzIGhhY2tlcnM=
+- raindrops hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    YWdncmVnYXRl
+  name: aggregate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4y
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4y
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    aW8tZXh0cmE=
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4y
-    - - !binary |-
-        Pj0=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4yLjM=
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - !binary |-
-        fj4=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4y
-    - - !binary |-
-        Pj0=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4yLjM=
-- !ruby/object:Gem::Dependency
-  name: !binary |-
-    cG9zaXhfbXE=
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - !binary |-
-        fj4=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4w
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - !binary |-
-        fj4=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4w
-- !ruby/object:Gem::Dependency
-  name: !binary |-
-    cmFjaw==
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - !binary |-
-        fj4=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4y
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4y
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    dW5pY29ybg==
+  name: posix_mq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        Pj0=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC45OA==
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        Pj0=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC45OA==
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    d3Jvbmdkb2M=
+  name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42LjI=
-    - - !binary |-
-        Pj0=
+        version: '1.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42LjI=
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42LjI=
-    - - !binary |-
-        Pj0=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42LjI=
-description: ! '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 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.'
-email: !binary |-
-  cmFpbmRyb3BzQGxpYnJlbGlzdC5vcmc=
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: |-
+  raindrops is a real-time stats toolkit to show statistics for Rack HTTP
+  servers.  It is designed for preforking servers such as unicorn, but
+  should support any Rack HTTP server on platforms supporting POSIX shared
+  memory.  It may also be used as a generic scoreboard for sharing atomic
+  counters across multiple processes.
+email: raindrops-public@yhbt.net
 executables: []
 extensions:
-- !binary |-
-  ZXh0L3JhaW5kcm9wcy9leHRjb25mLnJi
+- ext/raindrops/extconf.rb
 extra_rdoc_files:
 - README
 - LICENSE
 - NEWS
-- ChangeLog
-- lib/raindrops.rb
-- lib/raindrops/aggregate.rb
-- lib/raindrops/aggregate/last_data_recv.rb
-- lib/raindrops/aggregate/pmq.rb
-- lib/raindrops/last_data_recv.rb
-- lib/raindrops/linux.rb
-- lib/raindrops/middleware.rb
-- lib/raindrops/middleware/proxy.rb
-- lib/raindrops/struct.rb
-- lib/raindrops/watcher.rb
 - ext/raindrops/raindrops.c
 - ext/raindrops/linux_inet_diag.c
-- ext/raindrops/linux_tcp_info.c
+- ext/raindrops/tcp_info.c
 files:
-- .document
-- .gitignore
-- .manifest
-- .wrongdoc.yml
+- ".document"
+- ".gitattributes"
+- ".gitignore"
+- ".manifest"
+- ".olddoc.yml"
 - COPYING
-- ChangeLog
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
@@ -209,19 +103,21 @@ files:
 - LICENSE
 - NEWS
 - README
-- Rakefile
 - TODO
+- archive/.gitignore
+- archive/slrnpull.conf
 - examples/linux-listener-stats.rb
 - examples/middleware.ru
 - examples/watcher.ru
 - examples/watcher_demo.ru
+- examples/yahns.conf.rb
 - examples/zbatery.conf.rb
 - ext/raindrops/extconf.rb
 - ext/raindrops/linux_inet_diag.c
-- ext/raindrops/linux_tcp_info.c
 - ext/raindrops/my_fileno.h
 - ext/raindrops/raindrops.c
 - ext/raindrops/raindrops_atomic.h
+- ext/raindrops/tcp_info.c
 - lib/raindrops.rb
 - lib/raindrops/aggregate.rb
 - lib/raindrops/aggregate/last_data_recv.rb
@@ -245,44 +141,36 @@ files:
 - test/test_linux_all_tcp_listen_stats_leak.rb
 - test/test_linux_ipv6.rb
 - test/test_linux_middleware.rb
-- test/test_linux_tcp_info.rb
 - test/test_middleware.rb
 - test/test_middleware_unicorn.rb
 - test/test_middleware_unicorn_ipv6.rb
 - test/test_raindrops.rb
 - test/test_raindrops_gc.rb
 - test/test_struct.rb
+- test/test_tcp_info.rb
 - test/test_watcher.rb
-homepage: http://raindrops.bogomips.org/
+homepage: https://yhbt.net/raindrops/
 licenses:
-- !binary |-
-  TEdQTHYyLjEr
+- LGPL-2.1+
+metadata: {}
 post_install_message: 
-rdoc_options:
-- -t
-- raindrops - real-time stats for preforking Rack servers
-- -W
-- http://bogomips.org/raindrops.git/tree/%s
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: !binary |-
-  cmFpbmJvd3M=
-rubygems_version: 1.8.23
+rubygems_version: 3.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: real-time stats for preforking Rack servers
 test_files:
 - test/test_aggregate_pmq.rb
@@ -293,11 +181,11 @@ test_files:
 - test/test_linux_all_tcp_listen_stats_leak.rb
 - test/test_linux_ipv6.rb
 - test/test_linux_middleware.rb
-- test/test_linux_tcp_info.rb
 - test/test_middleware.rb
 - test/test_middleware_unicorn.rb
 - test/test_middleware_unicorn_ipv6.rb
 - test/test_raindrops.rb
 - test/test_raindrops_gc.rb
 - test/test_struct.rb
+- test/test_tcp_info.rb
 - test/test_watcher.rb