mwrap 2.2.0.1.g867b → 3.0.0.pre1

data/Documentation/.gitignore

@@ -0,0 +1,2 @@
+mwrap.txt
+mwrap.1

data/Documentation/GNUmakefile

@@ -0,0 +1,63 @@
+# Copyright (C) all contributors <mwrap-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
+all::
+
+INSTALL = install
+POD2MAN = pod2man
+VERSION := $(shell cd .. && ./VERSION-GEN)
+release := mwrap $(VERSION)
+POD2MAN_OPTS = -v -r '$(release)' --stderr -d 1993-10-02 -c 'mwrap user manual'
+pod2man = $(POD2MAN) $(POD2MAN_OPTS)
+POD2TEXT = pod2text
+POD2TEXT_OPTS = --stderr
+pod2text = $(POD2TEXT) $(POD2TEXT_OPTS)
+
+m1 = mwrap
+m5 =
+m7 =
+
+man1 := $(addsuffix .1, $(m1))
+man5 := $(addsuffix .5, $(m5))
+man7 := $(addsuffix .7, $(m7))
+
+all:: man
+
+man: $(man1) $(man5) $(man7)
+
+prefix ?= $(HOME)
+mandir ?= $(prefix)/share/man
+man1dir = $(mandir)/man1
+man5dir = $(mandir)/man5
+man7dir = $(mandir)/man7
+
+gem-man: man
+	$(INSTALL) -d -m 755 ../man
+	test -z "$(man1)" || $(INSTALL) -m 644 $(man1) ../man
+	test -z "$(man5)" || $(INSTALL) -m 644 $(man5) ../man
+	test -z "$(man7)" || $(INSTALL) -m 644 $(man7) ../man
+
+install-man: man
+	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+	test -z "$(man7)" || $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
+	$(INSTALL) -m 644 $(man1) $(DESTDIR)$(man1dir)
+	$(INSTALL) -m 644 $(man5) $(DESTDIR)$(man5dir)
+	test -z "$(man7)" || $(INSTALL) -m 644 $(man7) $(DESTDIR)$(man7dir)
+
+%.1 %.5 %.7 : %.pod
+	$(pod2man) -s $(subst .,,$(suffix $@)) $< $@+ && mv $@+ $@
+
+mantxt = $(addsuffix .txt, $(m1) $(m5) $(m7))
+
+txt :: $(mantxt)
+
+all :: txt
+
+%.txt : %.pod
+	$(pod2text) $< $@+
+	touch -r $< $@+
+	mv $@+ $@
+
+clean::
+	$(RM) $(man1) $(man5) $(man7)
+	$(RM) $(addsuffix .txt.gz, $(m1) $(m5) $(m7))

data/Documentation/mwrap.1

