raindrops 0.5.0 → 0.6.0

data/GIT-VERSION-GEN

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

data/examples/zbatery.conf.rb

@@ -8,6 +8,6 @@ log_dir = "/var/log/zbatery"
 if File.writable?(log_dir) && File.directory?(log_dir)
   stderr_path "#{log_dir}/raindrops-demo.stderr.log"
   stdout_path "#{log_dir}/raindrops-demo.stdout.log"
-  user "www-data", "www-data"
   listen "/tmp/.raindrops"
+  pid "/tmp/.raindrops.pid"
 end

data/ext/raindrops/extconf.rb

@@ -1,5 +1,6 @@
 require 'mkmf'
 
+dir_config('atomic_ops')
 have_func('mmap', 'sys/mman.h') or abort 'mmap() not found'
 have_func('munmap', 'sys/mman.h') or abort 'munmap() not found'
 
@@ -8,8 +9,8 @@ have_func('mremap', 'sys/mman.h')
 
 $CPPFLAGS += " -D_BSD_SOURCE -D_XOPEN_SOURCE=600 "
 have_func("getpagesize", "unistd.h")
-have_func("rb_struct_alloc_noinit")
 have_func('rb_thread_blocking_region')
+have_func('rb_thread_io_blocking_region')
 
 checking_for "GCC 4+ atomic builtins" do
   src = <<SRC
@@ -43,6 +44,4 @@ Users of Debian-based distros may run:
 
   apt-get install libatomic-ops-dev
 SRC
-
-dir_config('raindrops')
 create_makefile('raindrops_ext')

data/ext/raindrops/linux_inet_diag.c

@@ -15,6 +15,7 @@
 /* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION
 #  include <rubysig.h>
+#  define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
 typedef void rb_unblock_function_t(void *);
 typedef VALUE rb_blocking_function_t(void *);
 static VALUE
@@ -32,12 +33,18 @@ rb_thread_blocking_region(
 }
 #endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
 
+#ifndef HAVE_RB_THREAD_IO_BLOCKING_REGION
+#  define rb_thread_io_blocking_region(fn,data,fd) \
+      rb_thread_blocking_region((fn),(data),RUBY_UBF_IO,0)
+#endif /* HAVE_RB_THREAD_IO_BLOCKING_REGION */
+
 #include <assert.h>
 #include <errno.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <string.h>
 #include <asm/types.h>
 #include <netinet/in.h>
@@ -69,6 +76,21 @@ struct nogvl_args {
 	int fd;
 };
 
+#ifdef SOCK_CLOEXEC
+#  define my_SOCK_RAW (SOCK_RAW|SOCK_CLOEXEC)
+#  define FORCE_CLOEXEC(v) (v)
+#else
+#  define my_SOCK_RAW SOCK_RAW
+static VALUE FORCE_CLOEXEC(VALUE io)
+{
+	int fd = my_fileno(io);
+	int flags = fcntl(fd, F_SETFD, FD_CLOEXEC);
+	if (flags == -1)
+		rb_sys_fail("fcntl(F_SETFD, FD_CLOEXEC)");
+	return io;
+}
+#endif
+
 /*
  * call-seq:
  *	Raindrops::InetDiagSocket.new	-> Socket
@@ -78,11 +100,12 @@ struct nogvl_args {
 static VALUE ids_s_new(VALUE klass)
 {
 	VALUE argv[3];
+
 	argv[0] = INT2NUM(AF_NETLINK);
-	argv[1] = INT2NUM(SOCK_RAW);
+	argv[1] = INT2NUM(my_SOCK_RAW);
 	argv[2] = INT2NUM(NETLINK_INET_DIAG);
 
-	return rb_call_super(3, argv);
+	return FORCE_CLOEXEC(rb_call_super(3, argv));
 }
 
 /* creates a Ruby ListenStats Struct based on our internal listen_stats */
@@ -180,8 +203,7 @@ static struct listen_stats *stats_for(st_table *table, struct inet_diag_msg *r)
 	case AF_INET6: {
 		struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&ss;
 		in6->sin6_port = r->id.idiag_sport;
-		memcpy(&in6->sin6_addr.in6_u.u6_addr32,
-		       &r->id.idiag_src, sizeof(__be32[4]));
+		memcpy(&in6->sin6_addr, &r->id.idiag_src, sizeof(__be32[4]));
 		keylen = INET6_ADDRSTRLEN;
 		          /* [            ] */
 		alloca_len = 1 + keylen + 1 + 1 + portlen;
@@ -543,7 +565,7 @@ static VALUE tcp_stats(struct nogvl_args *args, VALUE addr)
 	gen_bytecode(&args->iov[2], &query_addr);
 
 	memset(&args->stats, 0, sizeof(struct listen_stats));
-	nl_errcheck(rb_thread_blocking_region(diag, args, 0, 0));
+	nl_errcheck(rb_thread_io_blocking_region(diag, args, args->fd));
 
 	return rb_listen_stats(&args->stats);
 }
