raindrops 0.16.0 → 0.20.0

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 @@ class TestWatcher < Test::Unit::TestCase
 
   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 @@ class TestWatcher < Test::Unit::TestCase
     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 @@ class TestWatcher < Test::Unit::TestCase
     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 @@ class TestWatcher < Test::Unit::TestCase
     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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raindrops
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.20.0
 platform: ruby
 authors:
 - raindrops hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aggregate
@@ -38,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: io-extra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: posix_mq
   requirement: !ruby/object:Gem::Requirement
@@ -76,37 +56,29 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: olddoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        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@bogomips.org
+email: raindrops-public@yhbt.net
 executables: []
 extensions:
 - ext/raindrops/extconf.rb
@@ -114,19 +86,9 @@ extra_rdoc_files:
 - README
 - LICENSE
 - NEWS
-- 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"
 - ".gitattributes"
@@ -148,13 +110,14 @@ files:
 - 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
@@ -178,15 +141,15 @@ 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:
 - LGPL-2.1+
 metadata: {}
@@ -198,15 +161,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: real-time stats for preforking Rack servers
@@ -219,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

data/ext/raindrops/linux_tcp_info.c

@@ -1,173 +0,0 @@
-#if defined(__linux__) && defined(HAVE_LINUX_TCP_H)
-#include <ruby.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <linux/tcp.h>
-#ifdef TCP_INFO
-#include "my_fileno.h"
-
-#define TCPI_ATTR_READER(x) \
-static VALUE tcp_info_##x(VALUE self) \
-{ \
-	struct tcp_info *info = DATA_PTR(self); \
-	return UINT2NUM((uint32_t)info->tcpi_##x); \
-}
-
-TCPI_ATTR_READER(state)
-TCPI_ATTR_READER(ca_state)
-TCPI_ATTR_READER(retransmits)
-TCPI_ATTR_READER(probes)
-TCPI_ATTR_READER(backoff)
-TCPI_ATTR_READER(options)
-TCPI_ATTR_READER(snd_wscale)
-TCPI_ATTR_READER(rcv_wscale)
-TCPI_ATTR_READER(rto)
-TCPI_ATTR_READER(ato)
-TCPI_ATTR_READER(snd_mss)
-TCPI_ATTR_READER(rcv_mss)
-TCPI_ATTR_READER(unacked)
-TCPI_ATTR_READER(sacked)
-TCPI_ATTR_READER(lost)
-TCPI_ATTR_READER(retrans)
-TCPI_ATTR_READER(fackets)
-TCPI_ATTR_READER(last_data_sent)
-TCPI_ATTR_READER(last_ack_sent)
-TCPI_ATTR_READER(last_data_recv)
-TCPI_ATTR_READER(last_ack_recv)
-TCPI_ATTR_READER(pmtu)
-TCPI_ATTR_READER(rcv_ssthresh)
-TCPI_ATTR_READER(rtt)
-TCPI_ATTR_READER(rttvar)
-TCPI_ATTR_READER(snd_ssthresh)
-TCPI_ATTR_READER(snd_cwnd)
-TCPI_ATTR_READER(advmss)
-TCPI_ATTR_READER(reordering)
-TCPI_ATTR_READER(rcv_rtt)
-TCPI_ATTR_READER(rcv_space)
-TCPI_ATTR_READER(total_retrans)
-
-static VALUE alloc(VALUE klass)
-{
-	struct tcp_info *info = xmalloc(sizeof(struct tcp_info));
-
-	/* Data_Make_Struct has an extra memset 0 which is so wasteful */
-	return Data_Wrap_Struct(klass, NULL, -1, info);
-}
-
-/*
- * call-seq:
- *
- *	Raindrops::TCP_Info.new(tcp_socket)	-> TCP_Info object
- *
- * Reads a TCP_Info object from any given +tcp_socket+.  See the tcp(7)
- * manpage and /usr/include/linux/tcp.h for more details.
- */
-static VALUE init(VALUE self, VALUE io)
-{
-	int fd = my_fileno(io);
-	struct tcp_info *info = DATA_PTR(self);
-	socklen_t len = (socklen_t)sizeof(struct tcp_info);
-	int rc = getsockopt(fd, IPPROTO_TCP, TCP_INFO, info, &len);
-
-	if (rc != 0)
-		rb_sys_fail("getsockopt");
-
-	return self;
-}
-
-void Init_raindrops_linux_tcp_info(void)
-{
-	VALUE cRaindrops = rb_const_get(rb_cObject, rb_intern("Raindrops"));
-	VALUE cTCP_Info;
-
-	/*
-	 * Document-class: Raindrops::TCP_Info
-	 *
-	 * This is used to wrap "struct tcp_info" as described in tcp(7)
-	 * and /usr/include/linux/tcp.h.  The following readers methods
-	 * are defined corresponding to the "tcpi_" fields in the
-	 * tcp_info struct.
-	 *
-	 * In particular, the +last_data_recv+ field is useful for measuring
-	 * the amount of time a client spent in the listen queue before
-	 * +accept()+, but only if +TCP_DEFER_ACCEPT+ is used with the
-	 * listen socket (it is on by default in Unicorn).
-	 *
-	 * - state
-	 * - ca_state
-	 * - retransmits
-	 * - probes
-	 * - backoff
-	 * - options
-	 * - snd_wscale
-	 * - rcv_wscale
-	 * - rto
-	 * - ato
-	 * - snd_mss
-	 * - rcv_mss
-	 * - unacked
-	 * - sacked
-	 * - lost
-	 * - retrans
-	 * - fackets
-	 * - last_data_sent
-	 * - last_ack_sent
-	 * - last_data_recv
-	 * - last_ack_recv
-	 * - pmtu
-	 * - rcv_ssthresh
-	 * - rtt
-	 * - rttvar
-	 * - snd_ssthresh
-	 * - snd_cwnd
-	 * - advmss
-	 * - reordering
-	 * - rcv_rtt
-	 * - rcv_space
-	 * - total_retrans
-	 *
-	 * http://kernel.org/doc/man-pages/online/pages/man7/tcp.7.html
-	 */
-	cTCP_Info = rb_define_class_under(cRaindrops, "TCP_Info", rb_cObject);
-	rb_define_alloc_func(cTCP_Info, alloc);
-	rb_define_private_method(cTCP_Info, "initialize", init, 1);
-	rb_define_method(cTCP_Info, "get!", init, 1);
-
-#define TCPI_DEFINE_METHOD(x) \
-	rb_define_method(cTCP_Info, #x, tcp_info_##x, 0)
-
-	TCPI_DEFINE_METHOD(state);
-	TCPI_DEFINE_METHOD(ca_state);
-	TCPI_DEFINE_METHOD(retransmits);
-	TCPI_DEFINE_METHOD(probes);
-	TCPI_DEFINE_METHOD(backoff);
-	TCPI_DEFINE_METHOD(options);
-	TCPI_DEFINE_METHOD(snd_wscale);
-	TCPI_DEFINE_METHOD(rcv_wscale);
-	TCPI_DEFINE_METHOD(rto);
-	TCPI_DEFINE_METHOD(ato);
-	TCPI_DEFINE_METHOD(snd_mss);
-	TCPI_DEFINE_METHOD(rcv_mss);
-	TCPI_DEFINE_METHOD(unacked);
-	TCPI_DEFINE_METHOD(sacked);
-	TCPI_DEFINE_METHOD(lost);
-	TCPI_DEFINE_METHOD(retrans);
-	TCPI_DEFINE_METHOD(fackets);
-	TCPI_DEFINE_METHOD(last_data_sent);
-	TCPI_DEFINE_METHOD(last_ack_sent);
-	TCPI_DEFINE_METHOD(last_data_recv);
-	TCPI_DEFINE_METHOD(last_ack_recv);
-	TCPI_DEFINE_METHOD(pmtu);
-	TCPI_DEFINE_METHOD(rcv_ssthresh);
-	TCPI_DEFINE_METHOD(rtt);
-	TCPI_DEFINE_METHOD(rttvar);
-	TCPI_DEFINE_METHOD(snd_ssthresh);
-	TCPI_DEFINE_METHOD(snd_cwnd);
-	TCPI_DEFINE_METHOD(advmss);
-	TCPI_DEFINE_METHOD(reordering);
-	TCPI_DEFINE_METHOD(rcv_rtt);
-	TCPI_DEFINE_METHOD(rcv_space);
-	TCPI_DEFINE_METHOD(total_retrans);
-}
-#endif /* TCP_INFO */
-#endif /* defined(__linux__) && defined(HAVE_LINUX_TCP_H) */