raindrops 0.18.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b8dbbea0d1ec6311fe4433caa527f1ca5483f63b
-  data.tar.gz: e89d864999d618bc1c93df83569d7326924dfa74
+SHA256:
+  metadata.gz: 6f78e29ec57e3f3710146a423cf60915d23a5f4366d70dcabbbef74fb69f71f3
+  data.tar.gz: 8a369d49c33a67af3b6acccaf64b04ed192cba9d163c8d48944cfac887511885
 SHA512:
-  metadata.gz: fe837f974b975b0582c9a86d041acd823dc78b83aaffc2d35bb721d6da2544a6771fbf53d3ea8a2db6240b0ef05d463bd9572e85375f3600227f08fd44fb6cdd
-  data.tar.gz: 9b380c94a516fbb9df57773f19722314a5c294810ed7f0e4b3027e7a3581c6aefcb0c6f5d5326c4400024e55cf856350e396e37934c781042098297239baafb4
+  metadata.gz: b9e5de8e7a7a84038bbe19a954d3d559ebec3ed4c7f68db2e2ada6373b045f4fbcd784c5d5b91005cad1d87f1db93f9dc31c9f7fc59ae56a7f73b98d9a96bf2e
+  data.tar.gz: 9913e9205b2527b9f5bd1bae58b0c2c8962505e87280c06257f603fb722978d6656c99cfa0a297ccd0734a7d6110b0a6ecd5155fec9870ec40a31044a00def4d

data/.olddoc.yml

@@ -1,14 +1,16 @@
 ---
-cgit_url: https://bogomips.org/raindrops.git
-git_url: git://bogomips.org/raindrops.git
-rdoc_url: https://bogomips.org/raindrops/
-public_email: raindrops-public@bogomips.org
+cgit_url: https://yhbt.net/raindrops.git/
+rdoc_url: https://yhbt.net/raindrops/
+public_email: raindrops-public@yhbt.net
 ml_url:
-- https://bogomips.org/raindrops-public/
-- http://ou63pmih66umazou.onion/raindrops-public
+- https://yhbt.net/raindrops-public/
+- http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/raindrops-public
+imap_url:
+- imaps://yhbt.net/inbox.comp.lang.ruby.raindrops.0
+- imap://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.raindrops.0
 nntp_url:
-- nntp://news.public-inbox.org/inbox.comp.lang.ruby.raindrops
-- nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.raindrops
+- nntps://news.public-inbox.org/inbox.comp.lang.ruby.raindrops
+- nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.raindrops
 source_code:
-- git clone git://bogomips.org/raindrops.git
-- git clone https://bogomips.org/raindrops.git
+- git clone https://yhbt.net/raindrops.git
+- torsocks git clone http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/raindrops.git

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.18.0
+GIT_VERSION = 0.20.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,4 +1,4 @@
 all::
-RSYNC_DEST := bogomips.org:/srv/bogomips/raindrops
+RSYNC_DEST := yhbt.net:/srv/yhbt/raindrops
 rfpackage := raindrops
 include pkg.mk

data/LATEST

@@ -1,42 +1,10 @@
-=== raindrops 0.18.0 / 2017-03-23 02:44 UTC
+=== raindrops 0.20.0 / 2021-12-06 23:41 UTC
 
-  The most notable feature of this release is the addition of
-  FreeBSD and OpenBSD TCP_INFO support.  This includes the
-  Raindrops::TCP for portably mapping TCP state names to
-  platform-dependent numeric values:
+  Raindrops may now use file-backed mmap() rather than anonymous
+  memory.  Thanks to KJ Tsanaktsidis for the patch:
 
-    https://bogomips.org/raindrops/Raindrops.html#TCP
+  https://yhbt.net/raindrops-public/20211125065618.3432-1-ktsanaktsidis@zendesk.com/T/
 
