raindrops 0.10.0 → 0.11.0

data/.gitignore

@@ -13,5 +13,4 @@ Makefile
 /doc
 /LATEST
 /tmp
-# http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
-/Gemfile.lock
+/.rbx

data/GIT-VERSION-GEN

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

data/ext/raindrops/linux_inet_diag.c

@@ -70,8 +70,8 @@ static ID id_new;
 
 struct listen_stats {
 	uint32_t active;
-	uint32_t listener_p:1;
-	uint32_t queued:31;
+	uint32_t queued;
+	uint32_t listener_p;
 };
 
 #define OPLEN (sizeof(struct inet_diag_bc_op) + \
@@ -189,7 +189,7 @@ 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");
-	union any_addr sa = { 0 };
+	union any_addr sa;
 	socklen_t len = sizeof(struct sockaddr_storage);
 	int rc;
 	int flags = NI_NUMERICHOST | NI_NUMERICSERV;

data/ext/raindrops/linux_tcp_info.c

@@ -131,6 +131,7 @@ void Init_raindrops_linux_tcp_info(void)
 	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)

data/ext/raindrops/raindrops.c

@@ -326,11 +326,13 @@ void Init_raindrops_linux_inet_diag(void);
 void Init_raindrops_linux_tcp_info(void);
 #endif
 
-#ifndef _SC_NPROCESSORS_ONLN
-#  ifdef _SC_NPROC_ONLN
-#    define _SC_NPROCESSORS_ONLN _SC_NPROC_ONLN
+#ifndef _SC_NPROCESSORS_CONF
+#  if defined _SC_NPROCESSORS_ONLN
+#    define _SC_NPROCESSORS_CONF _SC_NPROCESSORS_ONLN
+#  elif defined _SC_NPROC_ONLN
+#    define _SC_NPROCESSORS_CONF _SC_NPROC_ONLN
 #  elif defined _SC_CRAY_NCPU
-#    define _SC_NPROCESSORS_ONLN _SC_CRAY_NCPU
+#    define _SC_NPROCESSORS_CONF _SC_CRAY_NCPU
 #  endif
 #endif
 
@@ -359,8 +361,8 @@ void Init_raindrops_ext(void)
 	VALUE cRaindrops = rb_define_class("Raindrops", rb_cObject);
 	long tmp = 2;
 
-#ifdef _SC_NPROCESSORS_ONLN
-	tmp = sysconf(_SC_NPROCESSORS_ONLN);
+#ifdef _SC_NPROCESSORS_CONF
+	tmp = sysconf(_SC_NPROCESSORS_CONF);
 #endif
 	/* no point in padding on single CPU machines */
 	if (tmp == 1)

data/lib/raindrops/watcher.rb

@@ -260,7 +260,7 @@ class Raindrops::Watcher
       headers.map { |k,v|
         "<tr><td>#{k.gsub(/^X-/, '')}</td><td>#{v}</td></tr>"
       }.join << "</table><pre>#{escape_html agg}</pre>" \
-      "<form action='/reset/#{escape addr}' method='post'>" \
+      "<form action='../reset/#{escape addr}' method='post'>" \
       "<input type='submit' name='x' value='reset' /></form>" \
       "</body>"
     headers["Content-Type"] = "text/html"
@@ -323,7 +323,7 @@ class Raindrops::Watcher
     res = Rack::Response.new
     url = req.referer || "#{req.host_with_port}/"
     res.redirect(url)
-    res.content_type.replace "text/plain"
+    res["Content-Type"] = "text/plain"
     res.write "Redirecting to #{url}"
     res.finish
   end
@@ -346,14 +346,14 @@ class Raindrops::Watcher
       end.map do |addr,stats|
         e_addr = escape addr
         "<tr>" \
-          "<td><a href='/tail/#{e_addr}.txt' " \
+          "<td><a href='tail/#{e_addr}.txt' " \
             "title='&quot;tail&quot; output in real time'" \
             ">#{escape_html addr}</a></td>" \
-          "<td><a href='/active/#{e_addr}.html' " \
+          "<td><a href='active/#{e_addr}.html' " \
             "title='show active connection stats'>#{stats.active}</a></td>" \
-          "<td><a href='/queued/#{e_addr}.html' " \
+          "<td><a href='queued/#{e_addr}.html' " \
             "title='show queued connection stats'>#{stats.queued}</a></td>" \
-          "<td><form action='/reset/#{e_addr}' method='post'>" \
+          "<td><form action='reset/#{e_addr}' method='post'>" \
             "<input title='reset statistics' " \
               "type='submit' name='x' value='x' /></form></td>" \
         "</tr>" \