@@ -0,0 +1,242 @@
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+.    ds C`
+.    ds C'
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is >0, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
+..
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
+..
+.        if !\nF==2 \{\
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
+.\}
+.rr rF
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "MWRAP 1"
+.TH MWRAP 1 "1993-10-02" "mwrap 2.3.0.155.g0de44f7" "mwrap user manual"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+mwrap \- run any command under mwrap
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+.Vb 2
+\&  # to trace a long\-running program and access it via $DIR/$PID.sock:
+\&  MWRAP=socket_dir:$DIR mwrap COMMAND
+\&
+\&  # to trace a short\-lived command and dump its output to a log:
+\&  MWRAP=dump_path:$FILENAME mwrap COMMAND
+.Ve
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+mwrap is a command-line to automatically add mwrap.so as an
+\&\s-1LD_PRELOAD\s0 for any command.  It will resolve malloc-family calls
+to a Ruby file and line number, and it can also provide a backtrace
+of native (C/\*(C+) functions for non-Ruby programs.
+.SH "ENVIRONMENT"
+.IX Header "ENVIRONMENT"
+\&\f(CW\*(C`MWRAP\*(C'\fR is the only environment variable read.  It contains multiple
+options delimited by \f(CW\*(C`,\*(C'\fR with names and values delimited by \f(CW\*(C`:\*(C'\fR
+.IP "socket_dir:$DIR" 4
+.IX Item "socket_dir:$DIR"
+This launches an embedded \s-1HTTP\s0 server in each process and binds it
+to \f(CW\*(C`$DIR/$PID.sock\*(C'\fR.  \f(CW\*(C`curl \-\-unix\-socket $DIR/$PID.sock\*(C'\fR
+or \fBmwrap\-rproxy\fR\|(1p) (from <https://80x24.org/mwrap\-perl.git>) may
+be used to access various endpoints in the \s-1HTTP\s0 server.
+.IP "bt:$DEPTH" 4
+.IX Item "bt:$DEPTH"
+The backtrace depth for \fBbacktrace\fR\|(3) in addition to the Perl
+file and line number where \f(CW$DEPTH\fR is a non-negative number.
+.Sp
+The maximum allowed value is 32, though values of 5 or less are
+typically useful.  Increasing this to even 2 or 3 can significantly
+increase the amount of memory mwrap (and liburcu) itself uses.
+.Sp
+This is only useful in conjunction with \f(CW\*(C`socket_dir\*(C'\fR
+.Sp
+This may be changed via \s-1POST\s0 request (see below).
+.Sp
+Default: 0
+.IP "dump_path:$FILENAME" 4
+.IX Item "dump_path:$FILENAME"
+Dumps the output at exit to a given filename:
+.Sp
+.Vb 1
+\&        total_bytes     call_count      location
+.Ve
+.Sp
+In the future, dumping to a self-describing \s-1CSV\s0 will be supported.
+.IP "dump_fd:$DESCRIPTOR" 4
+.IX Item "dump_fd:$DESCRIPTOR"
+As with dump_path, but dumps the output to a given file descriptor.
+.SH "HTTP POST API"
+.IX Header "HTTP POST API"
+In addition to the various \s-1GET\s0 endpoints linked via \f(CW\*(C`http://0/$PID/\*(C'\fR,
+there are some \s-1POST\s0 endpoints which are typically accessed via
+\&\f(CW\*(C`curl \-\-unix\-socket $DIR/$PID.sock\*(C'\fR
+.IP "\s-1POST\s0 http://0/$PID/reset" 4
+.IX Item "POST http://0/$PID/reset"
+\&\f(CW\*(C`curl \-\-unix\-socket $DIR/$PID.sock \-XPOST http://0/$PID/reset\*(C'\fR
+.Sp
+Reset all internal counters.  This is not done atomically and does
+not release any memory.
+.IP "\s-1POST\s0 http://0/$PID/trim" 4
+.IX Item "POST http://0/$PID/trim"
+\&\f(CW\*(C`curl \-\-unix\-socket $DIR/$PID.sock \-XPOST http://0/$PID/trim\*(C'\fR
+.Sp
+Runs \fBmalloc_trim\fR\|(3) with a 0 pad value to release unused memory
+back to the kernel.  In our malloc implementation, this is done
+lazily to avoid contention and does not happen unless sleeping threads.
+.IP "\s-1POST\s0 http://0/$PID/ctl" 4
+.IX Item "POST http://0/$PID/ctl"
+Set various internal knobs.  Currently, \f(CW\*(C`X\-Mwrap\-BT\*(C'\fR is the
+only knob supported:
+.Sp
+\&\f(CW\*(C`curl \-\-unix\-socket $DIR/$PID.sock \-XPOST \-HX\-Mwrap\-BT:1 http://0/$PID/ctl\*(C'\fR
+.Sp
+Using the \f(CW\*(C`X\-Mwrap\-BT\*(C'\fR header allows changing the aforementioned
+\&\f(CW\*(C`bt:\*(C'\fR value to a specified depth level.  As with \f(CW\*(C`bt:\*(C'\fR, only make small
+adjustments as the memory cost can increase exponentially with each step.
+.Sp
+It is typically a good idea to reset (\f(CW\*(C`http://0/$PID/reset\*(C'\fR) after changing
+the depth on a running process.
+.Sp
+Headers other than \f(CW\*(C`X\-Mwrap\-BT\*(C'\fR may be accepted in the future to
+tweak other settings.
+.SH "CONTACT"
+.IX Header "CONTACT"
+Feedback welcome via plain-text mail to <mailto:mwrap\-public@80x24.org>
+.PP
+Mail archives are hosted at <https://80x24.org/mwrap\-public/>
+.SH "COPYRIGHT"
+.IX Header "COPYRIGHT"
+Copyright all contributors <mailto:mwrap\-public@80x24.org>
+.PP
+License: \s-1GPL\-3.0+\s0 <https://www.gnu.org/licenses/gpl\-3.0.txt>
+.PP
+Source code is at <https://80x24.org/mwrap.git/>
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fBmwrap\-rproxy\fR\|(1), \fBDevel::Mwrap\fR\|(3pm), <https://80x24.org/mwrap\-perl.git>

data/Documentation/mwrap.pod

@@ -0,0 +1,123 @@
+=head1 NAME
+
+mwrap - run any command under mwrap
+
+=head1 SYNOPSIS
+
+  # to trace a long-running program and access it via $DIR/$PID.sock:
+  MWRAP=socket_dir:$DIR mwrap COMMAND
+
+  # to trace a short-lived command and dump its output to a log:
+  MWRAP=dump_path:$FILENAME mwrap COMMAND
+
+=head1 DESCRIPTION
+
+mwrap is a command-line to automatically add mwrap.so as an
+LD_PRELOAD for any command.  It will resolve malloc-family calls
+to a Ruby file and line number, and it can also provide a backtrace
+of native (C/C++) functions for non-Ruby programs.
+
+=head1 ENVIRONMENT
+
+C<MWRAP> is the only environment variable read.  It contains multiple
+options delimited by C<,> with names and values delimited by C<:>
+
+=over 4
+
+=item socket_dir:$DIR
+
+This launches an embedded HTTP server in each process and binds it
+to C<$DIR/$PID.sock>.  C<curl --unix-socket $DIR/$PID.sock>
+or L<mwrap-rproxy(1p)> (from L<https://80x24.org/mwrap-perl.git>) may
+be used to access various endpoints in the HTTP server.
+
+=item bt:$DEPTH
+
+The backtrace depth for L<backtrace(3)> in addition to the Perl
+file and line number where C<$DEPTH> is a non-negative number.
+
+The maximum allowed value is 32, though values of 5 or less are
+typically useful.  Increasing this to even 2 or 3 can significantly
+increase the amount of memory mwrap (and liburcu) itself uses.
+
+This is only useful in conjunction with C<socket_dir>
+
+This may be changed via POST request (see below).
+
+Default: 0
+
+=item dump_path:$FILENAME
+
+Dumps the output at exit to a given filename:
+
+	total_bytes	call_count	location
+
+In the future, dumping to a self-describing CSV will be supported.
+
+=item dump_fd:$DESCRIPTOR
+
+As with dump_path, but dumps the output to a given file descriptor.
+
+=back
+
+=head1 HTTP POST API
+
+In addition to the various GET endpoints linked via C<http://0/$PID/>,
+there are some POST endpoints which are typically accessed via
+C<curl --unix-socket $DIR/$PID.sock>
+
+=over 4
+
+=item POST http://0/$PID/reset
+
+C<curl --unix-socket $DIR/$PID.sock -XPOST http://0/$PID/reset>
+
+Reset all internal counters.  This is not done atomically and does
+not release any memory.
+
+=item POST http://0/$PID/trim
+
+C<curl --unix-socket $DIR/$PID.sock -XPOST http://0/$PID/trim>
+
+Runs L<malloc_trim(3)> with a 0 pad value to release unused memory
+back to the kernel.  In our malloc implementation, this is done
+lazily to avoid contention and does not happen unless sleeping threads.
+
+=item POST http://0/$PID/ctl
+
+Set various internal knobs.  Currently, C<X-Mwrap-BT> is the
+only knob supported:
+
+C<curl --unix-socket $DIR/$PID.sock -XPOST -HX-Mwrap-BT:1 http://0/$PID/ctl>
+
+Using the C<X-Mwrap-BT> header allows changing the aforementioned
+C<bt:> value to a specified depth level.  As with C<bt:>, only make small
+adjustments as the memory cost can increase exponentially with each step.
+
+It is typically a good idea to reset (C<http://0/$PID/reset>) after changing
+the depth on a running process.
+
+Headers other than C<X-Mwrap-BT> may be accepted in the future to
+tweak other settings.
+
+=back
+
+=head1 CONTACT
+
+Feedback welcome via plain-text mail to L<mailto:mwrap-public@80x24.org>
+
+Mail archives are hosted at L<https://80x24.org/mwrap-public/>
+
+=head1 COPYRIGHT
+
+Copyright all contributors L<mailto:mwrap-public@80x24.org>
+
+License: GPL-3.0+ L<https://www.gnu.org/licenses/gpl-3.0.txt>
+
+Source code is at L<https://80x24.org/mwrap.git/>
+
+=head1 SEE ALSO
+
+L<mwrap-rproxy(1)>, L<Devel::Mwrap(3pm)>, L<https://80x24.org/mwrap-perl.git>
+
+=cut

data/MANIFEST

@@ -2,13 +2,28 @@
 .gitignore
 .olddoc.yml
 COPYING
+Documentation/.gitignore
+Documentation/GNUmakefile
+Documentation/mwrap.pod
 MANIFEST
 README
 Rakefile
+VERSION-GEN
 bin/mwrap
+ext/mwrap/check.h
+ext/mwrap/dlmalloc_c.h
 ext/mwrap/extconf.rb
+ext/mwrap/gcc.h
+ext/mwrap/httpd.h
 ext/mwrap/jhash.h
 ext/mwrap/mwrap.c
+ext/mwrap/mwrap_core.h
+ext/mwrap/mymalloc.h
+ext/mwrap/picohttpparser.h
+ext/mwrap/picohttpparser_c.h
+lib/mwrap/.gitignore
 lib/mwrap_rack.rb
 mwrap.gemspec
+t/httpd.t
+t/test_common.perl
 test/test_mwrap.rb

data/README

@@ -8,8 +8,8 @@ mwrap wraps all malloc-family calls to trace the Ruby source
 location of such calls and bytes allocated at each callsite.
 As of mwrap 2.0.0, it can also function as a leak detector
 and show live allocations at every call site.  Depending on
-your application and workload, the overhead is roughly a 50%
-increase memory and runtime.
+your application and workload, the overhead is roughly a 50-100%
+increase memory and runtime with default settings.
 
 It works best for allocations under GVL, but tries to track
 numeric caller addresses for allocations made without GVL so you
@@ -20,17 +20,15 @@ It requires the concurrent lock-free hash table from the
 Userspace RCU project: https://liburcu.org/
 
 It does not require recompiling or rebuilding Ruby, but only
-supports Ruby trunk (2.6.0dev+) on a few platforms:
+supports Ruby 2.7.0 or later on a few platforms:
 
-* GNU/Linux
-* FreeBSD (tested 11.1)
+* GNU/Linux (only tested --without-jemalloc, mwrap 3.x provides its own)
 
-It may work on NetBSD, OpenBSD and DragonFly BSD.
+It may work on FreeBSD, NetBSD, OpenBSD and DragonFly BSD if given
+appropriate build options.
 
 == Install
 
-	# FreeBSD: pkg install liburcu
-
 	# Debian-based systems: apt-get liburcu-dev
 
 	# Install mwrap via RubyGems.org
@@ -64,24 +62,33 @@ or an address retrieved by backtrace_symbols(3).  It is
 recommended to use the sort(1) command on either of the
 first two columns to find the hottest malloc locations.
 
-mwrap 2.0.0+ also supports a Rack application endpoint,
+mwrap 3.0.0+ also supports an embedded HTTP server
 it is documented at:
 
-https://80x24.org/mwrap/MwrapRack.html
+https://80x24.org/mwrap.git/tree/Documentation/mwrap.pod
 
 == Known problems
 
 * 32-bit machines are prone to overflow (WONTFIX)
 
-== Public mail archives and contact info:
+* signalfd(2)-reliant code will need latest URCU with commit
+  ea3a28a3f71dd02f (Disable signals in URCU background threads, 2022-09-23)
+  This doesn't affect C Ruby itself, and signalfd(2) use is rare
+  3rd-party processes.
+
+* Ruby source files over 16.7 million lines long are not supported :P
+
+== Public mail archives (HTTP, Atom feeds, IMAP mailbox, NNTP group, POP3):
 
 * https://80x24.org/mwrap-public/
 * nntps://80x24.org/inbox.comp.lang.ruby.mwrap
 * imaps://;AUTH=ANONYMOUS@80x24.org/inbox.comp.lang.ruby.mwrap.0
 * https://80x24.org/mwrap-public/_/text/help/#pop3
 
-No subscription will ever be required to post, but HTML mail
-will be rejected:
+No subscription nor real identities will ever be required to obtain support,
+but HTML mail is rejected.  Memory usage reductions start with you;
+only send plain-text mail to us and do not top-post.  HTML mail and
+top-posting costs everybody memory and bandwidth.
 
 		mwrap-public@80x24.org
 
@@ -89,10 +96,11 @@ will be rejected:
 
 	git clone https://80x24.org/mwrap.git
 
-Send all patches and pull requests (use "git request-pull" to format) to
-mwrap-public@80x24.org.  We do not use centralized or proprietary messaging
-systems.
+Send all patches ("git format-patch" + "git send-email") and
+pull requests (use "git request-pull" to format) via email
+to mwrap-perl@80x24.org.  We do not and will not use
+proprietary messaging systems.
 
 == License
 
-GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt>
+GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>

data/Rakefile

@@ -8,10 +8,18 @@ rescue LoadError
   warn 'rake-compiler not available, cross compiling disabled'
 end
 
-Rake::TestTask.new(:test)
-task :test => :compile
+Rake::TestTask.new('test-ruby')
+task 'test-ruby' => :compile
 task :default => :compile
 
+task 'test-httpd': 'lib/mwrap.so' do
+  require 'rbconfig'
+  ENV['RUBY'] = RbConfig.ruby
+  sh "#{ENV['PROVE'] || 'prove'} -v"
+end
+
+task test: %w(test-ruby test-httpd)
+
 c_files = File.readlines('MANIFEST').grep(%r{ext/.*\.[ch]$}).map!(&:chomp!)
 task 'compile:mwrap' => c_files
 

data/VERSION-GEN

@@ -0,0 +1,36 @@
+#!/bin/sh
+VF=lib/mwrap/version.rb
+DEF_VER=v3.0.0-pre1
+VN=$(git describe HEAD 2>/dev/null)
+if test $? -eq 0
+then
+	case "$VN" in
+	v[0-9]*)
+		set -e
+		git update-index -q --refresh
+		set +e
+		git diff-index --quiet HEAD -- || VN="$VN-dirty"
+		set -e
+		VN=$(echo $VN | tr '-' '.')
+		;;
+	esac
+fi
+set -e
+
+case $VN in
+'') VN="$DEF_VER" ;;
+esac
+
+VN=$(expr "$VN" : v*'\(.*\)')
+VC=unset
+if test -r $VF
+then
+	VC="$(cat $VF)"
+fi
+
+new="module Mwrap; VERSION = '$VN'.freeze; end"
+if test x"$new" != x"$VC"
+then
+	echo "$new" >$VF
+fi
+echo $VN

data/bin/mwrap

@@ -2,6 +2,25 @@
 # frozen_string_literal: true
 # Copyright (C) mwrap hackers <mwrap-public@80x24.org>
 # License: GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt>
+help = <<EOM
+usage: mwrap COMMAND [ARGS]
+see https://80x24.org/mwrap/README.html for more info
+EOM
+ARGV.empty? and abort help
+ARGV.each do |x|
+  case x
+  when '--version', '-v'
+    require 'mwrap/version'
+    puts "mwrap #{Mwrap::VERSION} - #{RUBY_DESCRIPTION}"
+    exit 0
+  when '--help', '-h'
+    puts help
+    exit 0
+  else # don't intercept --version/--help intended for commands we wrap
+    break
+  end
+end
+
 require 'mwrap'
 mwrap_so = $".grep(%r{/mwrap\.so\z})[0] or abort "mwrap.so not loaded"
 cur = ENV['LD_PRELOAD']

data/ext/mwrap/check.h

@@ -0,0 +1,23 @@
+#ifndef CHECK_H
+#define CHECK_H
+#include "gcc.h"
+#include <stdlib.h>
+#include <assert.h>
+/*
+ * standard assert may malloc, but NDEBUG behavior is standardized,
+ * however Perl headers add some weirdness if we undef NDEBUG, so
+ * keep NDEBUG defined and use MWRAP_NO_DEBUG
+ */
+#if defined(NDEBUG) && defined(MWRAP_NO_DEBUG)
+#  define mwrap_assert(expr)
+#  define CHECK(type, expect, expr) (void)(expr)
+#else
+#  define mwrap_assert(x) do { if (caa_unlikely(!(x))) abort(); } while (0)
+#  define CHECK(type, expect, expr) do { \
+	type checkvar = (expr); \
+	mwrap_assert(checkvar==(expect)&& "BUG" && __FILE__ && __LINE__); \
+	(void)checkvar; \
+	} while (0)
+#endif
+
+#endif /* CHECK_H */