-  Thanks to Jeremy Evans and Simon Eskildsen on the
-  unicorn-public@bogomips.org mailing list for inspiring
-  these changes to raindrops.
-
-  There's also a few internal cleanups, and documentation
-  improvements, including some fixes to the largely-forgotten
-  Raindrops::Aggreage::PMQ class:
-
-    https://bogomips.org/raindrops/Raindrops/Aggregate/PMQ.html
-
-  20 changes since 0.17.0:
-
-        test_inet_diag_socket: fix Fixnum deprecation warning
-        TODO: add item for IPv6 breakage
-        ext: fix documentation for C ext-defined classes
-        TCP_Info: custom documentation for #get!
-        TypedData C-API conversion
-        test_watcher: disable test correctly when aggregate is missing
-        tcp_info: support this struct under FreeBSD
-        define Raindrops::TCP hash for TCP states
-        linux_inet_diag: reduce stack usage and simplify
-        avoid reading errno repeatedly
-        aggregate/pmq: avoid false sharing of lock buffers
-        aggregate/pmq: remove io-extra requirement
-        aggregate/pmq: avoid File#stat allocation
-        Merge remote-tracking branch 'origin/freebsd'
-        Merge remote-tracking branch 'origin/aggregate-pmq'
-        doc: remove private email support address
-        doc: update location of TCP_INFO-related stuff
-        build: avoid olddoc for building the RubyGem
-        doc: document Raindrops::TCP hash
-        aggregate/pmq: update version numbers for Ruby and Linux
+  The documentation is also updated to note our mail archives are now
+  available via IMAP(S).
 

data/NEWS

@@ -1,3 +1,53 @@
+=== raindrops 0.20.0 / 2021-12-06 23:41 UTC
+
+  Raindrops may now use file-backed mmap() rather than anonymous
+  memory.  Thanks to KJ Tsanaktsidis for the patch:
+
+  https://yhbt.net/raindrops-public/20211125065618.3432-1-ktsanaktsidis@zendesk.com/T/
+
+  The documentation is also updated to note our mail archives are now
+  available via IMAP(S).
+
+=== raindrops 0.19.2 / 2021-05-25 23:13 UTC
+
+  This release fixes compatibility with GC.compact on Ruby 3.x
+  when using ListenStats on Linux.  The listener stats
+  functionality is rarely used and does not affect most users
+  who just have raindrops installed for shared atomic counters.
+
+=== raindrops 0.19.1 / 2020-01-08 09:31 UTC
+
+  This release fixes some warnings on newer Rubies.
+
+  We're no longer on bogomips.org since it's due
+  for expiry and I can't pay extortionists for a .org, so
+  s/bogomips.org/yhbt.net/ for now, and be prepared to move again
+  when extortionists move onto extorting the .net TLD.
+
+        doc: switch homepage to dark216
+        ext/raindrops/extconf: fix cflags reset on ancient CC
+        fixes for newer rubies
+        replace bogomips.org with yhbt.net
+
+=== raindrops 0.19.0 - Rack 2.x middleware compatibility / 2017-08-09 23:52 UTC
+
+  This release fixes Rack 2.x compatibility for the few users of
+  Raindrops::Middleware
+  <https://bogomips.org/raindrops/Raindrops/Middleware.html>.
+  Thanks to Dmytro Shteflyuk for this release.
+
+  No need to upgrade unless you use Raindrops::Middleware with
+  Rack 2.x.
+
+  There's also a few minor, inconsequential cleanups.
+
+  Dmytro Shteflyuk (1):
+        Properly override respond_to? in Raindrops::Middleware::Proxy
+
+  Eric Wong (2):
+        Ruby thread compatibility updates
+        tcp_info: remove unnecessary extconf.h include
+
 === raindrops 0.18.0 / 2017-03-23 02:44 UTC
 
   The most notable feature of this release is the addition of

data/README

@@ -58,24 +58,20 @@ If you use RubyGems:
 
 See Raindrops::Middleware and Raindrops::LastDataRecv documentation for
 use Rack servers.  The entire library is fully-documented and we are
-responsive on the publically archived mailing list
-(mailto:raindrops-public@bogomips.org) if
-you have any questions or comments.
+responsive on the publicly archived mailbox
+(mailto:raindrops-public@yhbt.net) if you have any questions or comments.
 
 == Development
 
 You can get the latest source via git from the following locations:
 