@@ -610,7 +632,7 @@ static VALUE tcp_listener_stats(int argc, VALUE *argv, VALUE self)
 		         "addr must be an array of strings, a string, or nil");
 	}
 
-	nl_errcheck(rb_thread_blocking_region(diag, &args, NULL, 0));
+	nl_errcheck(rb_thread_io_blocking_region(diag, &args, args.fd));
 
 	st_foreach(args.table, NIL_P(addrs) ? st_to_hash : st_AND_hash, rv);
 	st_free_table(args.table);

data/lib/raindrops/watcher.rb

@@ -35,28 +35,28 @@ require "aggregate"
 # Returns a plain text summary + histogram with X-* HTTP headers for
 # active connections.
 #
-# e.g.: curl http://example.com/active/0.0.0.0%3A80.txt
+# e.g.: curl http://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.txt
 #
 # === GET /active/$LISTENER.html
 #
 # Returns an HTML summary + histogram with X-* HTTP headers for
 # active connections.
 #
-# e.g.: curl http://example.com/active/0.0.0.0%3A80.html
+# e.g.: curl http://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.html
 #
 # === GET /queued/$LISTENER.txt
 #
 # Returns a plain text summary + histogram with X-* HTTP headers for
 # queued connections.
 #
-# e.g.: curl http://example.com/queued/0.0.0.0%3A80.txt
+# e.g.: curl http://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.txt
 #
 # === GET /queued/$LISTENER.html
 #
 # Returns an HTML summary + histogram with X-* HTTP headers for
 # queued connections.
 #
-# e.g.: curl http://example.com/queued/0.0.0.0%3A80.html
+# e.g.: curl http://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.html
 #
 # === GET /tail/$LISTENER.txt?active_min=1&queued_min=1
 #
@@ -90,7 +90,7 @@ require "aggregate"
 #
 # There is a server running this app at http://raindrops-demo.bogomips.org/
 # The Raindrops::Middleware demo is also accessible at
-#   http://raindrops-demo.bogomips.org/_raindrops
+# http://raindrops-demo.bogomips.org/_raindrops
 #
 # The demo server is only limited to 30 users, so be sure not to abuse it
 # by using the /tail/ endpoint too much.
@@ -99,6 +99,7 @@ class Raindrops::Watcher
   attr_reader :snapshot
   include Rack::Utils
   include Raindrops::Linux
+  DOC_URL = "http://raindrops.bogomips.org/Raindrops/Watcher.html"
 
   def initialize(opts = {})
     @tcp_listeners = @unix_listeners = nil
@@ -167,14 +168,14 @@ class Raindrops::Watcher
   def active_stats(addr) # :nodoc:
     @lock.synchronize do
       tmp = @active[addr] or return
-      [ @resets[addr], tmp.dup ]
+      [ @snapshot[0], @resets[addr], tmp.dup ]
     end
   end
 
   def queued_stats(addr) # :nodoc:
     @lock.synchronize do
       tmp = @queued[addr] or return
-      [ @resets[addr], tmp.dup ]
+      [ @snapshot[0], @resets[addr], tmp.dup ]
     end
   end
 
@@ -199,16 +200,17 @@ class Raindrops::Watcher
   end
 
   def histogram_txt(agg)
-    reset_at, agg = *agg
+    updated_at, reset_at, agg = *agg
     headers = agg_to_hash(reset_at, agg)
     body = agg.to_s
     headers["Content-Type"] = "text/plain"
+    headers["Expires"] = (updated_at + @delay).httpdate
     headers["Content-Length"] = bytesize(body).to_s
     [ 200, headers, [ body ] ]
   end
 
   def histogram_html(agg, addr)
-    reset_at, agg = *agg
+    updated_at, reset_at, agg = *agg
     headers = agg_to_hash(reset_at, agg)
     body = "<html>" \
       "<head><title>#{hostname} - #{escape_html addr}</title></head>" \
@@ -220,6 +222,7 @@ class Raindrops::Watcher
       "<input type='submit' name='x' value='reset' /></form>" \
       "</body>"
     headers["Content-Type"] = "text/html"
+    headers["Expires"] = (updated_at + @delay).httpdate
     headers["Content-Length"] = bytesize(body).to_s
     [ 200, headers, [ body ] ]
   end
@@ -259,7 +262,7 @@ class Raindrops::Watcher
     when %r{\A/reset/(.+)\z}
       reset!(env, unescape($1))
     else
