raindrops 0.2.0 → 0.3.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -53,7 +53,7 @@ NEWS: GIT-VERSION-FILE
 latest: NEWS
 	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' $<
 
-SINCE = 0.1.0
+SINCE = 0.2.1
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)
@@ -181,6 +181,7 @@ publish_doc:
 	$(MAKE) -s latest > doc/LATEST
 	find doc/images doc/js -type f | \
 		TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css
+	tar cf - $$(git ls-files examples/) | (cd doc && tar xf -)
 	$(MAKE) doc_gz
 	chmod 644 $$(find doc -type f)
 	$(RSYNC) -av doc/ raindrops.bogomips.org:/srv/raindrops/

data/LICENSE

@@ -1,12 +1,14 @@
 raindrops is copyrighted Free Software by all contributors, see logs in
 revision control for names and email addresses of all of them.
 
-You can redistribute it and/or modify it under either the terms of the GNU
-Lesser General Public License as published by the Free Software Foundation,
-version 3.0 {LGPLv3}[http://www.gnu.org/licenses/lgpl-3.0.txt] (see
-link:COPYING).
+You can redistribute it and/or modify it under the terms of the GNU
+Lesser General Public License (LGPL) as published by the Free Software
+Foundation, version {2.1}[http://www.gnu.org/licenses/lgpl-2.1.txt] or
+or {3}[http://www.gnu.org/licenses/lgpl-3.0.txt] (see link:COPYING).
+The raindrops project leader (Eric Wong) reserves the right to
+relicense raindrops under future versions of the LGPL.
 
-posix_mq is distributed in the hope that it will be useful, but WITHOUT
+raindrops is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.

data/examples/linux-tcp-listener-stats.rb

@@ -5,7 +5,8 @@
 
 require 'raindrops'
 require 'optparse'
-usage = "Usage: #$0 [--loop] ADDR..."
+require 'ipaddr'
+usage = "Usage: #$0 [-d delay] ADDR..."
 ARGV.size > 0 or abort usage
 delay = false
 
@@ -19,6 +20,21 @@ opts = OptionParser.new('', 24, '  ') do |opts|
   opts.parse! ARGV
 end
 
+ARGV.each do |addr|
+  addr =~ %r{\A(127\..+):(\d+)\z} or next
+  host, port = $1, $2
+  hex_port = '%X' % port.to_i
+  ip_addr = IPAddr.new(host)
+  hex_host = ip_addr.hton.each_byte.inject('') { |s,o| s << '%02X' % o }
+  socks = File.readlines('/proc/net/tcp')
+  hex_addr = "#{hex_host}:#{hex_port}"
+  if socks.grep(/^\s+\d+:\s+#{hex_addr}\s+/).empty? &&
+     ! socks.grep(/^\s+\d+:\s+00000000:#{hex_port}\s+/).empty?
+    warn "W: #{host}:#{port} (#{hex_addr}) not found in /proc/net/tcp"
+    warn "W: Did you mean 0.0.0.0:#{port}?"
+  end
+end
+
 fmt = "% 19s % 10u % 10u\n"
 printf fmt.tr('u','s'), *%w(address active queued)
 

data/ext/raindrops/linux_inet_diag.c

@@ -77,7 +77,7 @@ struct listen_stats {
 
 struct nogvl_args {
 	struct iovec iov[3]; /* last iov holds inet_diag bytecode */
-	struct my_addr addrs;
+	struct my_addr query_addr;
 	struct listen_stats stats;
 };
 
@@ -271,8 +271,8 @@ static VALUE tcp_stats(struct nogvl_args *args, VALUE addr)
 	const char *err;
 	VALUE verr;
 
-	parse_addr(&args->addrs, addr);
-	gen_bytecode(&args->iov[2], &args->addrs);
+	parse_addr(&args->query_addr, addr);
+	gen_bytecode(&args->iov[2], &args->query_addr);
 
 	verr = rb_thread_blocking_region(diag, args, RUBY_UBF_IO, 0);
 	err = (const char *)verr;

data/lib/raindrops.rb

@@ -1,8 +1,8 @@
 # -*- encoding: binary -*-
 class Raindrops
 
-  # Raindrops is currently at version 0.2.0
-  VERSION = '0.2.0'
+  # Raindrops is currently at version 0.3.0
+  VERSION = '0.3.0'
 
   # Used to represent the number of +active+ and +queued+ sockets for
   # a single listen socket across all threads and processes on a

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: raindrops
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - raindrops hackers
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 +00:00
+date: 2010-07-10 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -77,21 +83,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: real-time stats for preforking Rack servers