-  git://bogomips.org/raindrops.git
-  git://repo.or.cz/raindrops.git (mirror)
+  https://yhbt.net/raindrops.git
+  http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/raindrops.git
+  http://repo.or.cz/w/raindrops.git (gitweb mirror)
 
-You may browse the code from the web and download the latest snapshot
-tarballs here:
+Snapshots and tarballs are available.
 
-* https://bogomips.org/raindrops.git
-* http://repo.or.cz/w/raindrops.git (gitweb)
-
-Inline patches (from "git format-patch") to the mailing list are
+Inline patches (from "git format-patch") to the mailbox are
 preferred because they allow code review and comments in the reply to
 the patch.
 
@@ -89,13 +85,17 @@ raindrops is licensed under the LGPL-2.1+
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull
-requests) go to the publically archived mailing list:
-mailto:raindrops-public@bogomips.org
+requests) go to the publicly archived mailbox:
+mailto:raindrops-public@yhbt.net
 
-Mailing list archives are available over HTTPS and NNTP:
+Mail archives are available over HTTP(S), IMAP(S) and NNTP(S):
 
-* https://bogomips.org/raindrops-public/
-* nntp://news.public-inbox.org/inbox.comp.lang.ruby.raindrops
+* https://yhbt.net/raindrops-public/
+* http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/raindrops-public/
+* imaps://yhbt.net/inbox.comp.lang.ruby.raindrops.0
+* imap://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.raindrops.0
+* nntps://news.public-inbox.org/inbox.comp.lang.ruby.raindrops
+* nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.raindrops
 
 Since archives are public, scrub sensitive information and
 use anonymity tools such as Tor or Mixmaster if you deem necessary.

data/examples/linux-listener-stats.rb

@@ -15,7 +15,6 @@ end
 usage = "Usage: #$0 [-d DELAY] [-t QUEUED_THRESHOLD] ADDR..."
 ARGV.size > 0 or abort usage
 delay = false
-all = false
 queued_thresh = -1
 # "normal" exits when driven on the command-line
 trap(:INT) { exit 130 }
@@ -25,7 +24,7 @@ OptionParser.new('', 24, '  ') do |opts|
   opts.banner = usage
   opts.on('-d', '--delay=DELAY', Float) { |n| delay = n }
   opts.on('-t', '--queued-threshold=INT', Integer) { |n| queued_thresh = n }
-  opts.on('-a', '--all') { all = true }
+  opts.on('-a', '--all') { } # noop
   opts.parse! ARGV
 end
 

data/examples/watcher_demo.ru

@@ -1,5 +1,5 @@
 # This is a snippet of the config that powers
-# https://raindrops-demo.bogomips.org/
+# https://yhbt.net/raindrops-demo/
 # This may be used with the packaged zbatery.conf.rb
 #
 # zbatery -c zbatery.conf.ru watcher_demo.ru -E none

data/ext/raindrops/extconf.rb

@@ -112,6 +112,7 @@ EOF
 end
 
 have_func("getpagesize", "unistd.h")
+have_func('rb_thread_call_without_gvl')
 have_func('rb_thread_blocking_region')
 have_func('rb_thread_io_blocking_region')
 
@@ -142,7 +143,7 @@ SRC
       $defs.push(format("-DHAVE_GCC_ATOMIC_BUILTINS"))
       true
     else
-      prev_cflags = $CFLAGS
+      $CFLAGS = prev_cflags
       false
     end
   end

data/ext/raindrops/linux_inet_diag.c

@@ -1,46 +1,24 @@
 #include <ruby.h>
 #include <stdarg.h>
-#ifdef HAVE_RUBY_ST_H
-#  include <ruby/st.h>
-#else
-#  include <st.h>
-#endif
+#include <ruby/st.h>
 #include "my_fileno.h"
 #ifdef __linux__
 