data/raindrops.gemspec

@@ -22,7 +22,11 @@ Gem::Specification.new do |s|
   s.rdoc_options = rdoc_options
   s.rubyforge_project = %q{rainbows}
   s.test_files = test_files
-  s.add_development_dependency('bundler', '~> 1.0.10')
+  s.add_development_dependency('aggregate', '~> 0.2')
+  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.licenses = %w(LGPLv3) # accessor not compatible with older RubyGems
 end

data/test/test_linux_tcp_info.rb

@@ -12,6 +12,7 @@ class TestLinuxTCP_Info < Test::Unit::TestCase
   # Linux kernel commit 5ee3afba88f5a79d0bff07ddd87af45919259f91
   TCP_INFO_useful_listenq = `uname -r`.strip >= '2.6.24'
 
+
   def test_tcp_server
     s = TCPServer.new(TEST_ADDR, 0)
     rv = Raindrops::TCP_Info.new s
@@ -23,6 +24,11 @@ class TestLinuxTCP_Info < Test::Unit::TestCase
     a = s.accept
     tmp = Raindrops::TCP_Info.new s
     assert_equal 0, tmp.unacked
+    before = tmp.object_id
+
+    tmp.get!(s)
+    assert_equal before, tmp.object_id
+
     ensure
       c.close if c
       a.close if a
@@ -35,6 +41,7 @@ class TestLinuxTCP_Info < Test::Unit::TestCase
     tcp_info_methods = tmp.methods - Object.new.methods
     assert tcp_info_methods.size >= 32
     tcp_info_methods.each do |m|
+      next if m.to_sym == :get!
       val = tmp.__send__ m
       assert_kind_of Integer, val
       assert val >= 0

metadata

@@ -1,51 +1,152 @@
---- !ruby/object:Gem::Specification 
-name: raindrops
-version: !ruby/object:Gem::Version 
-  hash: 55
+--- !ruby/object:Gem::Specification
+name: !binary |-
+  cmFpbmRyb3Bz
+version: !ruby/object:Gem::Version
+  version: 0.11.0
   prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
 platform: ruby
-authors: 
-- raindrops hackers
+authors:
+- !binary |-
+  cmFpbmRyb3BzIGhhY2tlcnM=
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
+date: 2013-04-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: !binary |-
+    YWdncmVnYXRl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MC4y
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MC4y
+- !ruby/object:Gem::Dependency
+  name: !binary |-
+    aW8tZXh0cmE=
+  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
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
-        version: 1.0.10
+    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
-  version_requirements: *id001
-description: |-
-  Raindrops is a real-time stats toolkit to show statistics for Rack HTTP
+  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
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS4y
+- !ruby/object:Gem::Dependency
+  name: !binary |-
+    dW5pY29ybg==
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        Pj0=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MC45OA==
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        Pj0=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MC45OA==
+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 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: raindrops@librelist.org
-executables: []
 
-extensions: 
-- ext/raindrops/extconf.rb
-extra_rdoc_files: 
+  processes.'
+email: !binary |-
+  cmFpbmRyb3BzQGxpYnJlbGlzdC5vcmc=
+executables: []
+extensions:
+- !binary |-
+  ZXh0L3JhaW5kcm9wcy9leHRjb25mLnJi
+extra_rdoc_files:
 - README
 - LICENSE
 - NEWS
@@ -63,7 +164,7 @@ extra_rdoc_files:
 - ext/raindrops/raindrops.c
 - ext/raindrops/linux_inet_diag.c
 - ext/raindrops/linux_tcp_info.c
-files: 
+files:
 - .document
 - .gitignore
 - .manifest
@@ -73,7 +174,6 @@ files:
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
-- Gemfile
 - LATEST
 - LICENSE
 - NEWS
@@ -124,41 +224,34 @@ files:
 - test/test_watcher.rb
 homepage: http://raindrops.bogomips.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -t
 - raindrops - real-time stats for preforking Rack servers
 - -W
 - http://bogomips.org/raindrops.git/tree/%s
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: rainbows
-rubygems_version: 1.8.24
+rubyforge_project: !binary |-
+  cmFpbmJvd3M=
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: real-time stats for preforking Rack servers
-test_files: 
+test_files:
 - test/test_aggregate_pmq.rb
 - test/test_inet_diag_socket.rb
 - test/test_last_data_recv_unicorn.rb

data/Gemfile

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