-      Rack::Response.new(["Not Found"], 404).finish
+      not_found
     end
   end
 
@@ -285,6 +288,7 @@ class Raindrops::Watcher
     headers = {
       "Content-Type" => "text/html",
       "Last-Modified" => updated_at.httpdate,
+      "Expires" => (updated_at + @delay).httpdate,
     }
     body = "<html><head>" \
       "<title>#{hostname} - all interfaces</title>" \
@@ -295,13 +299,24 @@ class Raindrops::Watcher
       all.map do |addr,stats|
         e_addr = escape addr
         "<tr>" \
-          "<td><a href='/tail/#{e_addr}.txt'>#{escape_html addr}</a></td>" \
-          "<td><a href='/active/#{e_addr}.html'>#{stats.active}</a></td>" \
-          "<td><a href='/queued/#{e_addr}.html'>#{stats.queued}</a></td>" \
+          "<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' " \
+            "title='show active connection stats'>#{stats.active}</a></td>" \
+          "<td><a href='/queued/#{e_addr}.html' " \
+            "title='show queued connection stats'>#{stats.queued}</a></td>" \
           "<td><form action='/reset/#{e_addr}' method='post'>" \
-            "<input type='submit' name='x' value='x' /></form></td>" \
+            "<input title='reset statistics' " \
+              "type='submit' name='x' value='x' /></form></td>" \
         "</tr>" \
-      end.join << "</table></body></html>"
+      end.join << "</table>" \
+      "<p>" \
+        "This is running the #{self.class}</a> service, see " \
+        "<a href='#{DOC_URL}'>#{DOC_URL}</a> " \
+        "for more information and options." \
+      "</p>" \
+      "</body></html>"
     headers["Content-Length"] = bytesize(body).to_s
     [ 200, headers, [ body ] ]
   end
@@ -309,7 +324,6 @@ class Raindrops::Watcher
   def tail(addr, env)
     Tailer.new(self, addr, env).finish
   end
-  # :startdoc:
 
   # This is the response body returned for "/tail/$ADDRESS.txt".  This
   # must use a multi-threaded Rack server with streaming response support.
@@ -333,7 +347,11 @@ class Raindrops::Watcher
     end
 
     def finish
-      headers = { "Content-Type" => "text/plain" }
+      headers = {
+        "Content-Type" => "text/plain",
+        "Cache-Control" => "no-transform",
+        "Expires" => Time.at(0).httpdate,
+      }
       headers["Transfer-Encoding"] = "chunked" if @chunk
       [ 200, headers, self ]
     end
@@ -353,10 +371,11 @@ class Raindrops::Watcher
     end
   end
 
-  # shuts down the background thread
+  # shuts down the background thread, only for tests
   def shutdown
     @socket = nil
     @thr.join if @thr
     @thr = nil
   end
+  # :startdoc:
 end

data/test/test_inet_diag_socket.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
 require 'test/unit'
 require 'raindrops'
+require 'fcntl'
 $stderr.sync = $stdout.sync = true
 
 class TestInetDiagSocket < Test::Unit::TestCase
@@ -8,6 +9,8 @@ class TestInetDiagSocket < Test::Unit::TestCase
     sock = Raindrops::InetDiagSocket.new
     assert_kind_of Socket, sock
     assert_kind_of Fixnum, sock.fileno
+    flags = sock.fcntl(Fcntl::F_GETFD)
+    assert_equal Fcntl::FD_CLOEXEC, flags & Fcntl::FD_CLOEXEC
     assert_nil sock.close
   end
 end if RUBY_PLATFORM =~ /linux/

data/test/test_watcher.rb

@@ -50,6 +50,20 @@ class TestWatcher < Test::Unit::TestCase
     check_headers(resp.headers)
   end
 
+  def test_queued_txt
+    resp = @req.get "/queued/#@addr.txt"
+    assert_equal 200, resp.status.to_i
+    assert_equal "text/plain", resp.headers["Content-Type"]
+    check_headers(resp.headers)
+  end
+
+  def test_queued_html
+    resp = @req.get "/queued/#@addr.html"
+    assert_equal 200, resp.status.to_i
+    assert_equal "text/html", resp.headers["Content-Type"]
+    check_headers(resp.headers)
+  end
+
   def test_reset
     resp = @req.post "/reset/#@addr"
     assert_equal 302, resp.status.to_i

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: raindrops
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
-  version: 0.5.0
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - raindrops hackers
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +00:00
+date: 2011-03-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 0
+        - 10
         version: 1.0.10
   type: :development
   version_requirements: *id001
@@ -130,17 +140,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.6.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: real-time stats for preforking Rack servers