-/* Ruby 1.8.6+ macros (for compatibility with Ruby 1.9) */
-#ifndef RSTRING_LEN
-#  define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-/* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */
-#if !defined(HAVE_RB_THREAD_BLOCKING_REGION) && \
-    !defined(HAVE_RB_THREAD_IO_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
-rb_thread_blocking_region(
-	rb_blocking_function_t *func, void *data1,
-	rb_unblock_function_t *ubf, void *data2)
-{
-	VALUE rv;
-
-	TRAP_BEG;
-	rv = func(data1);
-	TRAP_END;
-
-	return rv;
-}
-#endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
-
 #ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
+/* Ruby 1.9.3 and 2.0.0 */
 VALUE rb_thread_io_blocking_region(rb_blocking_function_t *, void *, int);
+#  define rd_fd_region(fn,data,fd) \
+	rb_thread_io_blocking_region((fn),(data),(fd))
+#elif defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) && \
+	defined(HAVE_RUBY_THREAD_H) && HAVE_RUBY_THREAD_H
+/* in case Ruby 2.0+ ever drops rb_thread_io_blocking_region: */
+#  include <ruby/thread.h>
+#  define COMPAT_FN (void *(*)(void *))
+#  define rd_fd_region(fn,data,fd) \
+	rb_thread_call_without_gvl(COMPAT_FN(fn),(data),RUBY_UBF_IO,NULL)
 #else
-#  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 */
+#  error Ruby <= 1.8 not supported
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -227,7 +205,7 @@ static void bug_warn_nogvl(const char *fmt, ...)
 	va_end(ap);
 
 	fprintf(stderr, "Please report how you produced this at "\
-	                "raindrops-public@bogomips.org\n");
+	                "raindrops-public@yhbt.net\n");
 	fflush(stderr);
 }
 
@@ -608,7 +586,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_io_blocking_region(diag, args, args->fd));
+	nl_errcheck(rd_fd_region(diag, args, args->fd));
 
 	return rb_listen_stats(&args->stats);
 }
@@ -685,7 +663,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_io_blocking_region(diag, &args, args.fd));
+	nl_errcheck(rd_fd_region(diag, &args, args.fd));
 
 	st_foreach(args.table, NIL_P(addrs) ? st_to_hash : st_AND_hash, rv);
 	st_free_table(args.table);
@@ -718,6 +696,7 @@ void Init_raindrops_linux_inet_diag(void)
 	rb_define_singleton_method(cIDSock, "new", ids_s_new, 0);
 
 	cListenStats = rb_const_get(cRaindrops, rb_intern("ListenStats"));
+	rb_gc_register_mark_object(cListenStats); /* pin */
 
 	rb_define_module_function(mLinux, "tcp_listener_stats",
 	                          tcp_listener_stats, -1);

data/ext/raindrops/raindrops.c

@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stddef.h>
+#include <string.h>
 #include "raindrops_atomic.h"
 
 #ifndef SIZET2NUM
@@ -34,9 +35,17 @@ struct raindrops {
 	size_t size;
 	size_t capa;
 	pid_t pid;
+	VALUE io;
 	struct raindrop *drops;
 };
 
+/* called by GC */
+static void rd_mark(void *ptr)
+{
+	struct raindrops *r = ptr;
+	rb_gc_mark(r->io);
+}
+
 /* called by GC */
 static void rd_free(void *ptr)
 {
@@ -60,7 +69,7 @@ static size_t rd_memsize(const void *ptr)
 
 static const rb_data_type_t rd_type = {
 	"raindrops",
-	{ NULL, rd_free, rd_memsize, /* reserved */ },
+	{ rd_mark, rd_free, rd_memsize, /* reserved */ },
 	/* parent, data, [ flags ] */
 };
 
@@ -87,16 +96,10 @@ static struct raindrops *get(VALUE self)
 }
 
 /*
- * call-seq:
- *	Raindrops.new(size)	-> raindrops object
- *
- * Initializes a Raindrops object to hold +size+ counters.  +size+ is
- * only a hint and the actual number of counters the object has is
- * dependent on the CPU model, number of cores, and page size of
- * the machine.  The actual size of the object will always be equal
- * or greater than the specified +size+.
+ * This is the _actual_ implementation of #initialize - the Ruby wrapper
+ * handles keyword-argument handling then calls this method.
  */
-static VALUE init(VALUE self, VALUE size)
+static VALUE init_cimpl(VALUE self, VALUE size, VALUE io, VALUE zero)
 {
 	struct raindrops *r = DATA_PTR(self);
 	int tries = 1;
@@ -113,9 +116,19 @@ static VALUE init(VALUE self, VALUE size)
 	r->capa = tmp / raindrop_size;
 	assert(PAGE_ALIGN(raindrop_size * r->capa) == tmp && "not aligned");
 
+	r->io = io;
+
 retry:
-	r->drops = mmap(NULL, tmp,
-	                PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0);
+	if (RTEST(r->io)) {
+		int fd = NUM2INT(rb_funcall(r->io, rb_intern("fileno"), 0));
+		rb_funcall(r->io, rb_intern("truncate"), 1, SIZET2NUM(tmp));
+		r->drops = mmap(NULL, tmp,
+				PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+	} else {
+		r->drops = mmap(NULL, tmp,
+				PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED,
+				-1, 0);
+	}
 	if (r->drops == MAP_FAILED) {
 		int err = errno;
 
@@ -127,6 +140,9 @@ retry:
 	}
 	r->pid = getpid();
 
+	if (RTEST(zero))
+		memset(r->drops, 0, tmp);
+
 	return self;
 }
 
@@ -217,14 +233,16 @@ static VALUE capa(VALUE self)
  * call-seq:
  *	rd.dup		-> rd_copy
  *
- * Duplicates and snapshots the current state of a Raindrops object.
+ * Duplicates and snapshots the current state of a Raindrops object. Even
+ * if the given Raindrops object is backed by a file, the copy will be backed
+ * by independent, anonymously mapped memory.
  */
 static VALUE init_copy(VALUE dest, VALUE source)
 {
 	struct raindrops *dst = DATA_PTR(dest);
 	struct raindrops *src = get(source);
 
-	init(dest, SIZET2NUM(src->size));
+	init_cimpl(dest, SIZET2NUM(src->size), Qnil, Qfalse);
 	memcpy(dst->drops, src->drops, raindrop_size * src->size);
 
 	return dest;
@@ -375,6 +393,20 @@ static VALUE evaporate_bang(VALUE self)
 	return Qnil;
 }
 
+/*
+ * call-seq:
+ * 	to_io	-> IO
+ *
+ * Returns the IO object backing the memory for this raindrop, if
+ * one was specified when constructing this Raindrop. If this
+ * Raindrop is backed by anonymous memory, this method returns nil.
+ */
+static VALUE to_io(VALUE self)
+{
+	struct raindrops *r = get(self);
+	return r->io;
+}
+
 void Init_raindrops_ext(void)
 {
 	VALUE cRaindrops = rb_define_class("Raindrops", rb_cObject);
@@ -433,7 +465,7 @@ void Init_raindrops_ext(void)
 
 	rb_define_alloc_func(cRaindrops, alloc);
 
-	rb_define_method(cRaindrops, "initialize", init, 1);
+	rb_define_private_method(cRaindrops, "initialize_cimpl", init_cimpl, 3);
 	rb_define_method(cRaindrops, "incr", incr, -1);
 	rb_define_method(cRaindrops, "decr", decr, -1);
 	rb_define_method(cRaindrops, "to_ary", to_ary, 0);
@@ -444,6 +476,7 @@ void Init_raindrops_ext(void)
 	rb_define_method(cRaindrops, "capa", capa, 0);
 	rb_define_method(cRaindrops, "initialize_copy", init_copy, 1);
 	rb_define_method(cRaindrops, "evaporate!", evaporate_bang, 0);
+	rb_define_method(cRaindrops, "to_io", to_io, 0);
 
 #ifdef __linux__
 	Init_raindrops_linux_inet_diag();

data/ext/raindrops/tcp_info.c

@@ -1,5 +1,4 @@
 #include <ruby.h>
-#include "extconf.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #if defined(HAVE_LINUX_TCP_H)

data/lib/raindrops/aggregate/pmq.rb

@@ -142,8 +142,8 @@ class Raindrops::Aggregate::PMQ
       warn "Unhandled exception in #{__FILE__}:#{__LINE__}: #{e}"
       break
     end while true
-    ensure
-      flush_master
+  ensure
+    flush_master
   end
 
   # Loads the last shared \Aggregate from the master thread/process
@@ -175,14 +175,14 @@ class Raindrops::Aggregate::PMQ
   # worker thread or process
   def stop_master_loop
     sleep 0.1 until mq_send(false)
-    rescue Errno::EINTR
-      retry
+  rescue Errno::EINTR
+    retry
   end
 
   def lock! io, type # :nodoc:
     io.fcntl Fcntl::F_SETLKW, type
-    rescue Errno::EINTR
-      retry
+  rescue Errno::EINTR
+    retry
   end
 
   # we use both a mutex for thread-safety and fcntl lock for process-safety

data/lib/raindrops/linux.rb

@@ -14,8 +14,7 @@ module Raindrops::Linux
   # The standard proc path for active UNIX domain sockets, feel free to call
   # String#replace on this if your /proc is mounted in a non-standard location
   # for whatever reason
-  PROC_NET_UNIX_ARGS = %w(/proc/net/unix)
-  defined?(::Encoding) and PROC_NET_UNIX_ARGS.push({ :encoding => "binary" })
+  PROC_NET_UNIX_ARGS = [ '/proc/net/unix', { encoding: "binary" }]
 
   # Get ListenStats from an array of +paths+
   #
@@ -42,11 +41,11 @@ module Raindrops::Linux
     else
       paths = paths.map do |path|
         path = path.dup
-        path.force_encoding(Encoding::BINARY) if defined?(Encoding)
+        path.force_encoding(Encoding::BINARY)
         if File.symlink?(path)
           link = path
           path = File.readlink(link)
-          path.force_encoding(Encoding::BINARY) if defined?(Encoding)
+          path.force_encoding(Encoding::BINARY)
           rv[link] = rv[path] # vivify ListenerStats
         else
           rv[path] # vivify ListenerStats
@@ -57,7 +56,7 @@ module Raindrops::Linux
     paths = /^\w+: \d+ \d+ (\d+) \d+ (\d+)\s+\d+ (#{paths.join('|')})$/n
 
     # no point in pread since we can't stat for size on this file
-    File.read(*PROC_NET_UNIX_ARGS).scan(paths) do |s|
+    File.read(PROC_NET_UNIX_ARGS[0], encoding: 'binary').scan(paths) do |s|
       path = s[-1]
       case s[0]
       when "00000000" # client sockets

data/lib/raindrops/middleware/proxy.rb

@@ -27,9 +27,9 @@ class Raindrops::Middleware::Proxy
 
   # Rack servers use +respond_to?+ to check for the presence of +close+
   # and +to_path+ methods.
-  def respond_to?(m)
+  def respond_to?(m, include_all = false)
     m = m.to_sym
-    :close == m || @body.respond_to?(m)
+    :close == m || @body.respond_to?(m, include_all)
   end
 
   # Avoid breaking users of non-standard extensions (e.g. #body)

data/lib/raindrops/middleware.rb

@@ -62,9 +62,9 @@ require 'raindrops'
 # = Demo Server
 #
 # There is a server running this middleware (and Watcher) at
-#  https://raindrops-demo.bogomips.org/_raindrops
+#  https://yhbt.net/raindrops-demo/_raindrops
 #
-# Also check out the Watcher demo at https://raindrops-demo.bogomips.org/
+# Also check out the Watcher demo at https://yhbt.net/raindrops-demo/
 #
 # The demo server is only limited to 30 users, so be sure not to abuse it
 # by using the /tail/ endpoint too much.

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 https://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.txt
+# e.g.: curl https://yhbt.net/raindrops-demo/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 https://raindrops-demo.bogomips.org/active/0.0.0.0%3A80.html
+# e.g.: curl https://yhbt.net/raindrops-demo/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 https://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.txt
+# e.g.: curl https://yhbt.net/raindrops-demo/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 https://raindrops-demo.bogomips.org/queued/0.0.0.0%3A80.html
+# e.g.: curl https://yhbt.net/raindrops-demo/queued/0.0.0.0%3A80.html
 #
 # === POST /reset/$LISTENER
 #
@@ -95,9 +95,9 @@ require "aggregate"
 #
 # = Demo Server
 #
-# There is a server running this app at https://raindrops-demo.bogomips.org/
+# There is a server running this app at https://yhbt.net/raindrops-demo/
 # The Raindrops::Middleware demo is also accessible at
-# https://raindrops-demo.bogomips.org/_raindrops
+# https://yhbt.net/raindrops-demo/_raindrops
 #
 # The demo server is only limited to 30 users, so be sure not to abuse it
 # by using the /tail/ endpoint too much.
@@ -106,7 +106,7 @@ class Raindrops::Watcher
   attr_reader :snapshot
   include Rack::Utils
   include Raindrops::Linux
-  DOC_URL = "https://bogomips.org/raindrops/Raindrops/Watcher.html"
+  DOC_URL = "https://yhbt.net/raindrops/Raindrops/Watcher.html"
   Peak = Struct.new(:first, :last)
 
   def initialize(opts = {})

data/lib/raindrops.rb

@@ -12,7 +12,7 @@
 # Unlike many classes in this package, the core Raindrops class is
 # intended to be portable to all reasonably modern *nix systems
 # supporting mmap().  Please let us know if you have portability
-# issues, patches or pull requests at mailto:raindrops-public@bogomips.org
+# issues, patches or pull requests at mailto:raindrops-public@yhbt.net
 class Raindrops
 
   # Used to represent the number of +active+ and +queued+ sockets for
@@ -36,6 +36,30 @@ class Raindrops
     def total
       active + queued
     end
+  end unless defined? ListenStats
+
+  # call-seq:
+  #	Raindrops.new(size, io: nil)	-> raindrops object
+  #
+  # Initializes a Raindrops object to hold +size+ counters.  +size+ is
+  # only a hint and the actual number of counters the object has is
+  # dependent on the CPU model, number of cores, and page size of
+  # the machine.  The actual size of the object will always be equal
+  # or greater than the specified +size+.
+  # If +io+ is provided, then the Raindrops memory will be backed by
+  # the specified file; otherwise, it will allocate anonymous memory.
+  # The IO object must respond to +truncate+, as this is used to set
+  # the size of the file.
+  # If +zero+ is provided, then the memory region is zeroed prior to
+  # returning. This is only meaningful if +io+ is also provided; in
+  # that case it controls whether any existing counter values in +io+
+  # are retained (false) or whether it is entirely zeroed (true).
+  def initialize(size, io: nil, zero: false)
+    # This ruby wrapper exists to handle the keyword-argument handling,
+    # which is otherwise kind of awkward in C. We delegate the keyword
+    # arguments to the _actual_ initialize implementation as positional
+    # args.
+    initialize_cimpl(size, io, zero)
   end
 
   autoload :Linux, 'raindrops/linux'

data/pkg.mk

@@ -60,7 +60,7 @@ doc:: .document .olddoc.yml $(pkg_extra) $(PLACEHOLDERS)
 	-find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
 	-find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
-	$(RDOC) -f oldweb
+	$(RDOC) -f dark216
 	$(OLDDOC) merge
 	install -m644 COPYING doc/COPYING
 	install -m644 NEWS doc/NEWS
@@ -127,7 +127,8 @@ publish_doc:
 	-git set-file-times
 	$(MAKE) doc
 	$(MAKE) doc_gz
-	$(RSYNC) -av doc/ $(RSYNC_DEST)/
+	$(RSYNC) -av doc/ $(RSYNC_DEST)/ \
+		--exclude index.html* --exclude created.rid*
 	git ls-files | xargs touch
 endif
 

data/raindrops.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |s|
   s.version = (ENV["VERSION"] ||= '0.18.0').dup
   s.authors = ["raindrops hackers"]
   s.description = File.read('README').split("\n\n")[1]
-  s.email = %q{raindrops-public@bogomips.org}
+  s.email = %q{raindrops-public@yhbt.net}
   s.extensions = %w(ext/raindrops/extconf.rb)
   s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
     File.exist?(f)
   end
   s.files = manifest
-  s.homepage = 'https://bogomips.org/raindrops/'
+  s.homepage = 'https://yhbt.net/raindrops/'
   s.summary = 'real-time stats for preforking Rack servers'
   s.required_ruby_version = '>= 1.9.3'
   s.test_files = test_files

data/test/ipv6_enabled.rb

@@ -2,8 +2,8 @@ def ipv6_enabled?
   tmp = TCPServer.new(ENV["TEST_HOST6"] || '::1', 0)
   tmp.close
   true
-  rescue => e
-    warn "skipping IPv6 tests, host does not seem to be IPv6 enabled:"
-    warn "  #{e.class}: #{e}"
-    false
+rescue => e
+  warn "skipping IPv6 tests, host does not seem to be IPv6 enabled:"
+  warn "  #{e.class}: #{e}"
+  false
 end

data/test/test_linux.rb

@@ -76,6 +76,7 @@ class TestLinux < Test::Unit::TestCase
 
     assert_equal 0, stats[tmp.path].active
     assert_equal 0, stats[tmp.path].queued
+    us.close
   end
 
   def test_unix_resolves_symlinks
@@ -151,8 +152,8 @@ class TestLinux < Test::Unit::TestCase
     assert_equal 1, stats.size
     assert_equal 0, stats[addr].queued
     assert_equal 1, stats[addr].active
-    ensure
-      nlsock.close
+  ensure
+    nlsock.close
   end
 
   def test_tcp_multi

data/test/test_linux_all_tcp_listen_stats_leak.rb

@@ -37,7 +37,7 @@ class TestLinuxAllTcpListenStatsLeak < Test::Unit::TestCase
     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_raindrops.rb

@@ -1,6 +1,7 @@
 # -*- encoding: binary -*-
 require 'test/unit'
 require 'raindrops'
+require 'tempfile'
 
 class TestRaindrops < Test::Unit::TestCase
 
@@ -134,7 +135,7 @@ class TestRaindrops < Test::Unit::TestCase
     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
@@ -162,4 +163,45 @@ class TestRaindrops < Test::Unit::TestCase
     assert status.success?
     assert_equal [ 1, 2 ], tmp.to_ary
   end
+
+  def test_io_backed
+    file = Tempfile.new('test_io_backed')
+    rd = Raindrops.new(4, io: file, zero: true)
+    rd[0] = 123
+    rd[1] = 456
+
+    assert_equal 123, rd[0]
+    assert_equal 456, rd[1]
+
+    rd.evaporate!
+
+    file.rewind
+    data = file.read
+    assert_equal 123, data.unpack('L!')[0]
+    assert_equal 456, data[Raindrops::SIZE..data.size].unpack('L!')[0]
+  end
+
+  def test_io_backed_reuse
+    file = Tempfile.new('test_io_backed')
+    rd = Raindrops.new(4, io: file, zero: true)
+    rd[0] = 123
+    rd[1] = 456
+    rd.evaporate!
+
+    rd = Raindrops.new(4, io: file, zero: false)
+    assert_equal 123, rd[0]
+    assert_equal 456, rd[1]
+  end
+
+  def test_iobacked_noreuse
+    file = Tempfile.new('test_io_backed')
+    rd = Raindrops.new(4, io: file, zero: true)
+    rd[0] = 123
+    rd[1] = 456
+    rd.evaporate!
+
+    rd = Raindrops.new(4, io: file, zero: true)
+    assert_equal 0, rd[0]
+    assert_equal 0, rd[1]
+  end
 end

data/test/test_tcp_info.rb

@@ -60,10 +60,10 @@ class TestTCP_Info < Test::Unit::TestCase
     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

data/test/test_watcher.rb

@@ -118,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
@@ -148,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
@@ -167,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"]
@@ -177,7 +177,7 @@ 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raindrops
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0
 platform: ruby
 authors:
 - raindrops hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aggregate
@@ -78,7 +78,7 @@ description: |-
   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@bogomips.org
+email: raindrops-public@yhbt.net
 executables: []
 extensions:
 - ext/raindrops/extconf.rb
@@ -149,7 +149,7 @@ files:
 - test/test_struct.rb
 - test/test_tcp_info.rb
 - test/test_watcher.rb
-homepage: https://bogomips.org/raindrops/
+homepage: https://yhbt.net/raindrops/
 licenses:
 - LGPL-2.1+
 metadata: {}
@@ -168,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: real-time stats for preforking Rack servers