hash: flush the table more slowly

With SIGTERM and fast exit, the trickle writeback is less important.
We don't want to flood people's IO subsystems with continuous writes.
This really should be configurable at runtime.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>

.gitignore

@@ -1,6 +1,8 @@
 *.[ao]
 *.bak
+*.dep
 *.new
+*.tmp
 *.so*
 Doxyfile
 README.html
@@ -10,3 +12,7 @@ html/
 latex/
 make.log
 make.log.new
+localconf
+lib/configure.h
+scripts/beesd
+scripts/beesd@.service

Defines.mk

@@ -0,0 +1,9 @@
+MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFIX)
+
+define TEMPLATE_COMPILER =
+sed $< >$@ \
+		-e's#@DESTDIR@#$(DESTDIR)#' \
+		-e's#@PREFIX@#$(PREFIX)#' \
+		-e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \
+		-e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#'
+endef

Makefile

@@ -1,19 +1,76 @@
-default install all: lib src test README.html
+PREFIX ?= /usr
+ETC_PREFIX ?= /etc
+LIBDIR ?= lib
 
-clean:
-	git clean -dfx
+LIB_PREFIX ?= $(PREFIX)/$(LIBDIR)
+LIBEXEC_PREFIX ?= $(LIB_PREFIX)/bees
 
-.PHONY: lib src
+SYSTEMD_SYSTEM_UNIT_DIR ?= $(shell pkg-config systemd --variable=systemdsystemunitdir)
 
-lib:
-	$(MAKE) -C lib
+BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
 
+# allow local configuration to override above variables
+-include localconf
+
+DEFAULT_MAKE_TARGET ?= reallyall
+
+ifeq ($(DEFAULT_MAKE_TARGET),reallyall)
+	RUN_INSTALL_TESTS = test
+endif
+
+include Defines.mk
+
+default: $(DEFAULT_MAKE_TARGET)
+
+all: lib src scripts
+reallyall: all doc test
+
+clean: ## Cleanup
+	git clean -dfx -e localconf
+
+.PHONY: lib src test doc
+
+lib: ## Build libs
+	+$(MAKE) TAG="$(BEES_VERSION)" -C lib
+
+src: ## Build bins
 src: lib
-	$(MAKE) -C src
+	+$(MAKE) BEES_VERSION="$(BEES_VERSION)" -C src
 
+test: ## Run tests
 test: lib src
-	$(MAKE) -C test
+	+$(MAKE) -C test
 
-README.html: README.md
-	markdown README.md > README.html.new
-	mv -f README.html.new README.html
+doc: ## Build docs
+	+$(MAKE) -C docs
+
+scripts/%: scripts/%.in
+	$(TEMPLATE_COMPILER)
+
+scripts: scripts/beesd scripts/beesd@.service
+
+install_tools: ## Install support tools + libs
+install_tools: src
+	install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+
+install_bees: ## Install bees + libs
+install_bees: src $(RUN_INSTALL_TESTS)
+	install -Dm755 bin/bees	$(DESTDIR)$(LIBEXEC_PREFIX)/bees
+
+install_scripts: ## Install scipts
+install_scripts: scripts
+	install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
+	install -Dm644 scripts/beesd.conf.sample $(DESTDIR)$(ETC_PREFIX)/bees/beesd.conf.sample
+ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+	install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+endif
+
+install: ## Install distribution
+install: install_bees install_scripts $(OPTIONAL_INSTALL_TARGETS)
+
+help: ## Show help
+	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##/\t/'
+
+bees: reallyall
+fly: install

README.md

@@ -1,360 +1,62 @@
 BEES
 ====
 
-Best-Effort Extent-Same, a btrfs deduplication daemon.
+Best-Effort Extent-Same, a btrfs deduplication agent.
 
-About Bees
+About bees
 ----------
 
-Bees is a daemon designed to run continuously on live file servers.
-Bees consumes entire filesystems and deduplicates in a single pass, using
-minimal RAM to store data.  Bees maintains persistent state so it can be
-interrupted and resumed, whether by planned upgrades or unplanned crashes.
-Bees makes continuous incremental progress instead of using separate
-scan and dedup phases.  Bees uses the Linux kernel's `dedupe_file_range`
-system call to ensure data is handled safely even if other applications
-concurrently modify it.
-
-Bees is intentionally btrfs-specific for performance and capability.
-Bees uses the btrfs `SEARCH_V2` ioctl to scan for new data 
-without the overhead of repeatedly walking filesystem trees with the
-POSIX API.  Bees uses `LOGICAL_INO` and `INO_PATHS` to leverage btrfs's
-existing metadata instead of building its own redundant data structures.
-Bees can cope with Btrfs filesystem compression.  Bees can reassemble
-Btrfs extents to deduplicate extents that contain a mix of duplicate
-and unique data blocks.
-
-Bees includes a number of workarounds for Btrfs kernel bugs to (try to)
-avoid ruining your day.  You're welcome.
-
-How Bees Works
---------------
-
-Bees uses a fixed-size persistent dedup hash table with a variable dedup
-block size.  Any size of hash table can be dedicated to dedup.  Bees will
-scale the dedup block size to fit the filesystem's unique data size
-using a weighted sampling algorithm.  This allows Bees to adapt itself
-to its filesystem size without forcing admins to do math at install time.
-At the same time, the duplicate block alignment constraint can be as low
-as 4K, allowing efficient deduplication of files with narrowly-aligned
-duplicate block offsets (e.g. compiled binaries and VM/disk images).
-
-The Bees hash table is loaded into RAM at startup (using hugepages if
-available), mlocked, and synced to persistent storage by trickle-writing
-over a period of several hours.  This avoids issues related to seeking
-or fragmentation, and enables the hash table to be efficiently stored
-on Btrfs with compression (or an ext4 filesystem, or a raw disk, or
-on CIFS...).
-
-Once a duplicate block is identified, Bees examines the nearby blocks
-in the files where block appears.  This allows Bees to find long runs
-of adjacent duplicate block pairs if it has an entry for any one of
-the blocks in its hash table.  The stored hash entry plus the block
-recently scanned from disk form a duplicate pair.  On typical data sets,
-this means most of the blocks in the hash table are redundant and can
-be discarded without significant performance impact.
-
-Hash table entries are grouped together into LRU lists.  As each block
-is scanned, its hash table entry is inserted into the LRU list at a
-random position.  If the LRU list is full, the entry at the end of the
-list is deleted.  If a hash table entry is used to discover duplicate
-blocks, the entry is moved to the beginning of the list.  This makes Bees
-unable to detect a small number of duplicates (less than 1% on typical
-filesystems), but it dramatically improves efficiency on filesystems
-with many small files.  Bees has found a net 13% more duplicate bytes
-than a naive fixed-block-size algorithm with a 64K block size using the
-same size of hash table, even after discarding 1% of the duplicate bytes.
-
-Hash Table Sizing
------------------
-
-Hash table entries are 16 bytes each (64-bit hash, 52-bit block number,
-and some metadata bits).  Each entry represents a minimum of 4K on disk.
-
-    unique data size    hash table size    average dedup block size
-        1TB                 4GB                  4K
-        1TB                 1GB                 16K
-        1TB               256MB                 64K
-        1TB                16MB               1024K
-       64TB                 1GB               1024K
-
-Things You Might Expect That Bees Doesn't Have
-----------------------------------------------
-
-* There's no configuration file or getopt command line option processing
-(patches welcome!).  There are some tunables hardcoded in the source
-that could eventually become configuration options.
-
-* There's no way to *stop* the Bees daemon.  Use SIGKILL, SIGTERM, or
-Ctrl-C for now.  Some of the destructors are unreachable and have never
-been tested.  Bees will repeat some work when restarted.
-
-* The Bees process doesn't fork and writes its log to stdout/stderr.
-A shell wrapper is required to make it behave more like a daemon.
-
-* There's no facility to exclude any part of a filesystem (patches
-welcome).
-
-* PREALLOC extents and extents containing blocks filled with zeros will
-be replaced by holes unconditionally.
-
-* Duplicate block groups that are less than 12K in length can take 30%
-of the run time while saving only 3% of the disk space.  There should
-be an option to just not bother with those.
-
-* There is a lot of duplicate reading of blocks in snapshots.  Bees will
-scan all snapshots at close to the same time to try to get better
-performance by caching, but really fixing this requires rewriting the
-crawler to scan the btrfs extent tree directly instead of the subvol
-FS trees.
-
-* Bees had support for multiple worker threads in the past; however,
-this was removed because it made Bees too aggressive to coexist with
-other applications on the same machine.  It also hit the *slow backrefs*
-on N CPU cores instead of just one.
-
-Good Btrfs Feature Interactions
--------------------------------
-
-Bees has been tested in combination with the following:
-
-* btrfs compression (either method), mixtures of compressed and uncompressed extents
-* PREALLOC extents (unconditionally replaced with holes)
-* HOLE extents and btrfs no-holes feature
-* Other deduplicators, reflink copies (though Bees may decide to redo their work)
-* btrfs snapshots and non-snapshot subvols (RW only)
-* Concurrent file modification (e.g. PostgreSQL and sqlite databases, build daemons)
-* all btrfs RAID profiles (people ask about this, but it's irrelevant)
-* IO errors during dedup (read errors will throw exceptions, Bees will catch them and skip over the affected extent)
-* Filesystems mounted *with* the flushoncommit option
-* 4K filesystem data block size / clone alignment
-* 64-bit CPUs (amd64)
-* Large (>16M) extents
-* Huge files (>1TB--although Btrfs performance on such files isn't great in general)
-* filesystems up to 25T bytes, 100M+ files
-
-
-Bad Btrfs Feature Interactions
-------------------------------
-
-Bees has not been tested with the following, and undesirable interactions may occur:
-
-* Non-4K filesystem data block size (should work if recompiled)
-* 32-bit CPUs (x86, arm)
-* Non-equal hash (SUM) and filesystem data block (CLONE) sizes (probably never will work)
-* btrfs read-only snapshots (never tested, probably wouldn't work well)
-* btrfs send/receive (receive is probably OK, but send requires RO snapshots.  See above)
-* btrfs qgroups (never tested, no idea what might happen)
-* btrfs seed filesystems (does anyone even use those?)
-* btrfs autodefrag mount option (never tested, could fight with Bees)
-* btrfs nodatacow mount option or inode attribute (*could* work, but might not)
-* btrfs out-of-tree kernel patches (e.g. in-band dedup or encryption)
-* btrfs-convert from ext2/3/4 (never tested)
-* btrfs mixed block groups (don't know a reason why it would *not* work, but never tested)
-* open(O_DIRECT)
-* Filesystems mounted *without* the flushoncommit option
-
-Other Caveats
--------------
-
-* btrfs balance will invalidate parts of the dedup table.  Bees will
-  happily rebuild the table, but it will have to scan all the blocks
-  again.
-
-* btrfs defrag will cause Bees to rescan the defragmented file.  If it
-  contained duplicate blocks and other references to the original
-  fragmented duplicates still exist, Bees will replace the defragmented
-  extents with the original fragmented ones.
-
-* Bees creates temporary files (with O_TMPFILE) and uses them to split
-  and combine extents elsewhere in btrfs.  These will take up to 2GB
-  during normal operation.
-
-* Like all deduplicators, Bees will replace data blocks with metadata
-  references.  It is a good idea to ensure there are several GB of
-  unallocated space (see `btrfs fi df`) on the filesystem before running
-  Bees for the first time.  Use
-
-	btrfs balance start -dusage=100,limit=1 /your/filesystem
-
-  If possible, raise the `limit` parameter to the current size of metadata
-  usage (from `btrfs fi df`) plus 1.
-
-
-A Brief List Of Btrfs Kernel Bugs
----------------------------------
-
-Fixed bugs:
-
-* 3.13: `FILE_EXTENT_SAME` ioctl added.  No way to reliably dedup with
-  concurrent modifications before this.
-* 3.16: `SEARCH_V2` ioctl added.  Bees could use `SEARCH` instead.
-* 4.2: `FILE_EXTENT_SAME` no longer updates mtime, can be used at EOF.
-  Kernel deadlock bugs fixed.
-* 4.7: *slow backref* bug no longer triggers a softlockup panic.  It still
-  too long to resolve a block address to a root/inode/offset triple.
-
-Unfixed kernel bugs (as of 4.5.7) with workarounds in Bees:
-
-* *slow backref*: If the number of references to a single shared extent
-  within a single file grows above a few thousand, the kernel consumes CPU
-  for up to 40 uninterruptible minutes while holding various locks that
-  block access to the filesystem.  Bees avoids this bug by measuring the
-  time the kernel spends performing certain operations and permanently
-  blacklisting any extent or hash where the kernel starts to get slow.
-  Inside Bees, such blocks are marked as 'toxic' hash/block addresses.
-
-* `LOGICAL_INO` output is arbitrarily limited to 2730 references
-  even if more buffer space is provided for results.  Once this number
-  has been reached, Bees can no longer replace the extent since it can't
-  find and remove all existing references.  Bees refrains from adding
-  any more references after the first 2560.  Offending blocks are
-  marked 'toxic' even if there is no corresponding performance problem.
-  This places an obvious limit on dedup efficiency for extremely common
-  blocks or filesystems with many snapshots (although this limit is
-  far greater than the effective limit imposed by the *slow backref* bug).
-
-* `FILE_EXTENT_SAME` is arbitrarily limited to 16MB.  This is less than
-  128MB which is the maximum extent size that can be created by defrag
-  or prealloc.  Bees avoids feedback loops this can generate while
-  attempting to replace extents over 16MB in length.
-
-* `DEFRAG_RANGE` is useless.  The ioctl attempts to implement `btrfs
-  fi defrag` in the kernel, and will arbitrarily defragment more or
-  less than the range requested to match the behavior expected from the
-  userspace tool.  Bees implements its own defrag instead, copying data
-  to a temporary file and using the `FILE_EXTENT_SAME` ioctl to replace
-  precisely the specified range of offending fragmented blocks.
-
-* When writing BeesStringFile, a crash can cause the directory entry
-  `beescrawl.UUID.dat.tmp` to exist without a corresponding inode.
-  This directory entry cannot be renamed or removed; however, it does
-  not prevent the creation of a second directory entry with the same
-  name that functions normally, so it doesn't prevent Bees operation.
-
-  The orphan directory entry can be removed by deleting its subvol,
-  so place BEESHOME on a separate subvol so you can delete these orphan
-  directory entries when they occur (or use btrfs zero-log before mounting
-  the filesystem after a crash).
-
-* If the fsync() BeesTempFile::make_copy is removed, the filesystem
-  hangs within a few hours, requiring a reboot to recover.
-
-Not really a bug, but a gotcha nonetheless:
-
-* If a process holds a directory FD open, the subvol containing the
-  directory cannot be deleted (`btrfs sub del` will start the deletion
-  process, but it will not proceed past the first open directory FD).
-  `btrfs-cleaner` will simply skip over the directory *and all of its
-  children* until the FD is closed.  Bees avoids this gotcha by closing
-  all of the FDs in its directory FD cache every 15 minutes.
-
-
-
-Requirements
-------------
-
-* C++11 compiler (tested with GCC 4.9)
-
-  Sorry.  I really like closures.
-
-* btrfs-progs (tested with 4.1..4.7)
-
-  Needed for btrfs.h and ctree.h during compile.
-  Not needed at runtime.
-
-* libuuid-dev
-
-  TODO: remove the one function used from this library.
-  It supports a feature Bees no longer implements.
-
-* Linux kernel 4.2 or later
-
-  Don't bother trying to make Bees work with older kernels.
-  It won't end well.
-
-* 64-bit host and target CPU
-
-  This code has never been tested on a 32-bit target CPU.
-
-  A 64-bit host CPU may be required for the self-tests.
-  Some of the ioctls don't work properly with a 64-bit
-  kernel and 32-bit userspace.
-
-Build
------
-
-Build with `make`.
-
-The build produces `bin/bees` and `lib/libcrucible.so`, which must be
-copied to somewhere in `$PATH` and `$LD_LIBRARY_PATH` on the target
-system respectively.
-
-Setup
------
-
-Create a directory for bees state files:
-
-	export BEESHOME=/some/path
-	mkdir -p "$BEESHOME"
-
-Create an empty hash table (your choice of size, but it must be a multiple
-of 16M).  This example creates a 1GB hash table:
-
-	truncate -s 1g "$BEESHOME/beeshash.dat"
-	chmod 700 "$BEESHOME/beeshash.dat"
-
-Configuration
--------------
-
-The only runtime configurable options are environment variables:
-
-* BEESHOME: Directory containing Bees state files:
- * beeshash.dat         | persistent hash table (must be a multiple of 16M)
- * beescrawl.`UUID`.dat | state of SEARCH_V2 crawlers
- * beesstats.txt        | statistics and performance counters
-* BEESSTATS: File containing a snapshot of current Bees state (performance
-  counters and current status of each thread).
-
-Other options (e.g. interval between filesystem crawls) can be configured
-in src/bees.h.
-
-Running
--------
-
-We created this directory in the previous section:
-
-	export BEESHOME=/some/path
-
-Use a tmpfs for BEESSTATUS, it updates once per second:
-
-	export BEESSTATUS=/run/bees.status
-
-bees can only process the root subvol of a btrfs (seriously--if the
-argument is not the root subvol directory, Bees will just throw an
-exception and stop).
-
-Use a bind mount, and let only bees access it:
-
-	mount -osubvol=/ /dev/<your-filesystem> /var/lib/bees/root
-
-Reduce CPU and IO priority to be kinder to other applications
-sharing this host (or raise them for more aggressive disk space
-recovery).  If you use cgroups, put bees in its own cgroup, then reduce
-the `blkio.weight` and `cpu.shares` parameters.  You can also use
-`schedtool` and `ionice in the shell script that launches bees:
-
-	schedtool -D -n20 $$
-	ionice -c3 -p $$
-
-Let the bees fly:
-
-	bees /var/lib/bees/root >> /var/log/bees.log 2>&1
-
-You'll probably want to arrange for /var/log/bees.log to be rotated
-periodically.  You may also want to set umask to 077 to prevent disclosure
-of information about the contents of the filesystem through the log file.
-
+bees is a block-oriented userspace deduplication agent designed for large
+btrfs filesystems.  It is an offline dedupe combined with an incremental
+data scan capability to minimize time data spends on disk from write
+to dedupe.
+
+Strengths
+---------
+
+ * Space-efficient hash table and matching algorithms - can use as little as 1 GB hash table per 10 TB unique data (0.1GB/TB)
+ * Daemon incrementally dedupes new data using btrfs tree search
+ * Works with btrfs compression - dedupe any combination of compressed and uncompressed files
+ * **NEW** [Works around `btrfs send` problems with dedupe and incremental parent snapshots](docs/options.md)
+ * Works around btrfs filesystem structure to free more disk space
+ * Persistent hash table for rapid restart after shutdown
+ * Whole-filesystem dedupe - including snapshots
+ * Constant hash table size - no increased RAM usage if data set becomes larger
+ * Works on live data - no scheduled downtime required
+ * Automatic self-throttling based on system load
+
+Weaknesses
+----------
+
+ * Whole-filesystem dedupe - has no include/exclude filters, does not accept file lists
+ * Requires root privilege (or `CAP_SYS_ADMIN`)
+ * First run may require temporary disk space for extent reorganization
+ * [First run may increase metadata space usage if many snapshots exist](docs/gotchas.md)
+ * Constant hash table size - no decreased RAM usage if data set becomes smaller
+ * btrfs only
+
+Installation and Usage
+----------------------
+
+ * [Installation](docs/install.md)
+ * [Configuration](docs/config.md)
+ * [Running](docs/running.md)
+ * [Command Line Options](docs/options.md)
+
+Recommended Reading
+-------------------
+
+ * [bees Gotchas](docs/gotchas.md)
+ * [btrfs kernel bugs](docs/btrfs-kernel.md) - especially DATA CORRUPTION WARNING
+ * [bees vs. other btrfs features](docs/btrfs-other.md)
+ * [What to do when something goes wrong](docs/wrong.md)
+
+More Information
+----------------
+
+ * [How bees works](docs/how-it-works.md)
+ * [Missing bees features](docs/missing.md)
+ * [Event counter descriptions](docs/event-counters.md)
 
 Bug Reports and Contributions
 -----------------------------
@@ -363,13 +65,11 @@ Email bug reports and patches to Zygo Blaxell <bees@furryterror.org>.
 
 You can also use Github:
 
-	https://github.com/Zygo/bees
-
-
+        https://github.com/Zygo/bees
 
 Copyright & License
-===================
+-------------------
 
-Copyright 2015-2016 Zygo Blaxell <bees@furryterror.org>.
+Copyright 2015-2022 Zygo Blaxell <bees@furryterror.org>.
 
 GPL (version 3 or later).

docs/.gitignore

@@ -0,0 +1 @@
+*.html

docs/Makefile

@@ -0,0 +1,18 @@
+MARKDOWN := $(firstword $(shell command -v cmark-gfm redcarpet markdown2 markdown markdown_py 2>/dev/null || echo markdown))
+
+# If you have cmark-gfm, you get Github-style tables; otherwise, you don't.
+ifeq ($(notdir $(MARKDOWN)),cmark-gfm)
+MARKDOWN += -e table
+endif
+
+.PHONY: docs
+
+docs: $(subst .md,.html,$(wildcard *.md)) index.html ../README.html
+
+%.html: %.md Makefile
+	$(MARKDOWN) $< | sed -e 's/\.md/\.html/g' > $@.new
+	mv -f $@.new $@
+
+index.md: ../README.md
+	sed -e 's:docs/::g' < ../README.md > index.md.new
+	mv -f index.md.new index.md

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

docs/btrfs-kernel.md

@@ -0,0 +1,152 @@
+Recommended Kernel Version for bees
+===================================
+
+First, a warning that is not specific to bees:
+
+> **Kernel 5.1, 5.2, and 5.3 should not be used with btrfs due to a
+severe regression that can lead to fatal metadata corruption.**
+This issue is fixed in kernel 5.4.14 and later.
+
+**Recommended kernel versions for bees are 4.19, 5.4, 5.10, 5.11, or 5.12,
+with recent LTS and -stable updates.**  The latest released kernel as
+of this writing is 5.18.18.
+
+4.14, 4.9, and 4.4 LTS kernels with recent updates are OK with
+some issues.  Older kernels will be slower (a little slower or a lot
+slower depending on which issues are triggered).  Not all fixes are
+backported.
+
+Obsolete non-LTS kernels have a variety of unfixed issues and should
+not be used with btrfs.  For details see the table below.
+
+bees requires btrfs kernel API version 4.2 or higher, and does not work
+on older kernels.
+
+bees will detect and use btrfs kernel API up to version 4.15 if present.
+In some future bees release, this API version may become mandatory.
+
+
+
+
+Kernel Bug Tracking Table
+-------------------------
+
+These bugs are particularly popular among bees users, though not all are specifically relevant to bees:
+
+| First bad kernel | Last bad kernel | Issue Description | Fixed Kernel Versions | Fix Commit
+| :---: | :---: | --- | :---: | ---
+| - | 4.10 | garbage inserted in read data when reading compressed inline extent followed by a hole | 3.18.89, 4.1.49, 4.4.107, 4.9.71, 4.11 and later | e1699d2d7bf6 btrfs: add missing memset while reading compressed inline extents
+| - | 4.14 | spurious warnings from `fs/btrfs/backref.c` in `find_parent_nodes` | 3.16.57, 4.14.29, 4.15.12, 4.16 and later | c8195a7b1ad5 btrfs: remove spurious WARN_ON(ref->count < 0) in find_parent_nodes
+| 4.15 | 4.18 | compression ratio and performance regression on bees test corpus | improved in 4.19 | 4.14 performance not fully restored yet
+| - | 5.0 | silently corrupted data returned when reading compressed extents around a punched hole (bees dedupes all-zero data blocks with holes which can produce a similar effect to hole punching) | 3.16.70, 3.18.137, 4.4.177, 4.9.165, 4.14.108, 4.19.31, 5.0.4, 5.1 and later | 8e928218780e Btrfs: fix corruption reading shared and compressed extents after hole punching
+| - | 5.0 | deadlock when dedupe and rename are used simultaneously on the same files | 5.0.4, 5.1 and later | 4ea748e1d2c9 Btrfs: fix deadlock between clone/dedupe and rename
+| - | 5.1 | send failure or kernel crash while running send and dedupe on same snapshot at same time | 5.0.18, 5.1.4, 5.2 and later | 62d54f3a7fa2 Btrfs: fix race between send and deduplication that lead to failures and crashes
+| - | 5.2 | alternating send and dedupe results in incremental send failure | 4.9.188, 4.14.137, 4.19.65, 5.2.7, 5.3 and later | b4f9a1a87a48 Btrfs: fix incremental send failure after deduplication
+| 4.20 | 5.3 | balance convert to single rejected with error on 32-bit CPUs | 5.3.7, 5.4 and later | 7a54789074a5 btrfs: fix balance convert to single on 32-bit host CPUs
+| - | 5.3 | kernel crash due to tree mod log issue #1 (often triggered by bees) | 3.16.79, 4.4.195, 4.9.195, 4.14.147, 4.19.77, 5.2.19, 5.3.4, 5.4 and later | efad8a853ad2 Btrfs: fix use-after-free when using the tree modification log
+| - | 5.4 | kernel crash due to tree mod log issue #2 (often triggered by bees) | 3.16.83, 4.4.208, 4.9.208, 4.14.161, 4.19.92, 5.4.7, 5.5 and later | 6609fee8897a Btrfs: fix removal logic of the tree mod log that leads to use-after-free issues
+| 5.1 | 5.4 | metadata corruption resulting in loss of filesystem when a write operation occurs while balance starts a new block group.  **Do not use kernel 5.1 with btrfs.**  Kernel 5.2 and 5.3 have workarounds that may detect corruption in progress and abort before it becomes permanent, but do not prevent corruption from occurring.  Also kernel crash due to tree mod log issue #4. | 5.4.14, 5.5 and later | 6282675e6708 btrfs: relocation: fix reloc_root lifespan and access
+| - | 5.4 | send performance failure when shared extents have too many references | 4.9.207, 4.14.159, 4.19.90, 5.3.17, 5.4.4, 5.5 and later | fd0ddbe25095 Btrfs: send, skip backreference walking for extents with many references
+| 5.0 | 5.5 | dedupe fails to remove the last extent in a file if the file size is not a multiple of 4K | 5.4.19, 5.5.3, 5.6 and later | 831d2fa25ab8 Btrfs: make deduplication with range including the last block work
+| 4.5, backported to 3.18.31, 4.1.22, 4.4.4 | 5.5 | `df` incorrectly reports 0 free space while data space is available.  Triggered by changes in metadata size, including those typical of large-scale dedupe.  Occurs more often starting in 5.3 and especially 5.4 | 4.4.213, 4.9.213, 4.14.170, 4.19.102, 5.4.18, 5.5.2, 5.6 and later | d55966c4279b btrfs: do not zero f_bavail if we have available space
+| - | 5.5 | kernel crash due to tree mod log issue #3 (often triggered by bees) | 3.16.84, 4.4.214, 4.9.214, 4.14.171, 4.19.103, 5.4.19, 5.5.3, 5.6 and later | 7227ff4de55d Btrfs: fix race between adding and putting tree mod seq elements and nodes
+| - | 5.6 | deadlock when enumerating file references to physical extent addresses while some references still exist in deleted subvols | 5.7 and later | 39dba8739c4e btrfs: do not resolve backrefs for roots that are being deleted
+| - | 5.6 | deadlock when many extent reference updates are pending and available memory is low | 4.14.177, 4.19.116, 5.4.33, 5.5.18, 5.6.5, 5.7 and later | 351cbf6e4410 btrfs: use nofs allocations for running delayed items
+| - | 5.6 | excessive CPU usage in `LOGICAL_INO` and `FIEMAP` ioctl and increased btrfs write latency in other processes when bees translates from extent physical address to list of referencing files and offsets.  Also affects other tools like `duperemove` and `btrfs send` | 5.4.96, 5.7 and later | b25b0b871f20 btrfs: backref, use correct count to resolve normal data refs, plus 3 parent commits.  Some improvements also in earlier kernels.
+| - | 5.7 | filesystem becomes read-only if out of space while deleting snapshot | 4.9.238, 4.14.200, 4.19.149, 5.4.69, 5.8 and later | 7c09c03091ac btrfs: don't force read-only after error in drop snapshot
+| 5.1 | 5.7 | balance, device delete, or filesystem shrink operations loop endlessly on a single block group without decreasing extent count | 5.4.54, 5.7.11, 5.8 and later | 1dae7e0e58b4 btrfs: reloc: clear DEAD\_RELOC\_TREE bit for orphan roots to prevent runaway balance
+| - | 5.8 | deadlock in `TREE_SEARCH` ioctl (core component of bees filesystem scanner), followed by regression in deadlock fix | 4.4.237, 4.9.237, 4.14.199, 4.19.146, 5.4.66, 5.8.10 and later | a48b73eca4ce btrfs: fix potential deadlock in the search ioctl, 1c78544eaa46 btrfs: fix wrong address when faulting in pages in the search ioctl
+| 5.7 | 5.10 | kernel crash if balance receives fatal signal e.g. Ctrl-C | 5.4.93, 5.10.11, 5.11 and later | 18d3bff411c8 btrfs: don't get an EINTR during drop_snapshot for reloc
+| 5.10 | 5.10 | 20x write performance regression | 5.10.8, 5.11 and later | e076ab2a2ca7 btrfs: shrink delalloc pages instead of full inodes
+| 5.4 | 5.11 | spurious tree checker failures on extent ref hash | 5.11.5, 5.12 and later | 1119a72e223f btrfs: tree-checker: do not error out if extent ref hash doesn't match
+| - | 5.11 | tree mod log issue #5 | 4.4.263, 4.9.263, 4.14.227, 4.19.183, 5.4.108, 5.10.26, 5.11.9, 5.12 and later | dbcc7d57bffc btrfs: fix race when cloning extent buffer during rewind of an old root
+| - | 5.12 | tree mod log issue #6 | 4.14.233, 4.19.191, 5.4.118, 5.10.36, 5.11.20, 5.12.3, 5.13 and later | f9690f426b21 btrfs: fix race when picking most recent mod log operation for an old root
+| 4.15 | 5.16 | spurious warnings from `fs/fs-writeback.c` when `flushoncommit` is enabled | 5.15.27, 5.16.13, 5.17 and later | a0f0cf8341e3 btrfs: get rid of warning on transaction commit when using flushoncommit
+| - | 5.17 | crash during device removal can make filesystem unmountable | 5.15.54, 5.16.20, 5.17.3, 5.18 and later | bbac58698a55 btrfs: remove device item and update super block in the same transaction
+| - | 5.18 | wrong superblock num_devices makes filesystem unmountable | 4.14.283, 4.19.247, 5.4.198, 5.10.121, 5.15.46, 5.17.14, 5.18.3, 5.19 and later | d201238ccd2f btrfs: repair super block num_devices automatically
+| 5.18 | 5.19 | parent transid verify failed during log tree replay after a crash during a rename operation | 5.18.18, 5.19.2, 6.0 and later | 723df2bcc9e1 btrfs: join running log transaction when logging new name
+| 5.4 | - | kernel hang when multiple threads are running `LOGICAL_INO` and dedupe ioctl | - | workaround: reduce bees thread count to 1 with `-c1`
+
+"Last bad kernel" refers to that version's last stable update from
+kernel.org.  Distro kernels may backport additional fixes.  Consult
+your distro's kernel support for details.
+
+When the same version appears in both "last bad kernel" and "fixed kernel
+version" columns, it means the bug appears in the `.0` release and is
+fixed in the stated `.y` release.  e.g.  a "last bad kernel" of 5.4 and
+a "fixed kernel version" of 5.4.14 has the bug in kernel versions 5.4.0
+through 5.4.13 inclusive.
+
+A "-" for "first bad kernel" indicates the bug has been present since
+the relevant feature first appeared in btrfs.
+
+A "-" for "last bad kernel" indicates the bug has not yet been fixed as
+of 5.18.18.
+
+In cases where issues are fixed by commits spread out over multiple
+kernel versions, "fixed kernel version" refers to the version that
+contains all components of the fix.
+
+
+Workarounds for known kernel bugs
+---------------------------------
+
+* **Hangs with high worker thread counts**:  On kernels newer than
+  5.4, multiple threads running `LOGICAL_INO` and dedupe ioctls
+  at the same time can lead to a kernel hang.  The workaround is
+  to reduce the thread count to 1 with `-c1`.
+
+* **Slow backrefs** (aka toxic extents):  Under certain conditions,
+  if the number of references to a single shared extent grows too
+  high, the kernel consumes more and more CPU while also holding locks
+  that delay write access to the filesystem.  bees avoids this bug
+  by measuring the time the kernel spends performing `LOGICAL_INO`
+  operations and permanently blacklisting any extent or hash involved
+  where the kernel starts to get slow.  In the bees log, such blocks
+  are labelled as 'toxic' hash/block addresses.  Toxic extents are
+  rare (about 1 in 100,000 extents become toxic), but toxic extents can
+  become 8 orders of magnitude more expensive to process than the fastest
+  non-toxic extents.  This seems to affect all dedupe agents on btrfs;
+  at this time of writing only bees has a workaround for this bug.
+
+  This workaround is less necessary for kernels 5.4.96, 5.7 and later,
+  though it can still take 2 ms of CPU to resolve each extent ref on a
+  fast machine on a large, heavily fragmented file.
+
+* **dedupe breaks `btrfs send` in old kernels**.  The bees option
+  `--workaround-btrfs-send` prevents any modification of read-only subvols
+  in order to avoid breaking `btrfs send`.
+
+  This workaround is no longer necessary to avoid kernel crashes
+  and send performance failure on kernel 4.9.207, 4.14.159, 4.19.90,
+  5.3.17, 5.4.4, 5.5 and later; however, some conflict between send
+  and dedupe still remains, so the workaround is still useful.
+
+  `btrfs receive` is not and has never been affected by this issue.
+
+Unfixed kernel bugs
+-------------------
+
+As of 5.18.18:
+
+* **The kernel does not permit `btrfs send` and dedupe to run at the
+  same time**.  Recent kernels no longer crash, but now refuse one
+  operation with an error if the other operation was already running.
+
+  bees has not been updated to handle the new dedupe behavior optimally.
+  Optimal behavior is to defer dedupe operations when send is detected,
+  and resume after the send is finished.  Current bees behavior is to
+  complain loudly about each individual dedupe failure in log messages,
+  and abandon duplicate data references in the snapshot that send is
+  processing.  A future bees version shall have better handling for
+  this situation.
+
+  Workaround:  send `SIGSTOP` to bees, or terminate the bees process,
+  before running `btrfs send`.
+
+  This workaround is not strictly required if snapshot is deleted after
+  sending.  In that case, any duplicate data blocks that were not removed
+  by dedupe will be removed by snapshot delete instead.  The workaround
+  still saves some IO.
+
+  `btrfs receive` is not affected by this issue.

docs/btrfs-other.md

@@ -0,0 +1,62 @@
+Good Btrfs Feature Interactions
+-------------------------------
+
+bees has been tested in combination with the following:
+
+* btrfs compression (zlib, lzo, zstd), mixtures of compressed and uncompressed extents
+* PREALLOC extents (unconditionally replaced with holes)
+* HOLE extents and btrfs no-holes feature
+* Other deduplicators, reflink copies (though bees may decide to redo their work)
+* btrfs snapshots and non-snapshot subvols (RW and RO)
+* Concurrent file modification (e.g. PostgreSQL and sqlite databases, build daemons)
+* all btrfs RAID profiles
+* IO errors during dedupe (read errors will throw exceptions, bees will catch them and skip over the affected extent)
+* Filesystems mounted *with* the flushoncommit option ([lots of harmless kernel log warnings on 4.15 and later](btrfs-kernel.md))
+* Filesystems mounted *without* the flushoncommit option
+* 4K filesystem data block size / clone alignment
+* 64-bit and 32-bit LE host CPUs (amd64, x86, arm)
+* Huge files (>1TB--although Btrfs performance on such files isn't great in general)
+* filesystems up to 30T+ bytes, 100M+ files
+* btrfs receive
+* btrfs nodatacow/nodatasum inode attribute or mount option (bees skips all nodatasum files)
+* open(O_DIRECT) (seems to work as well--or as poorly--with bees as with any other btrfs feature)
+* lvmcache:  no problems observed in testing with recent kernels or reported by users in the last year.
+
+Bad Btrfs Feature Interactions
+------------------------------
+
+bees has been tested in combination with the following, and various problems are known:
+
+* bcache:  no data-losing problems observed in testing with recent kernels
+  or reported by users in the last year.  Some issues observed with
+  bcache interacting badly with some SSD models' firmware, but so far
+  this only causes temporary loss of service, not filesystem damage.
+  This behavior does not seem to be specific to bees (ordinary filesystem
+  tests with rsync and snapshots will reproduce it), but it does prevent
+  any significant testing of bees on bcache.
+
+* btrfs send:  there are bugs in `btrfs send` that can be triggered by bees.
+  The [`--workaround-btrfs-send` option](options.md) works around this issue
+  by preventing bees from modifying read-only snapshots.
+
+* btrfs qgroups:  very slow, sometimes hangs...and it's even worse when
+  bees is running.
+
+* btrfs autodefrag mount option:  hangs and high CPU usage problems
+  reported by users.  bees cannot distinguish autodefrag activity from
+  normal filesystem activity and will likely try to undo the autodefrag
+  if duplicate copies of the defragmented data exist.
+
+Untested Btrfs Feature Interactions
+-----------------------------------
+
+bees has not been tested with the following, and undesirable interactions may occur:
+
+* Non-4K filesystem data block size (should work if recompiled)
+* Non-equal hash (SUM) and filesystem data block (CLONE) sizes (need to fix that eventually)
+* btrfs seed filesystems (does anyone even use those?)
+* btrfs out-of-tree kernel patches (e.g. in-kernel dedupe or encryption)
+* btrfs-convert from ext2/3/4 (never tested, might run out of space or ignore significant portions of the filesystem due to sanity checks)
+* btrfs mixed block groups (don't know a reason why it would *not* work, but never tested)
+* flashcache: an out-of-tree cache-HDD-on-SSD block layer helper.
+* Host CPUs with exotic page sizes, alignment requirements, or endianness (ppc, alpha, sparc, strongarm, s390, mips, m68k...)

docs/config.md

@@ -0,0 +1,188 @@
+bees Configuration
+==================
+
+The only configuration parameter that *must* be provided is the hash
+table size.  Other parameters are optional or hardcoded, and the defaults
+are reasonable in most cases.
+
+Hash Table Sizing
+-----------------
+
+Hash table entries are 16 bytes per data block.  The hash table stores
+the most recently read unique hashes.  Once the hash table is full,
+each new entry in the table evicts an old entry.
+
+Here are some numbers to estimate appropriate hash table sizes:
+
+    unique data size |  hash table size |average dedupe extent size
+        1TB          |      4GB         |        4K
+        1TB          |      1GB         |       16K
+        1TB          |    256MB         |       64K
+        1TB          |    128MB         |      128K <- recommended
+        1TB          |     16MB         |     1024K
+       64TB          |      1GB         |     1024K
+
+Notes:
+
+ * If the hash table is too large, no extra dedupe efficiency is
+obtained, and the extra space just wastes RAM.  Extra space can also slow
+bees down by preventing old data from being evicted, so bees wastes time
+looking for matching data that is no longer present on the filesystem.
+
+ * If the hash table is too small, bees extrapolates from matching
+blocks to find matching adjacent blocks in the filesystem that have been
+evicted from the hash table.  In other words, bees only needs to find
+one block in common between two extents in order to be able to dedupe
+the entire extents.  This provides significantly more dedupe hit rate
+per hash table byte than other dedupe tools.
+
+ * When counting unique data in compressed data blocks to estimate
+optimum hash table size, count the *uncompressed* size of the data.
+
+ * Another way to approach the hash table size is to simply decide how much
+RAM can be spared without too much discomfort, give bees that amount of
+RAM, and accept whatever dedupe hit rate occurs as a result.  bees will
+do the best job it can with the RAM it is given.
+
+Factors affecting optimal hash table size
+-----------------------------------------
+
+It is difficult to predict the net effect of data layout and access
+patterns on dedupe effectiveness without performing deep inspection of
+both the filesystem data and its structure--a task that is as expensive
+as performing the deduplication.
+
+* **Compression** on the filesystem reduces the average extent length
+compared to uncompressed filesystems.  The maximum compressed extent
+length on btrfs is 128KB, while the maximum uncompressed extent length
+is 128MB.  Longer extents decrease the optimum hash table size while
+shorter extents increase the optimum hash table size because the
+probability of a hash table entry being present (i.e. unevicted) in
+each extent is proportional to the extent length.
+
+   As a rule of thumb, the optimal hash table size for a compressed
+filesystem is 2-4x larger than the optimal hash table size for the same
+data on an uncompressed filesystem.  Dedupe efficiency falls dramatically
+with hash tables smaller than 128MB/TB as the average dedupe extent size
+is larger than the largest possible compressed extent size (128KB).
+
+* **Short writes** also shorten the average extent length and increase
+optimum hash table size.  If a database writes to files randomly using
+4K page writes, all of these extents will be 4K in length, and the hash
+table size must be increased to retain each one (or the user must accept
+a lower dedupe hit rate).
+
+   Defragmenting files that have had many short writes increases the
+extent length and therefore reduces the optimum hash table size.
+
+* **Time between duplicate writes** also affects the optimum hash table
+size.  bees reads data blocks in logical order during its first pass,
+and after that new data blocks are read incrementally a few seconds or
+minutes after they are written.  bees finds more matching blocks if there
+is a smaller amount of data between the matching reads, i.e. there are
+fewer blocks evicted from the hash table.  If most identical writes to
+the filesystem occur near the same time, the optimum hash table size is
+smaller.  If most identical writes occur over longer intervals of time,
+the optimum hash table size must be larger to avoid evicting hashes from
+the table before matches are found.
+
+   For example, a build server normally writes out very similar source
+code files over and over, so it will need a smaller hash table than a
+backup server which has to refer to the oldest data on the filesystem
+every time a new client machine's data is added to the server.
+
+Scanning modes for multiple subvols
+-----------------------------------
+
+The `--scan-mode` option affects how bees schedules worker threads
+between subvolumes.  Scan modes are an experimental feature and will
+likely be deprecated in favor of a better solution.
+
+Scan mode can be changed at any time by restarting bees with a different
+mode option.  Scan state tracking is the same for all of the currently
+implemented modes.  The difference between the modes is the order in
+which subvols are selected.
+
+If a filesystem has only one subvolume with data in it, then the
+`--scan-mode` option has no effect.  In this case, there is only one
+subvolume to scan, so worker threads will all scan that one.
+
+Within a subvol, there is a single optimal scan order:  files are scanned
+in ascending numerical inode order.  Each worker will scan a different
+inode to avoid having the threads contend with each other for locks.
+File data is read sequentially and in order, but old blocks from earlier
+scans are skipped.
+
+Between subvols, there are several scheduling algorithms with different
+trade-offs:
+
+Scan mode 0, "lockstep", scans the same inode number in each subvol at
+close to the same time.  This is useful if the subvols are snapshots
+with a common ancestor, since the same inode number in each subvol will
+have similar or identical contents.  This maximizes the likelihood
+that all of the references to a snapshot of a file are scanned at
+close to the same time, improving dedupe hit rate and possibly taking
+advantage of VFS caching in the Linux kernel.  If the subvols are
+unrelated (i.e. not snapshots of a single subvol) then this mode does
+not provide significant benefit over random selection.  This mode uses
+smaller amounts of temporary space for shorter periods of time when most
+subvols are snapshots.  When a new snapshot is created, this mode will
+stop scanning other subvols and scan the new snapshot until the same
+inode number is reached in each subvol, which will effectively stop
+dedupe temporarily as this data has already been scanned and deduped
+in the other snapshots.
+
+Scan mode 1, "independent", scans the next inode with new data in each
+subvol.  Each subvol's scanner shares inodes uniformly with all other
+subvol scanners until the subvol has no new inodes left.  This mode makes
+continuous forward progress across the filesystem and provides average
+performance across a variety of workloads, but is slow to respond to new
+data, and may spend a lot of time deduping short-lived subvols that will
+soon be deleted when it is preferable to dedupe long-lived subvols that
+will be the origin of future snapshots.  When a new snapshot is created,
+previous subvol scans continue as before, but the time is now divided
+among one more subvol.
+
+Scan mode 2, "sequential", scans one subvol at a time, in numerical subvol
+ID order, processing each subvol completely before proceeding to the
+next subvol.  This avoids spending time scanning short-lived snapshots
+that will be deleted before they can be fully deduped (e.g. those used
+for `btrfs send`).  Scanning is concentrated on older subvols that are
+more likely to be origin subvols for future snapshots, eliminating the
+need to dedupe future snapshots separately.  This mode uses the largest
+amount of temporary space for the longest time, and typically requires
+a larger hash table to maintain dedupe hit rate.
+
+Scan mode 3, "recent", scans the subvols with the highest `min_transid`
+value first (i.e. the ones that were most recently completely scanned),
+then falls back to "independent" mode to break ties.  This interrupts
+long scans of old subvols to give a rapid dedupe response to new data,
+then returns to the old subvols after the new data is scanned.  It is
+useful for large filesystems with multiple active subvols and rotating
+snapshots, where the first-pass scan can take months, but new duplicate
+data appears every day.
+
+The default scan mode is 1, "independent".
+
+If you are using bees for the first time on a filesystem with many
+existing snapshots, you should read about [snapshot gotchas](gotchas.md).
+
+Threads and load management
+---------------------------
+
+By default, bees creates one worker thread for each CPU detected.
+These threads then perform scanning and dedupe operations.  The number of
+worker threads can be set with the [`--thread-count` and `--thread-factor`
+options](options.md).
+
+If desired, bees can automatically increase or decrease the number
+of worker threads in response to system load.  This reduces impact on
+the rest of the system by pausing bees when other CPU and IO intensive
+loads are active on the system, and resumes bees when the other loads
+are inactive.  This is configured with the [`--loadavg-target` and
+`--thread-min` options](options.md).
+
+Log verbosity
+-------------
+
+bees can be made less chatty with the [`--verbose` option](options.md).

docs/event-counters.md

@@ -0,0 +1,403 @@
+Event Counters
+==============
+
+General
+-------
+
+Event counters are used in bees to collect simple branch-coverage
+statistics.  Every time bees makes a decision, it increments an event
+counter, so there are _many_ event counters.
+
+Events are grouped by prefix in their event names, e.g. `block` is block
+I/O, `dedup` is deduplication requests, `tmp` is temporary files, etc.
+
+Events with the suffix `_ms` count total milliseconds spent performing
+the operation.  These are counted separately for each thread, so there
+can be more than 1000 ms per second.
+
+There is considerable overlap between some events, e.g. `example_try`
+denotes an event that is counted when an action is attempted,
+`example_hit` is counted when the attempt succeeds and has a desired
+outcome, and `example_miss` is counted when the attempt succeeds but
+the desired outcome is not achieved.  In most cases `example_try =
+example_hit + example_miss + (`example failed and threw an exception`)`,
+but some event groups defy such simplistic equations.
+
+addr
+----
+
+The `addr` event group consists of operations related to translating `(root,
+inode, offset)` tuples (i.e. logical position within a file) into btrfs
+virtual block addresses (i.e. physical position on disk).
+
+ * `addr_block`: The address of a block was computed.
+ * `addr_compressed`: Obsolete implementation of `addr_compressed_offset`.
+ * `addr_compressed_offset`: The address of a compressed block was computed.
+ * `addr_delalloc`: The address of a block could not be computed due to
+ delayed allocation.  Only possible when using obsolete `FIEMAP` code.
+ * `addr_eof_e`: The address of a block at EOF that was not block-aligned was computed.
+ * `addr_from_fd`: The address of a block was computed using a `fd`
+ (open to the file in question) and `offset` pair.
+ * `addr_from_root_fd`: The address of a block was computed using
+ the filesystem root `fd` instead of the open file `fd` for the
+ `TREE_SEARCH_V2` ioctl.  This is obsolete and should probably be removed
+ at some point.
+ * `addr_hole`: The address of a block in a hole was computed.
+ * `addr_magic`: The address of a block cannot be determined in a way
+ that bees can use (unrecognized flags or flags known to be incompatible
+ with bees).
+ * `addr_uncompressed`: The address of an uncompressed block was computed.
+ * `addr_unrecognized`: The address of a block with unrecognized flags
+ (i.e. kernel version newer than bees) was computed.
+ * `addr_unusable`: The address of a block with unusable flags (i.e. flags
+ that are known to be incompatible with bees) was computed.
+
+adjust
+------
+
+The `adjust` event group consists of operations related to translating stored virtual block addresses (i.e. physical position on disk) to `(root, inode, offset)` tuples (i.e. logical positions within files).  `BeesResolver::adjust_offset` determines if a single candidate reference from the `LOGICAL_INO` ioctl corresponds to the requested btrfs virtual block address.
+
+ * `adjust_compressed_offset_correct`: A block address corresponding to a compressed block was retrieved from the hash table and resolved to a physical block containing data that matches another block bees has already read.
+ * `adjust_compressed_offset_wrong`: A block address corresponding to a compressed block was retrieved from the hash table and resolved to a physical block containing data that matches the hash but not the data from another block bees has already read (i.e. there was a hash collision).
+ * `adjust_eof_fail`: A block address corresponding to a block at EOF that was not aligned to a block boundary matched another block bees already read, but the length of the unaligned data in both blocks was not equal.  This is usually caused by stale entries in the hash table pointing to blocks that have been overwritten since the hash table entries were created.  It can also be caused by hash collisions, but hashes are not yet computed at this point in the code, so this event does not correlate to the `hash_collision` counter.
+ * `adjust_eof_haystack`: A block address from the hash table corresponding to a block at EOF that was not aligned to a block boundary was processed.
+ * `adjust_eof_hit`: A block address corresponding to a block at EOF that was not aligned to a block boundary matched a similarly unaligned block that bees already read.
+ * `adjust_eof_miss`: A block address from the hash table corresponding to a block at EOF that was not aligned to a block boundary did not match a similarly unaligned block that bees already read.
+ * `adjust_eof_needle`: A block address from scanning the disk corresponding to a block at EOF that was not aligned to a block boundary was processed.
+ * `adjust_exact`: A block address from the hash table corresponding to an uncompressed data block was processed to find its `(root, inode, offset)` references.
+ * `adjust_exact_correct`: A block address corresponding to an uncompressed block was retrieved from the hash table and resolved to a physical block containing data that matches another block bees has already read.
+ * `adjust_exact_wrong`: A block address corresponding to an uncompressed block was retrieved from the hash table and resolved to a physical block containing data that matches the hash but not the data from another block bees has already read (i.e. there was a hash collision).
+ * `adjust_hit`: A block address was retrieved from the hash table and resolved to a physical block in an uncompressed extent containing data that matches the data from another block bees has already read (i.e. a duplicate match was found).
+ * `adjust_miss`: A block address was retrieved from the hash table and resolved to a physical block containing a hash that does not match the hash from another block bees has already read (i.e. the hash table contained a stale entry and the data it referred to has since been overwritten in the filesystem).
+ * `adjust_needle_too_long`: A block address was retrieved from the hash table, but when the corresponding extent item was retrieved, its offset or length were out of range to be a match (i.e. the hash table contained a stale entry and the data it referred to has since been overwritten in the filesystem).
+ * `adjust_no_match`: A hash collision occurred (i.e. a block on disk was located with the same hash as the hash table entry but different data) .  Effectively an alias for `hash_collision` as it is not possible to have one event without the other.
+ * `adjust_offset_high`: The `LOGICAL_INO` ioctl gave an extent item that does not overlap with the desired block because the extent item ends before the desired block in the extent data.
+ * `adjust_offset_hit`: A block address was retrieved from the hash table and resolved to a physical block in a compressed extent containing data that matches the data from another block bees has already read (i.e. a duplicate match was found).
+ * `adjust_offset_low`: The `LOGICAL_INO` ioctl gave an extent item that does not overlap with the desired block because the extent item begins after the desired block in the extent data.
+ * `adjust_try`: A block address and extent item candidate were passed to `BeesResolver::adjust_offset` for processing.
+
+block
+-----
+
+The `block` event group consists of operations related to reading data blocks from the filesystem.
+
+ * `block_bytes`: Number of data bytes read.
+ * `block_hash`: Number of block hashes computed.
+ * `block_ms`: Total time reading data blocks.
+ * `block_read`: Number of data blocks read.
+ * `block_zero`: Number of data blocks read with zero contents (i.e. candidates for replacement with a hole).
+
+bug
+---
+
+The `bug` event group consists of known bugs in bees.
+
+ * `bug_bad_max_transid`: A bad `max_transid` was found and removed in `beescrawl.dat`.
+ * `bug_bad_min_transid`: A bad `min_transid` was found and removed in `beescrawl.dat`.
+ * `bug_dedup_same_physical`: `BeesContext::dedup` detected that the physical extent was the same for `src` and `dst`.  This has no effect on space usage so it is a waste of time, and also carries the risk of creating a toxic extent.
+ * `bug_grow_pair_overlaps`: Two identical blocks were found, and while searching matching adjacent extents, the potential `src` grew to overlap the potential `dst`.  This would create a cycle where bees keeps trying to eliminate blocks but instead just moves them around.
+ * `bug_hash_duplicate_cell`: Two entries in the hash table were identical.  This only happens due to data corruption or a bug.
+ * `bug_hash_magic_addr`: An entry in the hash table contains an address with magic.  Magic addresses cannot be deduplicated so they should not be stored in the hash table.
+
+chase
+-----
+
+The `chase` event group consists of operations connecting btrfs virtual block addresses with `(root, inode, offset)` tuples.  `resolve` is the top level, `adjust` is the bottom level, and `chase` is the middle level.  `BeesResolver::chase_extent_ref` iterates over `(root, inode, offset)` tuples from `LOGICAL_INO` and attempts to find a single matching block in the filesystem given a candidate block from an earlier `scan` operation.
+
+ * `chase_corrected`: A matching block was resolved to a `(root, inode, offset)` tuple, but the offset of a block matching data did not match the offset given by `LOGICAL_INO`.
+ * `chase_hit`: A block address was successfully and correctly translated to a `(root, inode, offset)` tuple.
+ * `chase_no_data`: A block address was not successfully translated to a `(root, inode, offset)` tuple.
+ * `chase_no_fd`: A `(root, inode)` tuple could not be opened (i.e. the file was deleted on the filesystem).
+ * `chase_try`: A block address translation attempt started.
+ * `chase_uncorrected`: A matching block was resolved to a `(root, inode, offset)` tuple, and the offset of a block matching data did match the offset given by `LOGICAL_INO`.
+ * `chase_wrong_addr`: The btrfs virtual address (i.e. physical block address) found at a candidate `(root, inode, offset)` tuple did not match the expected btrfs virtual address (i.e. the filesystem was modified during the resolve operation).
+ * `chase_wrong_magic`: The extent item at a candidate `(root, inode, offset)` tuple has magic bits and cannot match any btrfs virtual address in the hash table (i.e. the filesystem was modified during the resolve operation).
+
+crawl
+-----
+
+The `crawl` event group consists of operations related to scanning btrfs trees to find new extent refs to scan for dedupe.
+
+ * `crawl_again`: An inode crawl was restarted because the extent was already locked by another running crawl.
+ * `crawl_blacklisted`: An extent was not scanned because it belongs to a blacklisted file.
+ * `crawl_create`: A new subvol crawler was created.
+ * `crawl_done`: One pass over all subvols on the filesystem was completed.
+ * `crawl_empty`: A `TREE_SEARCH_V2` ioctl call failed or returned an empty set (usually because all data in the subvol was scanned).
+ * `crawl_fail`: A `TREE_SEARCH_V2` ioctl call failed.
+ * `crawl_gen_high`: An extent item in the search results refers to an extent that is newer than the current crawl's `max_transid` allows.
+ * `crawl_gen_low`: An extent item in the search results refers to an extent that is older than the current crawl's `min_transid` allows.
+ * `crawl_hole`: An extent item in the search results refers to a hole.
+ * `crawl_inline`: An extent item in the search results contains an inline extent.
+ * `crawl_items`: An item in the `TREE_SEARCH_V2` data was processed.
+ * `crawl_ms`: Time spent running the `TREE_SEARCH_V2` ioctl.
+ * `crawl_no_empty`: Attempted to delete the last crawler.  Should never happen.
+ * `crawl_nondata`: An item in the search results is not data.
+ * `crawl_prealloc`: An extent item in the search results refers to a `PREALLOC` extent.
+ * `crawl_push`: An extent item in the search results is suitable for scanning and deduplication.
+ * `crawl_scan`: An extent item in the search results is submitted to `BeesContext::scan_forward` for scanning and deduplication.
+ * `crawl_search`: A `TREE_SEARCH_V2` ioctl call was successful.
+ * `crawl_unknown`: An extent item in the search results has an unrecognized type.
+
+dedup
+-----
+
+The `dedup` (sic) event group consists of operations that deduplicate data.
+
+ * `dedup_bytes`: Total bytes in extent references deduplicated.
+ * `dedup_copy`: Total bytes copied to eliminate unique data in extents containing a mix of unique and duplicate data.
+ * `dedup_hit`: Total number of pairs of identical extent references.
+ * `dedup_miss`: Total number of pairs of non-identical extent references.
+ * `dedup_ms`: Total time spent running the `FILE_EXTENT_SAME` (aka `FI_DEDUPERANGE` or `dedupe_file_range`) ioctl.
+ * `dedup_prealloc_bytes`: Total bytes in eliminated `PREALLOC` extent references.
+ * `dedup_prealloc_hit`: Total number of successfully eliminated `PREALLOC` extent references.
+ * `dedup_prealloc_hit`: Total number of unsuccessfully eliminated `PREALLOC` extent references (i.e. filesystem data changed between scan and dedupe).
+ * `dedup_try`: Total number of pairs of extent references submitted for deduplication.
+ * `dedup_workaround_btrfs_send`: Total number of extent reference pairs submitted for deduplication that were discarded to workaround `btrfs send` bugs.
+
+exception
+---------
+
+The `exception` event group consists of C++ exceptions.  C++ exceptions are thrown due to IO errors and internal constraint check failures.
+
+ * `exception_caught`: Total number of C++ exceptions thrown and caught by a generic exception handler.
+ * `exception_caught_silent`: Total number of "silent" C++ exceptions thrown and caught by a generic exception handler.  These are exceptions which are part of the correct and normal operation of bees.  The exceptions are logged at a lower log level.
+
+hash
+----
+
+The `hash` event group consists of operations related to the bees hash table.
+
+ * `hash_already`: A `(hash, address)` pair was already present in the hash table during a `BeesHashTable::push_random_hash_addr` operation.
+ * `hash_bump`: An existing `(hash, address)` pair was moved forward in the hash table by a `BeesHashTable::push_random_hash_addr` operation.
+ * `hash_collision`: A pair of data blocks was found with identical hashes but different data.
+ * `hash_erase`: A `(hash, address)` pair in the hash table was removed because a matching data block could not be found in the filesystem (i.e. the hash table entry is out of date).
+ * `hash_erase_miss`: A `(hash, address)` pair was reported missing from the filesystem but no such entry was found in the hash table (i.e. race between scanning threads or pair already evicted).
+ * `hash_evict`: A `(hash, address)` pair was evicted from the hash table to accommodate a new hash table entry.
+ * `hash_extent_in`: A hash table extent was read.
+ * `hash_extent_out`: A hash table extent was written.
+ * `hash_front`: A `(hash, address)` pair was pushed to the front of the list because it matched a duplicate block.
+ * `hash_front_already`: A `(hash, address)` pair was pushed to the front of the list because it matched a duplicate block, but the pair was already at the front of the list so no change occurred.
+ * `hash_insert`: A `(hash, address)` pair was inserted by `BeesHashTable::push_random_hash_addr`.
+ * `hash_lookup`: The hash table was searched for `(hash, address)` pairs matching a given `hash`.
+
+inserted
+--------
+
+The `inserted` event group consists of operations related to storing hash and address data in the hash table (i.e. the hash table client).
+
+ * `inserted_block`: Total number of data block references scanned and inserted into the hash table.
+ * `inserted_clobbered`: Total number of data block references scanned and eliminated from the filesystem.
+
+matched
+-------
+
+The `matched` event group consists of events related to matching incoming data blocks against existing hash table entries.
+
+ * `matched_0`: A data block was scanned, hash table entries found, but no matching data blocks on the filesytem located.
+ * `matched_1_or_more`: A data block was scanned, hash table entries found, and one or more matching data blocks on the filesystem located.
+ * `matched_2_or_more`: A data block was scanned, hash table entries found, and two or more matching data blocks on the filesystem located.
+ * `matched_3_or_more`: A data block was scanned, hash table entries found, and three or more matching data blocks on the filesystem located.
+
+open
+----
+
+The `open` event group consists of operations related to translating `(root, inode)` tuples into open file descriptors (i.e. `open_by_handle` emulation for btrfs).
+
+ * `open_clear`: The open FD cache was cleared to avoid keeping file descriptors open too long.
+ * `open_fail_enoent`: A file could not be opened because it no longer exists (i.e. it was deleted or renamed during the lookup/resolve operations).
+ * `open_fail_error`: A file could not be opened for other reasons (e.g. IO error, permission denied, out of resources).
+ * `open_file`: A file was successfully opened.  This counts only the `open()` system call, not other reasons why the opened FD might not be usable.
+ * `open_hit`: A file was successfully opened and the FD was acceptable.
+ * `open_ino_ms`: Total time spent executing the `open()` system call.
+ * `open_lookup_empty`: No paths were found for the inode in the `INO_PATHS` ioctl.
+ * `open_lookup_enoent`: The `INO_PATHS` ioctl returned ENOENT.
+ * `open_lookup_error`: The `INO_PATHS` ioctl returned a different error.
+ * `open_lookup_ok`: The `INO_PATHS` ioctl successfully returned a list of one or more filenames.
+ * `open_no_path`: All attempts to open a file by `(root, inode)` pair failed.
+ * `open_no_root`: An attempt to open a file by `(root, inode)` pair failed because the `root` could not be opened.
+ * `open_root_ms`: Total time spent opening subvol root FDs.
+ * `open_wrong_dev`: A FD returned by `open()` did not match the device belonging to the filesystem subvol.
+ * `open_wrong_flags`: A FD returned by `open()` had incompatible flags (`NODATASUM` / `NODATACOW`).
+ * `open_wrong_ino`: A FD returned by `open()` did not match the expected inode (i.e. the file was renamed or replaced during the lookup/resolve operations).
+ * `open_wrong_root`: A FD returned by `open()` did not match the expected subvol ID (i.e. `root`).
+
+pairbackward
+------------
+
+The `pairbackward` event group consists of events related to extending matching block ranges backward starting from the initial block match found using the hash table.
+
+ * `pairbackward_bof_first`: A matching pair of block ranges could not be extended backward because the beginning of the first (src) file was reached.
+ * `pairbackward_bof_second`: A matching pair of block ranges could not be extended backward because the beginning of the second (dst) file was reached.
+ * `pairbackward_hit`: A pair of matching block ranges was extended backward by one block.
+ * `pairbackward_miss`: A pair of matching block ranges could not be extended backward by one block because the pair of blocks before the first block in the range did not contain identical data.
+ * `pairbackward_ms`: Total time spent extending matching block ranges backward from the first matching block found by hash table lookup.
+ * `pairbackward_overlap`: A pair of matching block ranges could not be extended backward by one block because this would cause the two block ranges to overlap.
+ * `pairbackward_same`: A pair of matching block ranges could not be extended backward by one block because this would cause the two block ranges to refer to the same btrfs data extent.
+ * `pairbackward_stop`: Stopped extending a pair of matching block ranges backward for any of the reasons listed here.
+ * `pairbackward_toxic_addr`: A pair of matching block ranges was abandoned because the extended range would include a data block with a toxic address.
+ * `pairbackward_toxic_hash`: A pair of matching block ranges was abandoned because the extended range would include a data block with a toxic hash.
+ * `pairbackward_try`: Started extending a pair of matching block ranges backward.
+ * `pairbackward_zero`: A pair of matching block ranges could not be extended backward by one block because the src block contained all zeros and was not compressed.
+
+pairforward
+-----------
+
+The `pairforward` event group consists of events related to extending matching block ranges forward starting from the initial block match found using the hash table.
+
+ * `pairforward_eof_first`: A matching pair of block ranges could not be extended forward because the end of the first (src) file was reached.
+ * `pairforward_eof_malign`: A matching pair of block ranges could not be extended forward because the end of the second (dst) file was not aligned to a 4K boundary nor the end of the first (src) file.
+ * `pairforward_eof_second`: A matching pair of block ranges could not be extended forward because the end of the second (dst) file was reached.
+ * `pairforward_hit`: A pair of matching block ranges was extended forward by one block.
+ * `pairforward_hole`: A pair of matching block ranges was extended forward by one block, and the block was a hole in the second (dst) file.
+ * `pairforward_miss`: A pair of matching block ranges could not be extended forward by one block because the pair of blocks after the last block in the range did not contain identical data.
+ * `pairforward_ms`: Total time spent extending matching block ranges forward from the first matching block found by hash table lookup.
+ * `pairforward_overlap`: A pair of matching block ranges could not be extended forward by one block because this would cause the two block ranges to overlap.
+ * `pairforward_same`: A pair of matching block ranges could not be extended forward by one block because this would cause the two block ranges to refer to the same btrfs data extent.
+ * `pairforward_stop`: Stopped extending a pair of matching block ranges forward for any of the reasons listed here.
+ * `pairforward_toxic_addr`: A pair of matching block ranges was abandoned because the extended range would include a data block with a toxic address.
+ * `pairforward_toxic_hash`: A pair of matching block ranges was abandoned because the extended range would include a data block with a toxic hash.
+ * `pairforward_try`: Started extending a pair of matching block ranges forward.
+ * `pairforward_zero`: A pair of matching block ranges could not be extended backward by one block because the src block contained all zeros and was not compressed.
+
+readahead
+---------
+
+The `readahead` event group consists of events related to calls to `posix_fadvise`.
+
+ * `readahead_ms`: Total time spent running `posix_fadvise(..., POSIX_FADV_WILLNEED)` aka `readahead()`.
+ * `readahead_unread_ms`: Total time spent running `posix_fadvise(..., POSIX_FADV_DONTNEED)`.
+
+replacedst
+----------
+
+The `replacedst` event group consists of events related to replacing a single reference to a dst extent using any suitable src extent (i.e. eliminating a single duplicate extent ref during a crawl).
+
+ * `replacedst_dedup_hit`: A duplicate extent reference was identified and removed.
+ * `replacedst_dedup_miss`: A duplicate extent reference was identified, but src and dst extents did not match (i.e. the filesystem changed in the meantime).
+ * `replacedst_grown`: A duplicate block was identified, and adjacent blocks were duplicate as well.
+ * `replacedst_overlaps`: A pair of duplicate block ranges was identified, but the pair was not usable for dedupe because the two ranges overlap.
+ * `replacedst_same`: A pair of duplicate block ranges was identified, but the pair was not usable for dedupe because the physical block ranges were the same.
+ * `replacedst_try`: A duplicate block was identified and an attempt was made to remove it (i.e. this is the total number of replacedst calls).
+
+replacesrc
+----------
+
+The `replacesrc` event group consists of events related to replacing every reference to a src extent using a temporary copy of the extent's data (i.e. eliminating leftover unique data in a partially duplicate extent during a crawl).
+
+ * `replacesrc_dedup_hit`: A duplicate extent reference was identified and removed.
+ * `replacesrc_dedup_miss`: A duplicate extent reference was identified, but src and dst extents did not match (i.e. the filesystem changed in the meantime).
+ * `replacesrc_grown`: A duplicate block was identified, and adjacent blocks were duplicate as well.
+ * `replacesrc_overlaps`: A pair of duplicate block ranges was identified, but the pair was not usable for dedupe because the two ranges overlap.
+ * `replacesrc_try`: A duplicate block was identified and an attempt was made to remove it (i.e. this is the total number of replacedst calls).
+
+
+resolve
+-------
+
+The `resolve` event group consists of operations related to translating a btrfs virtual block address (i.e. physical block address) to a `(root, inode, offset)` tuple (i.e. locating and opening the file containing a matching block).  `resolve` is the top level, `chase` and `adjust` are the lower two levels.
+
+ * `resolve_fail`: The `LOGICAL_INO` ioctl returned an error.
+ * `resolve_large`: The `LOGICAL_INO` ioctl returned more than 2730 results (the limit of the v1 ioctl).
+ * `resolve_ms`: Total time spent in the `LOGICAL_INO` ioctl (i.e. wallclock time, not kernel CPU time).
+ * `resolve_ok`: The `LOGICAL_INO` ioctl returned success.
+ * `resolve_overflow`: The `LOGICAL_INO` ioctl returned more than 655050 extents (the limit of the v2 ioctl).
+ * `resolve_toxic`: The `LOGICAL_INO` ioctl took more than 0.1 seconds of kernel CPU time.
+
+root
+----
+
+The `root` event group consists of operations related to translating a btrfs root ID (i.e. subvol ID) into an open file descriptor by navigating the btrfs root tree.
+
+ * `root_clear`: The root FD cache was cleared.
+ * `root_found`: A root FD was successfully opened.
+ * `root_notfound`: A root FD could not be opened because all candidate paths could not be opened, or there were no paths available.
+ * `root_ok`: A root FD was opened and its correctness verified.
+ * `root_open_fail`: A root FD `open()` attempt returned an error.
+ * `root_parent_open_fail`: A recursive call to open the parent of a subvol failed.
+ * `root_parent_open_ok`: A recursive call to open the parent of a subvol succeeded.
+ * `root_parent_open_try`: A recursive call to open the parent of a subvol was attempted.
+ * `root_parent_path_empty`: No path could be found to connect a parent root FD to its child.
+ * `root_parent_path_fail`: The `INO_PATH` ioctl failed to find a name for a child subvol relative to its parent.
+ * `root_parent_path_open_fail`: The `open()` call in a recursive call to open the parent of a subvol returned an error.
+ * `root_workaround_btrfs_send`: A subvol was determined to be read-only and disabled to implement the btrfs send workaround.
+
+scan
+----
+
+The `scan` event group consists of operations related to scanning incoming data.  This is where bees finds duplicate data and populates the hash table.
+
+ * `scan_blacklisted`: A blacklisted extent was passed to `scan_forward` and dropped.
+ * `scan_block`: A block of data was scanned.
+ * `scan_bump`: After deduping a block range, the scan pointer had to be moved past the end of the deduped byte range.
+ * `scan_dup_block`: Number of duplicate blocks deduped.
+ * `scan_dup_hit`: A pair of duplicate block ranges was found and removed.
+ * `scan_dup_miss`: A pair of duplicate blocks was found in the hash table but not in the filesystem.
+ * `scan_eof`: Scan past EOF was attempted.
+ * `scan_erase_redundant`: Blocks in the hash table were removed because they were removed from the filesystem by dedupe.
+ * `scan_extent`: An extent was scanned (`scan_one_extent`).
+ * `scan_extent_tiny`: An extent below 128K that was not the beginning or end of a file was scanned.  No action is currently taken for these--they are merely counted.
+ * `scan_forward`: A logical byte range was scanned (`scan_forward`).
+ * `scan_found`: An entry was found in the hash table matching a scanned block from the filesystem.
+ * `scan_hash_hit`: A block was found on the filesystem corresponding to a block found in the hash table.
+ * `scan_hash_miss`: A block was not found on the filesystem corresponding to a block found in the hash table.
+ * `scan_hash_preinsert`: A block was prepared for insertion into the hash table.
+ * `scan_hole`: A hole extent was found during scan and ignored.
+ * `scan_interesting`: An extent had flags that were not recognized by bees and was ignored.
+ * `scan_lookup`: A hash was looked up in the hash table.
+ * `scan_malign`: A block being scanned matched a hash at EOF in the hash table, but the EOF was not aligned to a block boundary and the two blocks did not have the same length.
+ * `scan_no_fd`: References to a block from the hash table were found, but a FD could not be opened.
+ * `scan_no_rewrite`: All blocks in an extent were removed by dedupe (i.e. no copies).
+ * `scan_push_front`: An entry in the hash table matched a duplicate block, so the entry was moved to the head of its LRU list.
+ * `scan_reinsert`: A copied block's hash and block address was inserted into the hash table.
+ * `scan_resolve_hit`: A block address in the hash table was successfully resolved to an open FD and offset pair.
+ * `scan_resolve_zero`: A block address in the hash table was not resolved to any subvol/inode pair, so the corresponding hash table entry was removed.
+ * `scan_rewrite`: A range of bytes in a file was copied, then the copy deduped over the original data.
+ * `scan_toxic_hash`: A scanned block has the same hash as a hash table entry that is marked toxic.
+ * `scan_toxic_match`: A hash table entry points to a block that is discovered to be toxic.
+ * `scan_twice`: Two references to the same block have been found in the hash table.
+ * `scan_zero_compressed`: An extent that was compressed and contained only zero bytes was found.
+ * `scan_zero_uncompressed`: A block that contained only zero bytes was found in an uncompressed extent.
+
+scanf
+-----
+
+The `scanf` event group consists of operations related to `BeesContext::scan_forward`.  This is the entry point where `crawl` schedules new data for scanning.
+
+ * `scanf_deferred_extent`: Two tasks attempted to scan the same extent at the same time, so one was deferred.
+ * `scanf_deferred_inode`: Two tasks attempted to scan the same inode at the same time, so one was deferred.
+ * `scanf_extent`: A btrfs extent item was scanned.
+ * `scanf_extent_ms`: Total thread-seconds spent scanning btrfs extent items.
+ * `scanf_total`: A logical byte range of a file was scanned.
+ * `scanf_total_ms`: Total thread-seconds spent scanning logical byte ranges.
+
+Note that in current versions of bees, `scan_forward` is passed extents
+that correspond exactly to btrfs extent items, so the `scanf_extent` and
+`scanf_total` numbers can only be different if the filesystem changes
+between crawl time and scan time.
+
+sync
+----
+
+The `sync` event group consists of operations related to the `fsync` workarounds in bees.
+
+ * `sync_count`: `fsync()` was called on a temporary file.
+ * `sync_ms`: Total time spent executing `fsync()`.
+
+tmp
+---
+
+The `sync` event group consists of operations related temporary files and the data within them.
+
+ * `tmp_aligned`: A temporary extent was allocated on a block boundary.
+ * `tmp_block`: Total number of temporary blocks copied.
+ * `tmp_block_zero`: Total number of temporary hole blocks copied.
+ * `tmp_bytes`: Total number of temporary bytes copied.
+ * `tmp_copy`: Total number of extents copied.
+ * `tmp_copy_ms`: Total time spent copying extents.
+ * `tmp_create`: Total number of temporary files created.
+ * `tmp_create_ms`: Total time spent creating temporary files.
+ * `tmp_hole`: Total number of hole extents created.
+ * `tmp_realign`: A temporary extent was not aligned to a block boundary.
+ * `tmp_resize`: A temporary file was resized with `ftruncate()`
+ * `tmp_resize_ms`: Total time spent in `ftruncate()`
+ * `tmp_trunc`: The temporary file size limit was exceeded, triggering a new temporary file creation.

docs/gotchas.md

@@ -0,0 +1,268 @@
+bees Gotchas
+============
+
+C++ Exceptions
+--------------
+
+bees is very paranoid about the data it gets from btrfs, and if btrfs
+does anything bees does not expect, bees will throw an exception and move
+on without touching the offending data.  This will trigger a stack trace
+to the log containing data which is useful for developers to understand
+what happened.
+
+In all cases C++ exceptions in bees are harmless to data on the
+filesystem.  bees handles most exceptions by aborting processing of
+the current extent and moving to the next extent.  In some cases an
+exception may occur in a critical bees thread, which will stop the bees
+process from making any further progress; however, these cases are rare
+and are typically caused by unusual filesystem conditions (e.g. [freshly
+formatted filesystem with no
+data](https://github.com/Zygo/bees/issues/93)) or lack of memory or
+other resources.
+
+The following are common cases that users may encounter:
+
+* If a snapshot is deleted, bees will generate a burst of exceptions for
+references to files in the snapshot that no longer exist.  This lasts
+until the FD caches are cleared, usually a few minutes with default
+btrfs mount options.  These generally look like:
+
+	`std::system_error: BTRFS_IOC_TREE_SEARCH_V2: [path] at fs.cc:844: No such file or directory`
+
+* If data is modified at the same time it is being scanned, bees will get
+an inconsistent version of the data layout in the filesystem, causing
+the `ExtentWalker` class to throw various constraint-check exceptions.
+The exception causes bees to retry the extent in a later filesystem scan
+(hopefully when the file is no longer being modified).  The exception
+text is similar to:
+
+	`std::runtime_error: fm.rbegin()->flags() = 776 failed constraint check (fm.rbegin()->flags() & FIEMAP_EXTENT_LAST) at extentwalker.cc:229`
+
+  but the line number or specific code fragment may vary.
+
+* If there are too many possible matching blocks within a pair of extents,
+bees will loop billions of times considering all possibilities.  This is
+a waste of time, so an exception is currently used to break out of such
+loops early.  The exception text in this case is:
+
+	`FIXME: too many duplicate candidates, bailing out here`
+
+
+Terminating bees with SIGTERM
+-----------------------------
+
+bees is designed to survive host crashes, so it is safe to terminate
+bees using SIGKILL; however, when bees next starts up, it will repeat
+some work that was performed between the last bees crawl state save point
+and the SIGKILL (up to 15 minutes).  If bees is stopped and started less
+than once per day, then this is not a problem as the proportional impact
+is quite small; however, users who stop and start bees daily or even
+more often may prefer to have a clean shutdown with SIGTERM so bees can
+restart faster.
+
+bees handling of SIGTERM can take a long time on machines with some or
+all of:
+
+   * Large RAM and `vm.dirty_ratio`
+   * Large number of active bees worker threads
+   * Large number of bees temporary files (proportional to thread count)
+   * Large hash table size
+   * Large filesystem size
+   * High IO latency, especially "low power" spinning disks
+   * High filesystem activity, especially duplicate data writes
+
+Each of these factors individually increases the total time required
+to perform a clean bees shutdown.  When combined, the factors can
+multiply with each other, dramatically increasing the time required to
+flush bees state to disk.
+
+On a large system with many of the above factors present, a "clean"
+bees shutdown can take more than 20 minutes.  Even a small machine
+(16GB RAM, 1GB hash table, 1TB NVME disk) can take several seconds to
+complete a SIGTERM shutdown.
+
+The shutdown procedure performs potentially long-running tasks in
+this order:
+
+   1.  Worker threads finish executing their current Task and exit.
+       Threads executing `LOGICAL_INO` ioctl calls usually finish quickly,
+       but btrfs imposes no limit on the ioctl's running time, so it
+       can take several minutes in rare bad cases.  If there is a btrfs
+       commit already in progress on the filesystem, then most worker
+       threads will be blocked until the btrfs commit is finished.
+
+   2.  Crawl state is saved to `$BEESHOME`.  This normally completes
+       relatively quickly (a few seconds at most).  This is the most
+       important bees state to save to disk as it directly impacts
+       restart time, so it is done as early as possible (but no earlier).
+
+   3.  Hash table is written to disk.  Normally the hash table is
+       trickled back to disk at a rate of about 2GB per hour;
+       however, SIGTERM causes bees to attempt to flush the whole table
+       immediately.  If bees has recently been idle then the hash table is
+       likely already flushed to disk, so this step will finish quickly;
+       however, if bees has recently been active and the hash table is
+       large relative to RAM size, the blast of rapidly written data
+       can force the Linux VFS to block all writes to the filesystem
+       for sufficient time to complete all pending btrfs metadata
+       writes which accumulated during the btrfs commit before bees
+       received SIGTERM...and _then_ let bees write out the hash table.
+       The time spent here depends on the size of RAM, speed of disks,
+       and aggressiveness of competing filesystem workloads.
+
+   4.  bees temporary files are closed, which implies deletion of their
+       inodes.  These are files which consist entirely of shared extent
+       structures, and btrfs takes an unusually long time to delete such
+       files (up to a few minutes for each on slow spinning disks).
+
+If bees is terminated with SIGKILL, only step #1 and #4 are performed (the
+kernel performs these automatically if bees exits).  This reduces the
+shutdown time at the cost of increased startup time.
+
+Balances
+--------
+
+First, read [`LOGICAL_INO` and btrfs balance WARNING](btrfs-kernel.md).
+bees will suspend operations during a btrfs balance to work around
+kernel bugs.
+
+A btrfs balance relocates data on disk by making a new copy of the
+data, replacing all references to the old data with references to the
+new copy, and deleting the old copy.  To bees, this is the same as any
+other combination of new and deleted data (e.g. from defrag, or ordinary
+file operations):  some new data has appeared (to be scanned) and some
+old data has disappeared (to be removed from the hash table when it is
+detected).
+
+As bees scans the newly balanced data, it will get hits on the hash
+table pointing to the old data (it's identical data, so it would look
+like a duplicate).  These old hash table entries will not be valid any
+more, so when bees tries to compare new data with old data, it will not
+be able to find the old data at the old address, and bees will delete
+the hash table entries.  If no other duplicates are found, bees will
+then insert new hash table entries pointing to the new data locations.
+The erase is performed before the insert, so the new data simply replaces
+the old and there is (little or) no impact on hash table entry lifetimes
+(depending on how overcommitted the hash table is).  Each block is
+processed one at a time, which can be slow if there are many of them.
+
+Routine btrfs maintenance balances rarely need to relocate more than 0.1%
+of the total filesystem data, so the impact on bees is small even after
+taking into account the extra work bees has to do.
+
+If the filesystem must undergo a full balance (e.g. because disks were
+added or removed, or to change RAID profiles), then every data block on
+the filesystem will be relocated to a new address, which invalidates all
+the data in the bees hash table at once.  In such cases it is a good idea to:
+
+  1.  Stop bees before the full balance starts,
+  2.  Wipe the `$BEESHOME` directory (or delete and recreate `beeshash.dat`),
+  3.  Restart bees after the full balance is finished.
+
+bees will perform a full filesystem scan automatically after the balance
+since all the data has "new" btrfs transids.  bees won't waste any time
+invalidating stale hash table data after the balance if the hash table
+is empty.  This can considerably improve the performance of both bees
+(since it has no stale hash table entries to invalidate) and btrfs balance
+(since it's not competing with bees for iops).
+
+Snapshots
+---------
+
+bees can dedupe filesystems with many snapshots, but bees only does
+well in this situation if bees was running on the filesystem from
+the beginning.
+
+Each time bees dedupes an extent that is referenced by a snapshot,
+the entire metadata page in the snapshot subvol (16KB by default) must
+be CoWed in btrfs.  This can result in a substantial increase in btrfs
+metadata size if there are many snapshots on a filesystem.
+
+Normally, metadata is small (less than 1% of the filesystem) and dedupe
+hit rates are large (10-40% of the filesystem), so the increase in
+metadata size is offset by much larger reductions in data size and the
+total space used by the entire filesystem is reduced.
+
+If a subvol is deduped _before_ a snapshot is created, the snapshot will
+have the same deduplication as the subvol.  This does _not_ result in
+unusually large metadata sizes.  If a snapshot is made after bees has
+fully scanned the origin subvol, bees can avoid scanning most of the
+data in the snapshot subvol, as it will be provably identical to the
+origin subvol that was already scanned.
+
+If a subvol is deduped _after_ a snapshot is created, the origin and
+snapshot subvols must be deduplicated separately.  In the worst case, this
+will double the amount of reading the bees scanner must perform, and will
+also double the amount of btrfs metadata used for the snapshot; however,
+the "worst case" is a dedupe hit rate of 1% or more, so a doubling of
+metadata size is certain for all but the most unique data sets.  Also,
+bees will not be able to free any space until the last snapshot has been
+scanned and deduped, so payoff in data space savings is deferred until
+the metadata has almost finished expanding.
+
+If a subvol is deduped after _many_ snapshots have been created, all
+subvols must be deduplicated individually.  In the worst case, this will
+multiply the scanning work and metadata size by the number of snapshots.
+For 100 snapshots this can mean a 100x growth in metadata size and
+bees scanning time, which typically exceeds the possible savings from
+reducing the data size by dedupe.  In such cases using bees will result
+in a net increase in disk space usage that persists until the snapshots
+are deleted.
+
+Snapshot case studies
+---------------------
+
+ * bees running on an empty filesystem
+   * filesystem is mkfsed
+   * bees is installed and starts running
+   * data is written to the filesystem
+   * bees dedupes the data as it appears
+   * a snapshot is made of the data
+      * The snapshot will already be 99% deduped, so the metadata will
+      not expand very much because only 1% of the data in the snapshot
+      must be deduped.
+   * more snapshots are made of the data
+      * as long as dedupe has been completed on the origin subvol,
+      bees will quickly scan each new snapshot because it can skip
+      all the previously scanned data.  Metadata usage remains low
+      (it may even shrink because there are fewer csums).
+
+ * bees installed on a non-empty filesystem with snapshots
+   * filesystem is mkfsed
+   * data is written to the filesystem
+   * multiple snapshots are made of the data
+   * bees is installed and starts running
+   * bees dedupes each snapshot individually
+      * The snapshot metadata will no longer be shared, resulting in
+      substantial growth of metadata usage.
+      * Disk space savings do not occur until bees processes the
+      last snapshot reference to data.
+
+
+Other Gotchas
+-------------
+
+* bees avoids the [slow backrefs kernel bug](btrfs-kernel.md) by
+  measuring the time required to perform `LOGICAL_INO` operations.
+  If an extent requires over 0.1 kernel CPU seconds to perform a
+  `LOGICAL_INO` ioctl, then bees blacklists the extent and avoids
+  referencing it in future operations.  In most cases, fewer than 0.1%
+  of extents in a filesystem must be avoided this way.  This results
+  in short write latency spikes as btrfs will not allow writes to the
+  filesystem while `LOGICAL_INO` is running.  Generally the CPU spends
+  most of the runtime of the `LOGICAL_INO` ioctl running the kernel,
+  so on a single-core CPU the entire system can freeze up for a second
+  during operations on toxic extents.
+
+* If a process holds a directory FD open, the subvol containing the
+  directory cannot be deleted (`btrfs sub del` will start the deletion
+  process, but it will not proceed past the first open directory FD).
+  `btrfs-cleaner` will simply skip over the directory *and all of its
+  children* until the FD is closed.  bees avoids this gotcha by closing
+  all of the FDs in its directory FD cache every 10 btrfs transactions.
+
+* If a file is deleted while bees is caching an open FD to the file,
+  bees continues to scan the file.  For very large files (e.g. VM
+  images), the deletion of the file can be delayed indefinitely.
+  To limit this delay, bees closes all FDs in its file FD cache every
+  10 btrfs transactions.

docs/how-it-works.md

@@ -0,0 +1,100 @@
+How bees Works
+--------------
+
+bees is a daemon designed to run continuously and maintain its state
+across crashes and reboots.
+
+bees uses checkpoints for persistence to eliminate the IO overhead of a
+transactional data store.  On restart, bees will dedupe any data that
+was added to the filesystem since the last checkpoint.  Checkpoints
+occur every 15 minutes for scan progress, stored in `beescrawl.dat`.
+The hash table trickle-writes to disk at 4GB/hour to `beeshash.dat`.
+An hourly performance report is written to `beesstats.txt`.  There are
+no special requirements for bees hash table storage--`.beeshome` could
+be stored on a different btrfs filesystem, ext4, or even CIFS.
+
+bees uses a persistent dedupe hash table with a fixed size configured
+by the user.  Any size of hash table can be dedicated to dedupe.  If a
+fast dedupe with low hit rate is desired, bees can use a hash table as
+small as 128KB.
+
+The bees hash table is loaded into RAM at startup and `mlock`ed so it
+will not be swapped out by the kernel (if swap is permitted, performance
+degrades to nearly zero).
+
+bees scans the filesystem in a single pass which removes duplicate
+extents immediately after they are detected.  There are no distinct
+scanning and dedupe phases, so bees can start recovering free space
+immediately after startup.
+
+Once a filesystem scan has been completed, bees uses the `min_transid`
+parameter of the `TREE_SEARCH_V2` ioctl to avoid rescanning old data
+on future scans and quickly scan new data.  An incremental data scan
+can complete in less than a millisecond on an idle filesystem.
+
+Once a duplicate data block is identified, bees examines the nearby
+blocks in the files where the matched block appears.  This allows bees
+to find long runs of adjacent duplicate block pairs if it has an entry
+for any one of the blocks in its hash table.  On typical data sets,
+this means most of the blocks in the hash table are redundant and can
+be discarded without significant impact on dedupe hit rate.
+
+Hash table entries are grouped together into LRU lists.  As each block
+is scanned, its hash table entry is inserted into the LRU list at a
+random position.  If the LRU list is full, the entry at the end of the
+list is deleted.  If a hash table entry is used to discover duplicate
+blocks, the entry is moved to the beginning of the list.  This makes bees
+unable to detect a small number of duplicates, but it dramatically
+improves efficiency on filesystems with many small files.
+
+Once the hash table fills up, old entries are evicted by new entries.
+This means that the optimum hash table size is determined by the
+distance between duplicate blocks on the filesystem rather than the
+filesystem unique data size.  Even if the hash table is too small
+to find all duplicates, it may still find _most_ of them, especially
+during incremental scans where the data in many workloads tends to be
+more similar.
+
+When a duplicate block pair is found in two btrfs extents, bees will
+attempt to match all other blocks in the newer extent with blocks in
+the older extent (i.e. the goal is to keep the extent referenced in the
+hash table and remove the most recently scanned extent).  If this is
+possible, then the new extent will be replaced with a reference to the
+old extent.  If this is not possible, then bees will create a temporary
+copy of the unmatched data in the new extent so that the entire new
+extent can be removed by deduplication.  This must be done because btrfs
+cannot partially overwrite extents--the _entire_ extent must be replaced.
+The temporary copy is then scanned during the next pass bees makes over
+the filesystem for potential duplication of other extents.
+
+When a block containing all-zero bytes is found, bees dedupes the extent
+against a temporary file containing a hole, possibly creating temporary
+copies of any non-zero data in the extent for later deduplication as
+described above.  If the extent is compressed, bees avoids splitting
+the extent in the middle as this generally has a negative impact on
+compression ratio (and also triggers a [kernel bug](btrfs-kernel.md)).
+
+bees does not store any information about filesystem structure, so
+its performance is linear in the number or size of files.  The hash
+table stores physical block numbers which are converted into paths
+and FDs on demand through btrfs `SEARCH_V2` and `LOGICAL_INO` ioctls.
+This eliminates the storage required to maintain the equivalents
+of these functions in userspace, at the expense of encountering [some
+kernel bugs in `LOGICAL_INO` performance](btrfs-kernel.md).
+
+bees uses only the data-safe `FILE_EXTENT_SAME` (aka `FIDEDUPERANGE`)
+kernel operations to manipulate user data, so it can dedupe live data
+(e.g. build servers, sqlite databases, VM disk images).  It does not
+modify file attributes or timestamps.
+
+When bees has scanned all of the data, bees will pause until 10
+transactions have been completed in the btrfs filesystem.  bees tracks
+the current btrfs transaction ID over time so that it polls less often
+on quiescent filesystems and more often on busy filesystems.
+
+Scanning and deduplication work is performed by worker threads.  If the
+[`--loadavg-target` option](options.md) is used, bees adjusts the number
+of worker threads up or down as required to have a user-specified load
+impact on the system.  The maximum and minimum number of threads is
+configurable.  If the system load is too high then bees will stop until
+the load falls to acceptable levels.

docs/index.md

@@ -0,0 +1,75 @@
+BEES
+====
+
+Best-Effort Extent-Same, a btrfs deduplication agent.
+
+About bees
+----------
+
+bees is a block-oriented userspace deduplication agent designed for large
+btrfs filesystems.  It is an offline dedupe combined with an incremental
+data scan capability to minimize time data spends on disk from write
+to dedupe.
+
+Strengths
+---------
+
+ * Space-efficient hash table and matching algorithms - can use as little as 1 GB hash table per 10 TB unique data (0.1GB/TB)
+ * Daemon incrementally dedupes new data using btrfs tree search
+ * Works with btrfs compression - dedupe any combination of compressed and uncompressed files
+ * **NEW** [Works around `btrfs send` problems with dedupe and incremental parent snapshots](options.md)
+ * Works around btrfs filesystem structure to free more disk space
+ * Persistent hash table for rapid restart after shutdown
+ * Whole-filesystem dedupe - including snapshots
+ * Constant hash table size - no increased RAM usage if data set becomes larger
+ * Works on live data - no scheduled downtime required
+ * Automatic self-throttling based on system load
+
+Weaknesses
+----------
+
+ * Whole-filesystem dedupe - has no include/exclude filters, does not accept file lists
+ * Requires root privilege (or `CAP_SYS_ADMIN`)
+ * First run may require temporary disk space for extent reorganization
+ * [First run may increase metadata space usage if many snapshots exist](gotchas.md)
+ * Constant hash table size - no decreased RAM usage if data set becomes smaller
+ * btrfs only
+
+Installation and Usage
+----------------------
+
+ * [Installation](install.md)
+ * [Configuration](config.md)
+ * [Running](running.md)
+ * [Command Line Options](options.md)
+
+Recommended Reading
+-------------------
+
+ * [bees Gotchas](gotchas.md)
+ * [btrfs kernel bugs](btrfs-kernel.md) - especially DATA CORRUPTION WARNING
+ * [bees vs. other btrfs features](btrfs-other.md)
+ * [What to do when something goes wrong](wrong.md)
+
+More Information
+----------------
+
+ * [How bees works](how-it-works.md)
+ * [Missing bees features](missing.md)
+ * [Event counter descriptions](event-counters.md)
+
+Bug Reports and Contributions
+-----------------------------
+
+Email bug reports and patches to Zygo Blaxell <bees@furryterror.org>.
+
+You can also use Github:
+
+        https://github.com/Zygo/bees
+
+Copyright & License
+-------------------
+
+Copyright 2015-2022 Zygo Blaxell <bees@furryterror.org>.
+
+GPL (version 3 or later).

docs/install.md

@@ -0,0 +1,91 @@
+Building bees
+=============
+
+Dependencies
+------------
+
+* C++11 compiler (tested with GCC 4.9, 6.3.0, 8.1.0)
+
+  Sorry.  I really like closures and shared_ptr, so support
+  for earlier compiler versions is unlikely.
+
+  Note that the C++ standard--and GCC's implementation of it--is evolving.
+  There may be problems when building with newer compiler versions.
+  Build failure reports welcome!
+
+* btrfs-progs
+
+  Needed at runtime by the service wrapper script.
+
+* [Linux kernel version](btrfs-kernel.md) gets its own page.
+
+* markdown for documentation
+
+* util-linux version that provides `blkid` command for the helper
+  script `scripts/beesd` to work
+
+Installation
+============
+
+bees can be installed by following one these instructions:
+
+Arch package
+------------
+
+bees is available for Arch Linux in the community repository. Install with:
+
+`$ pacman -S bees`
+
+or build a live version from git master using AUR:
+
+`$ git clone https://aur.archlinux.org/bees-git.git && cd bees-git && makepkg -si`
+
+Gentoo package
+--------------
+
+bees is officially available in Gentoo Portage. Just emerge a stable
+version:
+
+`$ emerge --ask bees`
+
+or build a live version from git master:
+
+`$ emerge --ask =bees-9999`
+
+You can opt-out of building the support tools with
+
+`USE="-tools" emerge ...`
+
+If you want to start hacking on bees and contribute changes, just emerge
+the live version which automatically pulls in all required development
+packages.
+
+Build from source
+-----------------
+
+Build with `make`. The build produces `bin/bees` which must be copied
+to somewhere in `$PATH` on the target system respectively.
+
+It will also generate `scripts/beesd@.service` for systemd users. This
+service makes use of a helper script `scripts/beesd` to boot the service.
+Both of the latter use the filesystem UUID to mount the root subvolume
+within a temporary runtime directory.
+
+### Ubuntu 16.04 - 17.04:
+`$ apt -y install build-essential btrfs-tools markdown && make`
+
+### Ubuntu 18.10:
+`$ apt -y install build-essential btrfs-progs markdown && make`
+
+Packaging
+---------
+
+See 'Dependencies' above. Package maintainers can pick ideas for building and
+configuring the source package from the Gentoo ebuild:
+
+<https://github.com/gentoo/gentoo/tree/master/sys-fs/bees>
+
+You can configure some build options by creating a file `localconf` and
+adjust settings for your distribution environment there.
+
+Please also review the Makefile for additional hints.

docs/missing.md

@@ -0,0 +1,45 @@
+Features You Might Expect That bees Doesn't Have
+------------------------------------------------
+
+* There's no configuration file (patches welcome!).  There are
+some tunables hardcoded in the source that could eventually become
+configuration options.  There's also an incomplete option parser
+(patches welcome!).
+
+* The bees process doesn't fork and writes its log to stdout/stderr.
+A shell wrapper is required to make it behave more like a daemon.
+
+* There's no facility to exclude any part of a filesystem or focus on
+specific files (patches welcome).
+
+* PREALLOC extents and extents containing blocks filled with zeros will
+be replaced by holes.  There is no way to turn this off.
+
+* Consecutive runs of duplicate blocks that are less than 12K in length
+can take 30% of the processing time while saving only 3% of the disk
+space.  There should be an option to just not bother with those, but it's
+complicated by the btrfs requirement to always dedupe complete extents.
+
+* There is a lot of duplicate reading of blocks in snapshots.  bees will
+scan all snapshots at close to the same time to try to get better
+performance by caching, but really fixing this requires rewriting the
+crawler to scan the btrfs extent tree directly instead of the subvol
+FS trees.
+
+* Block reads are currently more allocation- and CPU-intensive than they
+should be, especially for filesystems on SSD where the IO overhead is
+much smaller.  This is a problem for CPU-power-constrained environments
+(e.g. laptops running from battery, or ARM devices with slow CPU).
+
+* bees can currently fragment extents when required to remove duplicate
+blocks, but has no defragmentation capability yet.  When possible, bees
+will attempt to work with existing extent boundaries, but it will not
+aggregate blocks together from multiple extents to create larger ones.
+
+* When bees fragments an extent, the copied data is compressed.  There
+is currently no way (other than by modifying the source) to select a
+compression method or not compress the data (patches welcome!).
+
+* It is theoretically possible to resize the hash table without starting
+over with a new full-filesystem scan; however, this feature has not been
+implemented yet.

docs/options.md

@@ -0,0 +1,92 @@
+# bees Command Line Options
+
+## Load management options
+
+* `--thread-count COUNT` or `-c`
+
+ Specify maximum number of worker threads.  Overrides `--thread-factor`
+ (`-C`), default/autodetected values, and the hardcoded thread limit.
+
+* `--thread-factor FACTOR` or `-C`
+
+ Specify ratio of worker threads to detected CPU cores.  Overridden by
+ `--thread-count` (`-c`).
+
+ Default is 1.0, i.e. 1 worker thread per detected CPU.  Use values
+ below 1.0 to leave some cores idle, or above 1.0 if there are more
+ disks than CPUs in the filesystem.
+
+* `--loadavg-target LOADAVG` or `-g`
+
+ Specify load average target for dynamic worker threads.  Default is
+ to run the maximum number of worker threads all the time.
+
+ Worker threads will be started or stopped subject to the upper limit
+ imposed by `--thread-factor`, `--thread-min` and `--thread-count`
+ until the load average is within +/- 0.5 of `LOADAVG`.
+
+* `--thread-min COUNT` or `-G`
+
+ Specify minimum number of dynamic worker threads.  This can be used
+ to force a minimum number of threads to continue running while using
+ `--loadavg-target` to manage load.
+
+ Default is 0, i.e. all bees worker threads will stop when the system
+ load exceeds the target.
+
+ Has no effect unless `--loadavg-target` is used to specify a target load.
+
+## Filesystem tree traversal options
+
+* `--scan-mode MODE` or `-m`
+
+ Specify extent scanning algorithm.
+ **EXPERIMENTAL** feature that may go away.
+
+  * Mode 0: lockstep
+  * Mode 1: independent
+  * Mode 2: sequential
+  * Mode 3: recent
+
+ For details of the different scanning modes and the default value of
+ this option, see [bees configuration](config.md).
+
+## Workarounds
+
+* `--workaround-btrfs-send` or `-a`
+
+ Pretend that read-only snapshots are empty and silently discard any
+request to dedupe files referenced through them.  This is a workaround for
+[problems with the kernel implementation of `btrfs send` and `btrfs send
+-p`](btrfs-kernel.md) which make these btrfs features unusable with bees.
+
+ This option should be used to avoid breaking `btrfs send` on the same
+filesystem.
+
+ **Note:** There is a _significant_ space tradeoff when using this option:
+it is likely no space will be recovered--and possibly significant extra
+space used--until the read-only snapshots are deleted.  On the other
+hand, if snapshots are rotated frequently then bees will spend less time
+scanning them.
+
+## Logging options
+
+* `--timestamps` or `-t`
+
+ Enable timestamps in log output.
+
+* `--no-timestamps` or `-T`
+
+ Disable timestamps in log output.
+
+* `--absolute-paths` or `-p`
+
+ Paths in log output will be absolute.
+
+* `--strip-paths` or `-P`
+
+ Paths in log output will have the working directory at bees startup stripped.
+
+* `--verbose` or `-v`
+
+ Set log verbosity (0 = no output, 8 = all output, default 8).

docs/running.md

@@ -0,0 +1,92 @@
+Running bees
+============
+
+Setup
+-----
+
+If you don't want to use the helper script `scripts/beesd` to setup and
+configure bees, here's how you manually setup bees.
+
+Create a directory for bees state files:
+
+        export BEESHOME=/some/path
+        mkdir -p "$BEESHOME"
+
+Create an empty hash table ([your choice of size](config.md), but it
+must be a multiple of 128KB).  This example creates a 1GB hash table:
+
+        truncate -s 1g "$BEESHOME/beeshash.dat"
+        chmod 700 "$BEESHOME/beeshash.dat"
+
+bees can _only_ process the root subvol of a btrfs with nothing mounted
+over top.  If the bees argument is not the root subvol directory, bees
+will just throw an exception and stop.
+
+Use a separate mount point, and let only bees access it:
+
+        UUID=3399e413-695a-4b0b-9384-1b0ef8f6c4cd
+        mkdir -p /var/lib/bees/$UUID
+        mount /dev/disk/by-uuid/$UUID /var/lib/bees/$UUID -osubvol=/
+
+If you don't set BEESHOME, the path "`.beeshome`" will be used relative
+to the root subvol of the filesystem.  For example:
+
+        btrfs sub create /var/lib/bees/$UUID/.beeshome
+        truncate -s 1g /var/lib/bees/$UUID/.beeshome/beeshash.dat
+        chmod 700 /var/lib/bees/$UUID/.beeshome/beeshash.dat
+
+You can use any relative path in `BEESHOME`.  The path will be taken
+relative to the root of the deduped filesystem (in other words it can
+be the name of a subvol):
+
+        export BEESHOME=@my-beeshome
+        btrfs sub create /var/lib/bees/$UUID/$BEESHOME
+        truncate -s 1g /var/lib/bees/$UUID/$BEESHOME/beeshash.dat
+        chmod 700 /var/lib/bees/$UUID/$BEESHOME/beeshash.dat
+
+Configuration
+-------------
+
+There are some runtime configurable options using environment variables:
+
+* BEESHOME: Directory containing bees state files:
+	* beeshash.dat  | persistent hash table.  Must be a multiple of 128KB, and must be created before bees starts.
+	* beescrawl.dat | state of SEARCH_V2 crawlers.  ASCII text.  bees will create this.
+	* beesstats.txt | statistics and performance counters.  ASCII text.  bees will create this.
+* BEESSTATUS: File containing a snapshot of current bees state:  performance
+  counters and current status of each thread.  The file is meant to be
+  human readable, but understanding it probably requires reading the source.
+  You can watch bees run in realtime with a command like:
+
+        watch -n1 cat $BEESSTATUS
+
+Other options (e.g. interval between filesystem crawls) can be configured
+in `src/bees.h` or [on the command line](options.md).
+
+Running
+-------
+
+Reduce CPU and IO priority to be kinder to other applications sharing
+this host (or raise them for more aggressive disk space recovery).  If you
+use cgroups, put `bees` in its own cgroup, then reduce the `blkio.weight`
+and `cpu.shares` parameters.  You can also use `schedtool` and `ionice`
+in the shell script that launches `bees`:
+
+        schedtool -D -n20 $$
+        ionice -c3 -p $$
+
+You can also use the [`--loadavg-target` and `--thread-min`
+options](options.md) to further control the impact of bees on the rest
+of the system.
+
+Let the bees fly:
+
+        for fs in /var/lib/bees/*-*-*-*-*/; do
+                bees "$fs" >> "$fs/.beeshome/bees.log" 2>&1 &
+        done
+
+You'll probably want to arrange for `/var/log/bees.log` to be rotated
+periodically.  You may also want to set umask to 077 to prevent disclosure
+of information about the contents of the filesystem through the log file.
+
+There are also some shell wrappers in the `scripts/` directory.

docs/wrong.md

@@ -0,0 +1,168 @@
+What to do when something goes wrong with bees
+==============================================
+
+Hangs and excessive slowness
+----------------------------
+
+### Are you using qgroups or autodefrag?
+
+  Read about [bad btrfs feature interactions](btrfs-other.md).
+
+### Use load-throttling options
+
+  If bees is just more aggressive than you would like, consider using
+  [load throttling options](options.md).  These are usually more effective
+  than `ionice`, `schedtool`, and the `blkio` cgroup (though you can
+  certainly use those too).
+
+### Check `$BEESSTATUS`
+
+  If bees or the filesystem seems to be stuck, check the contents of
+  `$BEESSTATUS`.  bees describes what it is doing (and how long it has
+  been trying to do it) through this file.
+
+  Sample:
+
+<pre>
+THREADS (work queue 68 tasks):
+	tid 20939: crawl_5986: dedup BeesRangePair: 512K src[0x9933f000..0x993bf000] dst[0x9933f000..0x993bf000]
+src = 147 /run/bees/ede84fbd-cb59-0c60-9ea7-376fa4984887/data/home/builder/linux/.git/objects/pack/pack-09f06f8759ac7fd163df320b7f7671f06ac2a747.pack
+dst = 15 /run/bees/ede84fbd-cb59-0c60-9ea7-376fa4984887/data.new/home/builder/linux/.git/objects/pack/pack-09f06f8759ac7fd163df320b7f7671f06ac2a747.pack
+	tid 20940: crawl_5986: dedup BeesRangePair: 512K src[0x992bf000..0x9933f000] dst[0x992bf000..0x9933f000]
+src = 147 /run/bees/ede84fbd-cb59-0c60-9ea7-376fa4984887/data/home/builder/linux/.git/objects/pack/pack-09f06f8759ac7fd163df320b7f7671f06ac2a747.pack
+dst = 15 /run/bees/ede84fbd-cb59-0c60-9ea7-376fa4984887/data.new/home/builder/linux/.git/objects/pack/pack-09f06f8759ac7fd163df320b7f7671f06ac2a747.pack
+	tid 21177: crawl_5986: dedup BeesRangePair: 512K src[0x9923f000..0x992bf000] dst[0x9923f000..0x992bf000]
+src = 147 /run/bees/ede84fbd-cb59-0c60-9ea7-376fa4984887/data/home/builder/linux/.git/objects/pack/pack-09f06f8759ac7fd163df320b7f7671f06ac2a747.pack
+dst = 15 /run/bees/ede84fbd-cb59-0c60-9ea7-376fa4984887/data.new/home/builder/linux/.git/objects/pack/pack-09f06f8759ac7fd163df320b7f7671f06ac2a747.pack
+	tid 21677: bees: [68493.1s] main
+	tid 21689: crawl_transid: [236.508s] waiting 332.575s for next 10 transid RateEstimator { count = 87179, raw = 969.066 / 32229.2, ratio = 969.066 / 32465.7, rate = 0.0298489, duration(1) = 33.5021, seconds_for(1) = 1 }
+	tid 21690: status: writing status to file '/run/bees.status'
+	tid 21691: crawl_writeback: [203.456s] idle, dirty
+	tid 21692: hash_writeback: [12.466s] flush rate limited after extent #17 of 64 extents
+	tid 21693: hash_prefetch: [2896.61s] idle 3600s
+</pre>
+
+ The time in square brackets indicates how long the thread has been
+ executing the current task (if this time is below 5 seconds then it
+ is omitted).  We can see here that the main thread (and therefore the
+ bees process as a whole) has been running for 68493.1 seconds, the
+ last hash table write was 12.5 seconds ago, and the last transid poll
+ was 236.5 seconds ago.  Three worker threads are currently performing
+ dedupe on extents.
+
+ Thread names of note:
+
+ * `crawl_12345`: scan/dedupe worker threads (the number is the subvol
+   ID which the thread is currently working on).  These threads appear
+   and disappear from the status dynamically according to the requirements
+   of the work queue and loadavg throttling.
+ * `bees`: main thread (doesn't do anything after startup, but its task execution time is that of the whole bees process)
+ * `crawl_master`: task that finds new extents in the filesystem and populates the work queue
+ * `crawl_transid`: btrfs transid (generation number) tracker and polling thread
+ * `status`: the thread that writes the status reports to `$BEESSTATUS`
+ * `crawl_writeback`: writes the scanner progress to `beescrawl.dat`
+ * `hash_writeback`: trickle-writes the hash table back to `beeshash.dat`
+ * `hash_prefetch`: prefetches the hash table at startup and updates `beesstats.txt` hourly
+
+### Dump kernel stacks of hung processes
+
+Check the kernel stacks of all blocked kernel processes:
+
+	ps xar | while read -r x y; do ps "$x"; head -50 --verbose /proc/"$x"/task/*/stack; done | tee lockup-stacks.txt
+
+Submit the above information in your bug report.
+
+### Check dmesg for btrfs stack dumps
+
+Sometimes these are relevant too.
+
+
+bees Crashes
+------------
+
+ * If you have a core dump, run these commands in gdb and include
+ the output in your report (you may need to post it as a compressed
+ attachment, as it can be quite large):
+
+        (gdb) set pagination off
+        (gdb) info shared
+        (gdb) bt
+        (gdb) thread apply all bt
+        (gdb) thread apply all bt full
+
+  The last line generates megabytes of output and will often crash gdb.
+  This is OK, submit whatever output gdb can produce.
+
+  **Note that this output may include filenames or data from your
+  filesystem.**
+
+ * If you have `systemd-coredump` installed, you can use `coredumpctl`:
+
+        (echo set pagination off;
+        echo info shared;
+        echo bt;
+        echo thread apply all bt;
+        echo thread apply all bt full) | coredumpctl gdb bees
+
+ * If the crash happens often (or don't want to use coredumpctl),
+   you can run automate the gdb data collection with this wrapper script:
+
+<pre>
+#!/bin/sh
+set -x
+
+# Move aside old core files for analysis
+for x in core*; do
+	if [ -e "$x" ]; then
+		mv -vf "$x" "old-$x.$(date +%Y-%m-%d-%H-%M-%S)"
+	fi
+done
+
+# Delete old core files after a week
+find old-core* -type f -mtime +7 -exec rm -vf {} + &
+
+# Turn on the cores (FIXME: may need to change other system parameters
+# that capture or redirect core files)
+ulimit -c unlimited
+
+# Run the command
+"$@"
+rv="$?"
+
+# Don't clobber our core when gdb crashes
+ulimit -c 0
+
+# If there were core files, generate reports for them
+for x in core*; do
+	if [ -e "$x" ]; then
+		gdb --core="$x" \
+		--eval-command='set pagination off' \
+		--eval-command='info shared' \
+		--eval-command='bt' \
+		--eval-command='thread apply all bt' \
+		--eval-command='thread apply all bt full' \
+		--eval-command='quit' \
+		--args "$@" 2>&1 | tee -a "$x.txt"
+	fi
+done
+
+# Return process exit status to caller
+exit "$rv"
+</pre>
+
+  To use the wrapper script, insert it just before the `bees` command,
+  as in:
+
+    gdb-wrapper bees /path/to/fs/
+
+
+Kernel crashes, corruption, and filesystem damage
+-------------------------------------------------
+
+bees doesn't do anything that _should_ cause corruption or data loss;
+however, [btrfs has kernel bugs](btrfs-kernel.md) and [interacts poorly
+with some Linux block device layers](btrfs-other.md), so corruption is
+not impossible.
+
+Issues with the btrfs filesystem kernel code or other block device layers
+should be reported to their respective maintainers.

include/crucible/bool.h

@@ -1,13 +0,0 @@
-#ifndef CRUCIBLE_BOOL_H
-#define CRUCIBLE_BOOL_H
-
-namespace crucible {
-	struct DefaultBool {
-		bool m_b;
-		DefaultBool(bool init = false) : m_b(init) {}
-		operator bool() const { return m_b; }
-		bool &operator=(const bool &that) { return m_b = that; }
-	};
-}
-
-#endif // CRUCIBLE_BOOL_H

include/crucible/btrfs-tree.h

@@ -0,0 +1,204 @@
+#ifndef CRUCIBLE_BTRFS_TREE_H
+#define CRUCIBLE_BTRFS_TREE_H
+
+#include "crucible/fd.h"
+#include "crucible/fs.h"
+#include "crucible/bytevector.h"
+
+namespace crucible {
+	using namespace std;
+
+	class BtrfsTreeItem {
+		uint64_t m_objectid = 0;
+		uint64_t m_offset = 0;
+		uint64_t m_transid = 0;
+		ByteVector m_data;
+		uint8_t m_type = 0;
+	public:
+		uint64_t objectid() const { return m_objectid; }
+		uint64_t offset() const { return m_offset; }
+		uint64_t transid() const { return m_transid; }
+		uint8_t type() const { return m_type; }
+		const ByteVector data() const { return m_data; }
+		BtrfsTreeItem() = default;
+		BtrfsTreeItem(const BtrfsIoctlSearchHeader &bish);
+		BtrfsTreeItem& operator=(const BtrfsIoctlSearchHeader &bish);
+		bool operator!() const;
+
+		/// Member access methods.  Invoking a method on the
+		/// wrong type of item will throw an exception.
+
+		/// @{ Block group items
+		uint64_t block_group_flags() const;
+		uint64_t block_group_used() const;
+		/// @}
+
+		/// @{ Chunk items
+		uint64_t chunk_length() const;
+		uint64_t chunk_type() const;
+		/// @}
+
+		/// @{ Dev extent items (physical byte ranges)
+		uint64_t dev_extent_chunk_offset() const;
+		uint64_t dev_extent_length() const;
+		/// @}
+
+		/// @{ Dev items (devices)
+		uint64_t dev_item_total_bytes() const;
+		uint64_t dev_item_bytes_used() const;
+		/// @}
+
+		/// @{ Inode items
+		uint64_t inode_size() const;
+		/// @}
+
+		/// @{ Extent refs (EXTENT_DATA)
+		uint64_t file_extent_logical_bytes() const;
+		uint64_t file_extent_generation() const;
+		uint64_t file_extent_offset() const;
+		uint64_t file_extent_bytenr() const;
+		uint8_t file_extent_type() const;
+		btrfs_compression_type file_extent_compression() const;
+		/// @}
+
+		/// @{ Extent items (EXTENT_ITEM)
+		uint64_t extent_begin() const;
+		uint64_t extent_end() const;
+		uint64_t extent_generation() const;
+		/// @}
+
+		/// @{ Root items
+		uint64_t root_flags() const;
+		/// @}
+
+		/// @{ Root backref items.
+		uint64_t root_ref_dirid() const;
+		string root_ref_name() const;
+		uint64_t root_ref_parent_rootid() const;
+		/// @}
+	};
+
+	ostream &operator<<(ostream &os, const BtrfsTreeItem &bti);
+
+	class BtrfsTreeFetcher {
+	protected:
+		Fd m_fd;
+		BtrfsIoctlSearchKey m_sk;
+		uint64_t m_tree = 0;
+		uint64_t m_min_transid = 0;
+		uint64_t m_max_transid = numeric_limits<uint64_t>::max();
+		uint64_t m_block_size = 0;
+		uint64_t m_lookbehind_size = 0;
+		uint64_t m_scale_size = 0;
+		uint8_t m_type = 0;
+
+		uint64_t scale_logical(uint64_t logical) const;
+		uint64_t unscale_logical(uint64_t logical) const;
+		const static uint64_t s_max_logical = numeric_limits<uint64_t>::max();
+		uint64_t scaled_max_logical() const;
+
+		virtual void fill_sk(BtrfsIoctlSearchKey &key, uint64_t object);
+		virtual void next_sk(BtrfsIoctlSearchKey &key, const BtrfsIoctlSearchHeader &hdr);
+		virtual uint64_t hdr_logical(const BtrfsIoctlSearchHeader &hdr) = 0;
+		virtual bool hdr_match(const BtrfsIoctlSearchHeader &hdr) = 0;
+		virtual bool hdr_stop(const BtrfsIoctlSearchHeader &hdr) = 0;
+		Fd fd() const;
+		void fd(Fd fd);
+	public:
+		virtual ~BtrfsTreeFetcher() = default;
+		BtrfsTreeFetcher(Fd new_fd);
+		void type(uint8_t type);
+		void tree(uint64_t tree);
+		void transid(uint64_t min_transid, uint64_t max_transid = numeric_limits<uint64_t>::max());
+		/// Block size (sectorsize) of filesystem
+		uint64_t block_size() const;
+		/// Fetch last object < logical, null if not found
+		BtrfsTreeItem prev(uint64_t logical);
+		/// Fetch first object > logical, null if not found
+		BtrfsTreeItem next(uint64_t logical);
+		/// Fetch object at exactly logical, null if not found
+		BtrfsTreeItem at(uint64_t);
+		/// Fetch first object >= logical
+		BtrfsTreeItem lower_bound(uint64_t logical);
+		/// Fetch last object <= logical
+		BtrfsTreeItem rlower_bound(uint64_t logical);
+
+		/// Estimated distance between objects
+		virtual uint64_t lookbehind_size() const;
+		virtual void lookbehind_size(uint64_t);
+
+		/// Scale size (normally block size but must be set to 1 for fs trees)
+		uint64_t scale_size() const;
+		void scale_size(uint64_t);
+	};
+
+	class BtrfsTreeObjectFetcher : public BtrfsTreeFetcher {
+	protected:
+		virtual void fill_sk(BtrfsIoctlSearchKey &key, uint64_t logical) override;
+		virtual uint64_t hdr_logical(const BtrfsIoctlSearchHeader &hdr) override;
+		virtual bool hdr_match(const BtrfsIoctlSearchHeader &hdr) override;
+		virtual bool hdr_stop(const BtrfsIoctlSearchHeader &hdr) override;
+	public:
+		using BtrfsTreeFetcher::BtrfsTreeFetcher;
+	};
+
+	class BtrfsTreeOffsetFetcher : public BtrfsTreeFetcher {
+	protected:
+		uint64_t m_objectid = 0;
+		virtual void fill_sk(BtrfsIoctlSearchKey &key, uint64_t offset) override;
+		virtual uint64_t hdr_logical(const BtrfsIoctlSearchHeader &hdr) override;
+		virtual bool hdr_match(const BtrfsIoctlSearchHeader &hdr) override;
+		virtual bool hdr_stop(const BtrfsIoctlSearchHeader &hdr) override;
+	public:
+		using BtrfsTreeFetcher::BtrfsTreeFetcher;
+		void objectid(uint64_t objectid);
+		uint64_t objectid() const;
+	};
+
+	class BtrfsCsumTreeFetcher : public BtrfsTreeOffsetFetcher {
+	public:
+		const uint32_t BTRFS_CSUM_TYPE_UNKNOWN = uint32_t(1) << 16;
+	private:
+		size_t		m_sum_size = 0;
+		uint32_t	m_sum_type = BTRFS_CSUM_TYPE_UNKNOWN;
+	public:
+		BtrfsCsumTreeFetcher(const Fd &fd);
+
+		uint32_t sum_type() const;
+		size_t sum_size() const;
+		void get_sums(uint64_t logical, size_t count, function<void(uint64_t logical, const uint8_t *buf, size_t count)> output);
+	};
+
+	/// Fetch extent items from extent tree
+	class BtrfsExtentItemFetcher : public BtrfsTreeObjectFetcher {
+	public:
+		BtrfsExtentItemFetcher(const Fd &fd);
+	};
+
+	/// Fetch extent refs from an inode
+	class BtrfsExtentDataFetcher : public BtrfsTreeOffsetFetcher {
+	public:
+		BtrfsExtentDataFetcher(const Fd &fd);
+	};
+
+	/// Fetch inodes from a subvol
+	class BtrfsFsTreeFetcher : public BtrfsTreeObjectFetcher {
+	public:
+		BtrfsFsTreeFetcher(const Fd &fd, uint64_t subvol);
+	};
+
+	class BtrfsInodeFetcher : public BtrfsTreeObjectFetcher {
+	public:
+		BtrfsInodeFetcher(const Fd &fd);
+		BtrfsTreeItem stat(uint64_t subvol, uint64_t inode);
+	};
+
+	class BtrfsRootFetcher : public BtrfsTreeObjectFetcher {
+	public:
+		BtrfsRootFetcher(const Fd &fd);
+		BtrfsTreeItem root(uint64_t subvol);
+	};
+
+}
+
+#endif

include/crucible/btrfs.h

@@ -13,18 +13,22 @@
 // __u64 typedef and friends
 #include <linux/types.h>
 
-// try Linux headers first
-#include <btrfs/ioctl.h>
+// the btrfs headers
+#include <linux/btrfs.h>
+#include <linux/btrfs_tree.h>
 
-// Supply any missing definitions
-#define mutex not_mutex
-#include <btrfs/ctree.h>
-// Repair the damage
-#undef min
-#undef max
-#undef mutex
+// And now all the things that have been missing in some version of
+// the headers.
 
-#ifndef BTRFS_FIRST_FREE_OBJECTID
+enum btrfs_compression_type {
+	BTRFS_COMPRESS_NONE,
+	BTRFS_COMPRESS_ZLIB,
+	BTRFS_COMPRESS_LZO,
+	BTRFS_COMPRESS_ZSTD,
+};
+
+// BTRFS_CSUM_ITEM_KEY is not defined in include/uapi
+#ifndef BTRFS_CSUM_ITEM_KEY
 
 	#define BTRFS_ROOT_TREE_OBJECTID 1ULL
 	#define BTRFS_EXTENT_TREE_OBJECTID 2ULL
@@ -130,7 +134,7 @@
 	};
 
 #endif
-	 
+
 #ifndef BTRFS_IOC_CLONE_RANGE
 
 	struct btrfs_ioctl_clone_range_args {
@@ -158,7 +162,7 @@
 		__u64 bytes_deduped;    /* out - total # of bytes we were able
 					 * to dedupe from this file */
 		/* status of this dedupe operation:
-		 * 0 if dedup succeeds
+		 * 0 if dedupe succeeds
 		 * < 0 for error
 		 * == BTRFS_SAME_DATA_DIFFERS if data differs
 		 */
@@ -202,4 +206,51 @@
 					   struct btrfs_ioctl_search_args_v2)
 #endif
 
+#ifndef BTRFS_IOC_LOGICAL_INO_V2
+	#define BTRFS_IOC_LOGICAL_INO_V2 _IOWR(BTRFS_IOCTL_MAGIC, 59, struct btrfs_ioctl_logical_ino_args)
+	#define BTRFS_LOGICAL_INO_ARGS_IGNORE_OFFSET (1ULL << 0)
+#endif
+
+#ifndef BTRFS_FS_INFO_FLAG_CSUM_INFO
+	/* Request information about checksum type and size */
+	#define BTRFS_FS_INFO_FLAG_CSUM_INFO                    (1 << 0)
+#endif
+
+#ifndef BTRFS_FS_INFO_FLAG_GENERATION
+/* Request information about filesystem generation */
+#define BTRFS_FS_INFO_FLAG_GENERATION                   (1 << 1)
+#endif
+
+#ifndef BTRFS_FS_INFO_FLAG_METADATA_UUID
+/* Request information about filesystem metadata UUID */
+#define BTRFS_FS_INFO_FLAG_METADATA_UUID                (1 << 2)
+#endif
+
+// BTRFS_CSUM_TYPE_CRC32 was a #define from 2008 to 2019.
+// After that, it's an enum with the other 3 types.
+// So if we do _not_ have CRC32 defined, it means we have the other 3;
+// if we _do_ have CRC32 defined, it means we need the other 3.
+// This seems likely to break some day.
+#ifdef BTRFS_CSUM_TYPE_CRC32
+	#define BTRFS_CSUM_TYPE_XXHASH 1
+	#define BTRFS_CSUM_TYPE_SHA256 2
+	#define BTRFS_CSUM_TYPE_BLAKE2 3
+#endif
+
+struct btrfs_ioctl_fs_info_args_v3 {
+	__u64 max_id;                           /* out */
+	__u64 num_devices;                      /* out */
+	__u8 fsid[BTRFS_FSID_SIZE];             /* out */
+	__u32 nodesize;                         /* out */
+	__u32 sectorsize;                       /* out */
+	__u32 clone_alignment;                  /* out */
+	/* See BTRFS_FS_INFO_FLAG_* */
+	__u16 csum_type;                        /* out */
+	__u16 csum_size;                        /* out */
+	__u64 flags;                            /* in/out */
+	__u64 generation;                       /* out */
+	__u8 metadata_uuid[BTRFS_FSID_SIZE];    /* out */
+	__u8 reserved[944];                     /* pad to 1k */
+};
+
 #endif // CRUCIBLE_BTRFS_H

include/crucible/bytevector.h

@@ -0,0 +1,79 @@
+#ifndef _CRUCIBLE_BYTEVECTOR_H_
+#define _CRUCIBLE_BYTEVECTOR_H_
+
+#include <crucible/error.h>
+
+#include <memory>
+#include <mutex>
+#include <ostream>
+
+#include <cstdint>
+#include <cstdlib>
+
+namespace crucible {
+	using namespace std;
+	// new[] is a little slower than malloc
+	// shared_ptr is about 2x slower than unique_ptr
+	// vector<uint8_t> is ~160x slower
+	// so we won't bother with unique_ptr because we can't do shared copies with it
+
+	class ByteVector {
+	public:
+		using Pointer = shared_ptr<uint8_t>;
+		using value_type = Pointer::element_type;
+		using iterator = value_type*;
+
+		ByteVector() = default;
+		ByteVector(const ByteVector &that);
+		ByteVector& operator=(const ByteVector &that);
+		ByteVector(size_t size);
+		ByteVector(const ByteVector &that, size_t start, size_t length);
+		ByteVector(iterator begin, iterator end, size_t min_size = 0);
+
+		ByteVector at(size_t start, size_t length) const;
+
+		value_type& at(size_t) const;
+		iterator begin() const;
+		void clear();
+		value_type* data() const;
+		bool empty() const;
+		iterator end() const;
+		value_type& operator[](size_t) const;
+		size_t size() const;
+		bool operator==(const ByteVector &that) const;
+
+		// this version of erase only works at the beginning or end of the buffer, else throws exception
+		void erase(iterator first);
+		void erase(iterator first, iterator last);
+
+		// An important use case is ioctls that have a fixed-size header struct
+		// followed by a buffer for further arguments.  These templates avoid
+		// doing reinterpret_casts every time.
+		template <class T> ByteVector(const T& object, size_t min_size);
+		template <class T> T* get() const;
+	private:
+		Pointer m_ptr;
+		size_t m_size = 0;
+		mutable mutex m_mutex;
+	friend ostream & operator<<(ostream &os, const ByteVector &bv);
+	};
+
+	template <class T>
+	ByteVector::ByteVector(const T& object, size_t min_size)
+	{
+		const auto size = max(min_size, sizeof(T));
+		m_ptr = Pointer(static_cast<value_type*>(malloc(size)), free);
+		memcpy(m_ptr.get(), &object, sizeof(T));
+		m_size = size;
+	}
+
+	template <class T>
+	T*
+	ByteVector::get() const
+	{
+		THROW_CHECK2(out_of_range, size(), sizeof(T), size() >= sizeof(T));
+		return reinterpret_cast<T*>(data());
+	}
+}
+
+#endif // _CRUCIBLE_BYTEVECTOR_H_

include/crucible/cache.h

@@ -3,8 +3,8 @@
 
 #include "crucible/lockset.h"
 
-#include <algorithm>
 #include <functional>
+#include <list>
 #include <map>
 #include <mutex>
 #include <tuple>
@@ -17,17 +17,26 @@ namespace crucible {
 	public:
 		using Key = tuple<Arguments...>;
 		using Func = function<Return(Arguments...)>;
-		using Time = unsigned;
-		using Value = pair<Time, Return>;
 	private:
-		Func		m_fn;
-		Time		m_ctr;
-		map<Key, Value>	m_map;
-		LockSet<Key>	m_lockset;
-		size_t		m_max_size;
-		mutex		m_mutex;
+		struct Value {
+			Key key;
+			Return ret;
+		};
+
+		using ListIter = typename list<Value>::iterator;
+
+		Func			m_fn;
+		list<Value>		m_list;
+		map<Key, ListIter>	m_map;
+		LockSet<Key>		m_lockset;
+		size_t			m_max_size;
+		mutable mutex		m_mutex;
 
 		void check_overflow();
+		void recent_use(ListIter vp);
+		void erase_item(ListIter vp);
+		void erase_key(const Key &k);
+		Return insert_item(Func fn, Arguments... args);
 	public:
 		LRUCache(Func f = Func(), size_t max_size = 100);
 
@@ -37,43 +46,126 @@ namespace crucible {
 		Return operator()(Arguments... args);
 		Return refresh(Arguments... args);
 		void expire(Arguments... args);
-		void prune(function<bool(const Return &)> predicate);
 		void insert(const Return &r, Arguments... args);
 		void clear();
+		size_t size() const;
 	};
 
 	template <class Return, class... Arguments>
 	LRUCache<Return, Arguments...>::LRUCache(Func f, size_t max_size) :
 		m_fn(f),
-		m_ctr(0),
 		m_max_size(max_size)
 	{
 	}
 
+	template <class Return, class... Arguments>
+	Return
+	LRUCache<Return, Arguments...>::insert_item(Func fn, Arguments... args)
+	{
+		Key k(args...);
+
+		// Do we have it cached?
+		unique_lock<mutex> lock(m_mutex);
+		auto found = m_map.find(k);
+		if (found == m_map.end()) {
+			// No, release cache lock and acquire key lock
+			lock.unlock();
+			auto key_lock = m_lockset.make_lock(k);
+
+			// Did item appear in cache while we were waiting for key?
+			lock.lock();
+			found = m_map.find(k);
+			if (found == m_map.end()) {
+
+				// No, we now hold key and cache locks, but item not in cache.
+				// Release cache lock and call the function
+				lock.unlock();
+
+				// Create new value
+				Value v {
+					.key = k,
+					.ret = fn(args...),
+				};
+
+				// Reacquire cache lock
+				lock.lock();
+
+				// Make room
+				check_overflow();
+
+				// Insert return value at back of LRU list (hot end)
+				auto new_item = m_list.insert(m_list.end(), v);
+
+				// Insert return value in map
+				bool inserted = false;
+				tie(found, inserted) = m_map.insert(make_pair(v.key, new_item));
+
+				// We (should be) holding a lock on this key so we are the ones to insert it
+				THROW_CHECK0(runtime_error, inserted);
+			}
+
+			// Item should be in cache now
+			THROW_CHECK0(runtime_error, found != m_map.end());
+		} else {
+			// Move to end of LRU
+			recent_use(found->second);
+		}
+
+		// Return cached object
+		return found->second->ret;
+	}
+
+	template <class Return, class... Arguments>
+	void
+	LRUCache<Return, Arguments...>::erase_item(ListIter vp)
+	{
+		if (vp != m_list.end()) {
+			m_map.erase(vp->key);
+			m_list.erase(vp);
+		}
+	}
+
+	template <class Return, class... Arguments>
+	void
+	LRUCache<Return, Arguments...>::erase_key(const Key &k)
+	{
+		auto map_item = m_map.find(k);
+		if (map_item != m_map.end()) {
+			auto list_item = map_item->second;
+			m_map.erase(map_item);
+			m_list.erase(list_item);
+		}
+	}
+
 	template <class Return, class... Arguments>
 	void
 	LRUCache<Return, Arguments...>::check_overflow()
 	{
-		if (m_map.size() <= m_max_size) return;
-		vector<pair<Key, Time>> map_contents;
-		map_contents.reserve(m_map.size());
-		for (auto i : m_map) {
-			map_contents.push_back(make_pair(i.first, i.second.first));
-		}
-		sort(map_contents.begin(), map_contents.end(), [](const pair<Key, Time> &a, const pair<Key, Time> &b) {
-			return a.second < b.second;
-		});
-		for (size_t i = 0; i < map_contents.size() / 2; ++i) {
-			m_map.erase(map_contents[i].first);
+		// Erase items at front of LRU list (cold end) until max size reached or list empty
+		while (m_map.size() >= m_max_size && !m_list.empty()) {
+			erase_item(m_list.begin());
 		}
 	}
 
+	template <class Return, class... Arguments>
+	void
+	LRUCache<Return, Arguments...>::recent_use(ListIter vp)
+	{
+		// Splice existing items at back of LRU list (hot end)
+		auto next_vp = vp;
+		++next_vp;
+		m_list.splice(m_list.end(), m_list, vp, next_vp);
+	}
+
 	template <class Return, class... Arguments>
 	void
 	LRUCache<Return, Arguments...>::max_size(size_t new_max_size)
 	{
 		unique_lock<mutex> lock(m_mutex);
 		m_max_size = new_max_size;
+		// FIXME:  this really reduces the cache size to new_max_size - 1
+		// because every other time we call this method, it is immediately
+		// followed by insert.
 		check_overflow();
 	}
 
@@ -89,80 +181,37 @@ namespace crucible {
 	void
 	LRUCache<Return, Arguments...>::clear()
 	{
+		// Move the map and list onto the stack, then destroy it after we've released the lock
+		// so that we don't block other threads if the list's destructors are expensive
+		decltype(m_list) new_list;
+		decltype(m_map) new_map;
 		unique_lock<mutex> lock(m_mutex);
-		m_map.clear();
+		m_list.swap(new_list);
+		m_map.swap(new_map);
+		lock.unlock();
 	}
 
 	template <class Return, class... Arguments>
-	void
-	LRUCache<Return, Arguments...>::prune(function<bool(const Return &)> pred)
+	size_t
+	LRUCache<Return, Arguments...>::size() const
 	{
 		unique_lock<mutex> lock(m_mutex);
-		for (auto it = m_map.begin(); it != m_map.end(); ) {
-			auto next_it = ++it;
-			if (pred(it.second.second)) {
-				m_map.erase(it);
-			}
-			it = next_it;
-		}
+		return m_map.size();
 	}
 
 	template<class Return, class... Arguments>
 	Return
 	LRUCache<Return, Arguments...>::operator()(Arguments... args)
 	{
-		Key k(args...);
-		bool inserted = false;
-
-		// Do we have it cached?
-		unique_lock<mutex> lock(m_mutex);
-		auto found = m_map.find(k);
-		if (found == m_map.end()) {
-			// No, release cache lock and acquire key lock
-			lock.unlock();
-			typename LockSet<Key>::Lock key_lock(m_lockset, k);
-
-			// Did item appear in cache while we were waiting for key?
-			lock.lock();
-			found = m_map.find(k);
-			if (found == m_map.end()) {
-
-				// No, we hold key and cache locks, but item not in cache.
-				// Release cache lock and call function
-				auto ctr_copy = m_ctr++;
-				lock.unlock();
-				Value v(ctr_copy, m_fn(args...));
-
-				// Reacquire cache lock and insert return value
-				lock.lock();
-				tie(found, inserted) = m_map.insert(make_pair(k, v));
-
-				// We hold a lock on this key so we are the ones to insert it
-				THROW_CHECK0(runtime_error, inserted);
-
-				// Release key lock and clean out overflow
-				key_lock.unlock();
-				check_overflow();
-			}
-		}
-
-		// Item should be in cache now
-		THROW_CHECK0(runtime_error, found != m_map.end());
-
-		// We are using this object so update the timestamp
-		if (!inserted) {
-			found->second.first = m_ctr++;
-		}
-		return found->second.second;
+		return insert_item(m_fn, args...);
 	}
 
 	template<class Return, class... Arguments>
 	void
 	LRUCache<Return, Arguments...>::expire(Arguments... args)
 	{
-		Key k(args...);
 		unique_lock<mutex> lock(m_mutex);
-		m_map.erase(k);
+		erase_key(Key(args...));
 	}
 
 	template<class Return, class... Arguments>
@@ -177,44 +226,7 @@ namespace crucible {
 	void
 	LRUCache<Return, Arguments...>::insert(const Return &r, Arguments... args)
 	{
-		Key k(args...);
-		bool inserted = false;
-
-		// Do we have it cached?
-		unique_lock<mutex> lock(m_mutex);
-		auto found = m_map.find(k);
-		if (found == m_map.end()) {
-			// No, release cache lock and acquire key lock
-			lock.unlock();
-			typename LockSet<Key>::Lock key_lock(m_lockset, k);
-
-			// Did item appear in cache while we were waiting for key?
-			lock.lock();
-			found = m_map.find(k);
-			if (found == m_map.end()) {
-
-				// No, we hold key and cache locks, but item not in cache.
-				// Release cache lock and insert the provided return value
-				auto ctr_copy = m_ctr++;
-				Value v(ctr_copy, r);
-				tie(found, inserted) = m_map.insert(make_pair(k, v));
-
-				// We hold a lock on this key so we are the ones to insert it
-				THROW_CHECK0(runtime_error, inserted);
-
-				// Release key lock and clean out overflow
-				key_lock.unlock();
-				check_overflow();
-			}
-		}
-
-		// Item should be in cache now
-		THROW_CHECK0(runtime_error, found != m_map.end());
-
-		// We are using this object so update the timestamp
-		if (!inserted) {
-			found->second.first = m_ctr++;
-		}
+		insert_item([&](Arguments...) -> Return { return r; }, args...);
 	}
 }
 

include/crucible/chatter.h

@@ -8,6 +8,8 @@
 #include <string>
 #include <typeinfo>
 
+#include <syslog.h>
+
   /** \brief Chatter wraps a std::ostream reference with a destructor that
       writes a newline, and inserts timestamp, pid, and tid prefixes on output.
 
@@ -33,18 +35,22 @@ namespace crucible {
 	using namespace std;
 
 	class Chatter {
+		int m_loglevel;
 		string m_name;
 		ostream &m_os;
 		ostringstream m_oss;
 
 	public:
-		Chatter(string name, ostream &os = cerr);
+		Chatter(int loglevel, string name, ostream &os = cerr);
 		Chatter(Chatter &&c);
 		ostream &get_os() { return m_oss; }
 
 		template <class T> Chatter &operator<<(const T& arg);
 
 		~Chatter();
+
+		static void enable_timestamp(bool prefix_timestamp);
+		static void enable_level(bool prefix_level);
 	};
 
 	template <class Argument>
@@ -86,16 +92,6 @@ namespace crucible {
 		}
 	};
 
-	template <>
-	struct ChatterTraits<ostream &> {
-		Chatter &
-		operator()(Chatter &c, ostream & arg)
-		{
-			c.get_os() << arg;
-			return c;
-		}
-	};
-
 	class ChatterBox {
 		string m_file;
 		int m_line;
@@ -111,7 +107,7 @@ namespace crucible {
 
 		template <class T> Chatter operator<<(const T &t)
 		{
-			Chatter c(m_pretty_function, m_os);
+			Chatter c(LOG_NOTICE, m_pretty_function, m_os);
 			c << t;
 			return c;
 		}

include/crucible/city.h

@@ -0,0 +1,113 @@
+// Copyright (c) 2011 Google, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// CityHash, by Geoff Pike and Jyrki Alakuijala
+//
+// http://code.google.com/p/cityhash/
+//
+// This file provides a few functions for hashing strings.  All of them are
+// high-quality functions in the sense that they pass standard tests such
+// as Austin Appleby's SMHasher.  They are also fast.
+//
+// For 64-bit x86 code, on short strings, we don't know of anything faster than
+// CityHash64 that is of comparable quality.  We believe our nearest competitor
+// is Murmur3.  For 64-bit x86 code, CityHash64 is an excellent choice for hash
+// tables and most other hashing (excluding cryptography).
+//
+// For 64-bit x86 code, on long strings, the picture is more complicated.
+// On many recent Intel CPUs, such as Nehalem, Westmere, Sandy Bridge, etc.,
+// CityHashCrc128 appears to be faster than all competitors of comparable
+// quality.  CityHash128 is also good but not quite as fast.  We believe our
+// nearest competitor is Bob Jenkins' Spooky.  We don't have great data for
+// other 64-bit CPUs, but for long strings we know that Spooky is slightly
+// faster than CityHash on some relatively recent AMD x86-64 CPUs, for example.
+// Note that CityHashCrc128 is declared in citycrc.h [which has been removed
+// for bees].
+//
+// For 32-bit x86 code, we don't know of anything faster than CityHash32 that
+// is of comparable quality.  We believe our nearest competitor is Murmur3A.
+// (On 64-bit CPUs, it is typically faster to use the other CityHash variants.)
+//
+// Functions in the CityHash family are not suitable for cryptography.
+//
+// Please see CityHash's README file for more details on our performance
+// measurements and so on.
+//
+// WARNING: This code has been only lightly tested on big-endian platforms!
+// It is known to work well on little-endian platforms that have a small penalty
+// for unaligned reads, such as current Intel and AMD moderate-to-high-end CPUs.
+// It should work on all 32-bit and 64-bit platforms that allow unaligned reads;
+// bug reports are welcome.
+//
+// By the way, for some hash functions, given strings a and b, the hash
+// of a+b is easily derived from the hashes of a and b.  This property
+// doesn't hold for any hash functions in this file.
+
+#ifndef CITY_HASH_H_
+#define CITY_HASH_H_
+
+#include <stdlib.h>  // for size_t.
+#include <stdint.h>
+#include <utility>
+
+typedef uint8_t uint8;
+typedef uint32_t uint32;
+typedef uint64_t uint64;
+typedef std::pair<uint64, uint64> uint128;
+
+inline uint64 Uint128Low64(const uint128& x) { return x.first; }
+inline uint64 Uint128High64(const uint128& x) { return x.second; }
+
+// Hash function for a byte array.
+uint64 CityHash64(const char *buf, size_t len);
+
+// Hash function for a byte array.  For convenience, a 64-bit seed is also
+// hashed into the result.
+uint64 CityHash64WithSeed(const char *buf, size_t len, uint64 seed);
+
+// Hash function for a byte array.  For convenience, two seeds are also
+// hashed into the result.
+uint64 CityHash64WithSeeds(const char *buf, size_t len,
+                           uint64 seed0, uint64 seed1);
+
+// Hash function for a byte array.
+uint128 CityHash128(const char *s, size_t len);
+
+// Hash function for a byte array.  For convenience, a 128-bit seed is also
+// hashed into the result.
+uint128 CityHash128WithSeed(const char *s, size_t len, uint128 seed);
+
+// Hash function for a byte array.  Most useful in 32-bit binaries.
+uint32 CityHash32(const char *buf, size_t len);
+
+// Hash 128 input bits down to 64 bits of output.
+// This is intended to be a reasonably good hash function.
+inline uint64 Hash128to64(const uint128& x) {
+  // Murmur-inspired hashing.
+  const uint64 kMul = 0x9ddfea08eb382d69ULL;
+  uint64 a = (Uint128Low64(x) ^ Uint128High64(x)) * kMul;
+  a ^= (a >> 47);
+  uint64 b = (Uint128High64(x) ^ a) * kMul;
+  b ^= (b >> 47);
+  b *= kMul;
+  return b;
+}
+
+#endif  // CITY_HASH_H_

include/crucible/cleanup.h

@@ -0,0 +1,18 @@
+#ifndef CRUCIBLE_CLEANUP_H
+#define CRUCIBLE_CLEANUP_H
+
+#include <functional>
+
+namespace crucible {
+	using namespace std;
+
+	class Cleanup {
+		function<void()> m_cleaner;
+	public:
+		Cleanup(function<void()> func);
+		~Cleanup();
+	};
+
+}
+
+#endif // CRUCIBLE_CLEANUP_H

include/crucible/crc64.h

@@ -3,11 +3,11 @@
 
 #include <cstdint>
 #include <cstdlib>
+#include <cstring>
 
 namespace crucible {
 	namespace Digest {
 		namespace CRC {
-			uint64_t crc64(const char *s);
 			uint64_t crc64(const void *p, size_t len);
 		};
 	};

include/crucible/endian.h

@@ -0,0 +1,58 @@
+#ifndef CRUCIBLE_ENDIAN_H
+#define CRUCIBLE_ENDIAN_H
+
+#include <cstdint>
+
+#include <endian.h>
+
+namespace crucible {
+
+	template<class T>
+	struct le_to_cpu_helper {
+		T operator()(const T v);
+	};
+
+	template<> struct le_to_cpu_helper<uint64_t> {
+		uint64_t operator()(const uint64_t v) { return le64toh(v); }
+	};
+
+#if __SIZEOF_LONG__ == 8
+	// uint64_t is unsigned long on LP64 platforms
+	template<> struct le_to_cpu_helper<unsigned long long> {
+		unsigned long long operator()(const unsigned long long v) { return le64toh(v); }
+	};
+#endif
+
+	template<> struct le_to_cpu_helper<uint32_t> {
+		uint32_t operator()(const uint32_t v) { return le32toh(v); }
+	};
+
+	template<> struct le_to_cpu_helper<uint16_t> {
+		uint16_t operator()(const uint16_t v) { return le16toh(v); }
+	};
+
+	template<> struct le_to_cpu_helper<uint8_t> {
+		uint8_t operator()(const uint8_t v) { return v; }
+	};
+
+	template<class T>
+	T
+	le_to_cpu(const T v)
+	{
+		return le_to_cpu_helper<T>()(v);
+	}
+
+	template<class T>
+	T
+	get_unaligned(const void *const p)
+	{
+		struct not_aligned {
+			T v;
+		} __attribute__((packed));
+		const not_aligned *const nap = reinterpret_cast<const not_aligned*>(p);
+		return nap->v;
+	}
+
+}
+
+#endif // CRUCIBLE_ENDIAN_H

include/crucible/error.h

@@ -81,31 +81,25 @@ namespace crucible {
 // macro for throwing an error
 #define THROW_ERROR(type, expr) do { \
 	std::ostringstream _te_oss; \
-	_te_oss << expr; \
+	_te_oss << expr << " at " << __FILE__ << ":" << __LINE__; \
 	throw type(_te_oss.str()); \
 } while (0)
 
 // macro for throwing a system_error with errno
 #define THROW_ERRNO(expr) do { \
 	std::ostringstream _te_oss; \
-	_te_oss << expr; \
+	_te_oss << expr << " at " << __FILE__ << ":" << __LINE__; \
 	throw std::system_error(std::error_code(errno, std::system_category()), _te_oss.str()); \
 } while (0)
 
 // macro for throwing a system_error with some other variable
 #define THROW_ERRNO_VALUE(value, expr) do { \
 	std::ostringstream _te_oss; \
-	_te_oss << expr; \
+	_te_oss << expr << " at " << __FILE__ << ":" << __LINE__; \
 	throw std::system_error(std::error_code((value), std::system_category()), _te_oss.str()); \
 } while (0)
 
 // macros for checking a constraint
-#define CHECK_CONSTRAINT(value, expr) do { \
-	if (!(expr)) { \
-		THROW_ERROR(out_of_range, #value << " = " << value << " failed constraint check (" << #expr << ")"); \
-	} \
-} while(0)
-
 #define THROW_CHECK0(type, expr) do { \
 	if (!(expr)) { \
 		THROW_ERROR(type, "failed constraint check (" << #expr << ")"); \
@@ -132,6 +126,13 @@ namespace crucible {
 	} \
 } while(0)
 
+#define THROW_CHECK4(type, value1, value2, value3, value4, expr) do { \
+	if (!(expr)) { \
+		THROW_ERROR(type, #value1 << " = " << (value1) << ", " #value2 << " = " << (value2) << ", " #value3 << " = " << (value3) << ", " #value4 << " = " << (value4) \
+			<< " failed constraint check (" << #expr << ")"); \
+	} \
+} while(0)
+
 #define THROW_CHECK_BIN_OP(type, value1, op, value2) do { \
 	if (!((value1) op (value2))) { \
 		THROW_ERROR(type, "failed constraint check " << #value1 << " (" << (value1) << ") " << #op << " " << #value2 << " (" << (value2) << ")"); \

include/crucible/execpipe.h

@@ -1,28 +0,0 @@
-#ifndef CRUCIBLE_EXECPIPE_H
-#define CRUCIBLE_EXECPIPE_H
-
-#include "crucible/fd.h"
-
-#include <functional>
-#include <limits>
-#include <string>
-
-namespace crucible {
-	using namespace std;
-
-	void redirect_stdin(const Fd &child_fd);
-	void redirect_stdin_stdout(const Fd &child_fd);
-	void redirect_stdin_stdout_stderr(const Fd &child_fd);
-	void redirect_stdout(const Fd &child_fd);
-	void redirect_stdout_stderr(const Fd &child_fd);
-
-	// Open a pipe (actually socketpair) to child process, then execute code in that process.
-	// e.g. popen([] () { system("echo Hello, World!"); });
-	// Forked process will exit when function returns.
-	Fd popen(function<int()> f, function<void(const Fd &child_fd)> import_fd_fn = redirect_stdin_stdout);
-
-	// Read all the data from fd into a string
-        string read_all(Fd fd, size_t max_bytes = numeric_limits<size_t>::max(), size_t chunk_bytes = 4096);
-};
-
-#endif // CRUCIBLE_EXECPIPE_H

include/crucible/extentwalker.h

@@ -8,15 +8,15 @@ namespace crucible {
 
 	// FIXME:  ExtentCursor is probably a better name
 	struct Extent {
-		off_t		m_begin;
-		off_t		m_end;
-		uint64_t	m_physical;
-		uint64_t	m_flags;
+		off_t		m_begin = 0;
+		off_t		m_end = 0;
+		uint64_t	m_physical = 0;
+		uint64_t	m_flags = 0;
 
 		// Btrfs extent reference details
-		off_t		m_physical_len;
-		off_t		m_logical_len;
-		off_t		m_offset;
+		off_t		m_physical_len = 0;
+		off_t		m_logical_len = 0;
+		off_t		m_offset = 0;
 
 		// fiemap flags are uint32_t, so bits 32..63 are OK for us
 
@@ -38,11 +38,10 @@ namespace crucible {
 		off_t physical_len() const { return m_physical_len; }
 		off_t logical_len() const { return m_logical_len; }
 		off_t offset() const { return m_offset; }
+		bool compressed() const;
+		uint64_t bytenr() const;
 		bool operator==(const Extent &that) const;
 		bool operator!=(const Extent &that) const { return !(*this == that); }
-
-		Extent();
-		Extent(const Extent &e) = default;
 	};
 
 	class ExtentWalker {
@@ -56,10 +55,6 @@ namespace crucible {
 
 		virtual Vec get_extent_map(off_t pos);
 
-		static const unsigned sc_extent_fetch_max = 64;
-		static const unsigned sc_extent_fetch_min = 4;
-		static const off_t sc_step_size = 0x1000 * (sc_extent_fetch_max / 2);
-
 	private:
 		Vec	m_extents;
 		Itr	m_current;
@@ -67,6 +62,10 @@ namespace crucible {
 		Itr find_in_cache(off_t pos);
 		void run_fiemap(off_t pos);
 
+#ifdef EXTENTWALKER_DEBUG
+		ostringstream m_log;
+#endif
+
 	public:
 		ExtentWalker(Fd fd = Fd());
 		ExtentWalker(Fd fd, off_t initial_pos);

include/crucible/fd.h

@@ -1,7 +1,8 @@
 #ifndef CRUCIBLE_FD_H
 #define CRUCIBLE_FD_H
 
-#include "crucible/resource.h"
+#include "crucible/bytevector.h"
+#include "crucible/namedptr.h"
 
 #include <cstring>
 
@@ -13,6 +14,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+// ioctl
+#include <sys/ioctl.h>
+#include <linux/fs.h>
+
 // socket
 #include <sys/socket.h>
 
@@ -22,76 +27,91 @@
 namespace crucible {
 	using namespace std;
 
-	// IOHandle is a file descriptor owner object.  It closes them when destroyed.
-	// Most of the functions here don't use it because these functions don't own FDs.
-	// All good names for such objects are taken.
+	/// File descriptor owner object.  It closes them when destroyed.
+	/// Most of the functions here don't use it because these functions don't own FDs.
+	/// All good names for such objects are taken.
 	class IOHandle {
 		IOHandle(const IOHandle &) = delete;
 		IOHandle(IOHandle &&) = delete;
 		IOHandle& operator=(IOHandle &&) = delete;
 		IOHandle& operator=(const IOHandle &) = delete;
-	protected:
 		int	m_fd;
-		IOHandle& operator=(int that) { m_fd = that; return *this; }
+		void close();
 	public:
 		virtual ~IOHandle();
-		IOHandle(int fd);
-		IOHandle();
-
-		void close();
-		int get_fd() const { return m_fd; }
-		int release_fd();
+		IOHandle(int fd = -1);
+		int get_fd() const;
 	};
 
-        template <>
-        struct ResourceTraits<int, IOHandle> {
-                int get_key(const IOHandle &res) const { return res.get_fd(); }
-                shared_ptr<IOHandle> make_resource(int fd) const { return make_shared<IOHandle>(fd); }
-                bool is_null_key(const int &key) const { return key < 0; }
-                int get_null_key() const { return -1; }
-        };
+	/// Copyable file descriptor.
+	class Fd {
+		static NamedPtr<IOHandle, int> s_named_ptr;
+		shared_ptr<IOHandle> m_handle;
+	public:
+		using resource_type = IOHandle;
+		Fd();
+		Fd(int fd);
+		Fd &operator=(int fd);
+		Fd &operator=(const shared_ptr<IOHandle> &);
+		operator int() const;
+		bool operator!() const;
+		shared_ptr<IOHandle> operator->() const;
+	};
 
-        typedef ResourceHandle<int, IOHandle> Fd;
+	void set_relative_path(string path);
+	string relative_path();
 
 	// Functions named "foo_or_die" throw exceptions on failure.
 
-	// Attempt to open the file with the given mode
+	/// Attempt to open the file with the given mode, throw exception on failure.
 	int open_or_die(const string &file, int flags = O_RDONLY, mode_t mode = 0777);
+	/// Attempt to open the file with the given mode, throw exception on failure.
 	int openat_or_die(int dir_fd, const string &file, int flags = O_RDONLY, mode_t mode = 0777);
 
-	// Decode open parameters
+	/// Decode open flags
 	string o_flags_ntoa(int flags);
+	/// Decode open mode
 	string o_mode_ntoa(mode_t mode);
 
-	// mmap with its one weird error case
+	/// mmap with its one weird error case
 	void *mmap_or_die(void *addr, size_t length, int prot, int flags, int fd, off_t offset);
-	// Decode mmap parameters
+	/// Decode mmap prot
 	string mmap_prot_ntoa(int prot);
+	/// Decode mmap flags
 	string mmap_flags_ntoa(int flags);
 
-	// Unlink, rename
-	void unlink_or_die(const string &file);
+	/// Rename, throw exception on failure.
 	void rename_or_die(const string &from, const string &to);
+	/// Rename, throw exception on failure.
 	void renameat_or_die(int fromfd, const string &frompath, int tofd, const string &topath);
 
+	/// Truncate, throw exception on failure.
+	void ftruncate_or_die(int fd, off_t size);
+
 	// Read or write structs:
 	// There is a template specialization to read or write strings
 	// Three-arg version of read_or_die/write_or_die throws an error on incomplete read/writes
 	// Four-arg version returns number of bytes read/written through reference arg
 
+	/// Attempt read by pointer and length, throw exception on IO error or short read.
 	void read_or_die(int fd, void *buf, size_t size);
+	/// Attempt read of a POD struct, throw exception on IO error or short read.
 	template <class T> void read_or_die(int fd, T& buf)
 	{
 		return read_or_die(fd, static_cast<void *>(&buf), sizeof(buf));
 	}
 
+	/// Attempt read by pointer and length, throw exception on IO error but not short read.
 	void read_partial_or_die(int fd, void *buf, size_t size_wanted, size_t &size_read);
+	/// Attempt read of a POD struct, throw exception on IO error but not short read.
 	template <class T> void read_partial_or_die(int fd, T& buf, size_t &size_read)
 	{
 		return read_partial_or_die(fd, static_cast<void *>(&buf), sizeof(buf), size_read);
 	}
 
+	/// Attempt read at position by pointer and length, throw exception on IO error but not short read.
 	void pread_or_die(int fd, void *buf, size_t size, off_t offset);
+	/// Attempt read at position of a POD struct, throw exception on IO error but not short read.
 	template <class T> void pread_or_die(int fd, T& buf, off_t offset)
 	{
 		return pread_or_die(fd, static_cast<void *>(&buf), sizeof(buf), offset);
@@ -118,17 +138,23 @@ namespace crucible {
 	// Specialization for strings which reads/writes the string content, not the struct string
 	template<> void write_or_die<string>(int fd, const string& str);
 	template<> void pread_or_die<string>(int fd, string& str, off_t offset);
-	template<> void pread_or_die<vector<char>>(int fd, vector<char>& str, off_t offset);
-	template<> void pread_or_die<vector<uint8_t>>(int fd, vector<uint8_t>& str, off_t offset);
+	template<> void pwrite_or_die<string>(int fd, const string& str, off_t offset);
+	template<> void pread_or_die<ByteVector>(int fd, ByteVector& str, off_t offset);
+	template<> void pwrite_or_die<ByteVector>(int fd, const ByteVector& str, off_t offset);
+	// Deprecated
+	template<> void pread_or_die<vector<uint8_t>>(int fd, vector<uint8_t>& str, off_t offset) = delete;
+	template<> void pwrite_or_die<vector<uint8_t>>(int fd, const vector<uint8_t>& str, off_t offset) = delete;
+	template<> void pread_or_die<vector<char>>(int fd, vector<char>& str, off_t offset) = delete;
+	template<> void pwrite_or_die<vector<char>>(int fd, const vector<char>& str, off_t offset) = delete;
 
-	// A different approach to reading a simple string
+	/// Read a simple string.
 	string read_string(int fd, size_t size);
 
-	// A lot of Unix API wants you to initialize a struct and call
-	// one function to fill it, another function to throw it away,
-	// and has some unknown third thing you have to do when there's
-	// an error.  That's also a C++ object with an exception-throwing
-	// constructor.
+	/// A lot of Unix API wants you to initialize a struct and call
+	/// one function to fill it, another function to throw it away,
+	/// and has some unknown third thing you have to do when there's
+	/// an error.  That's also a C++ object with an exception-throwing
+	/// constructor.
 	struct Stat : public stat {
 		Stat();
 		Stat(int f);
@@ -137,19 +163,22 @@ namespace crucible {
 		Stat &lstat(const string &filename);
 	};
 
+	int ioctl_iflags_get(int fd);
+	void ioctl_iflags_set(int fd, int attr);
+
 	string st_mode_ntoa(mode_t mode);
 
-	// Because it's not trivial to do correctly
+	/// Because it's not trivial to do correctly
 	string readlink_or_die(const string &path);
 
-	// Determine the name of a FD by readlink through /proc/self/fd/
+	/// Determine the name of a FD by readlink through /proc/self/fd/
 	string name_fd(int fd);
 
-	// Returns Fd objects because it does own them.
+	/// Returns Fd objects because it does own them.
 	pair<Fd, Fd> socketpair_or_die(int domain = AF_UNIX, int type = SOCK_STREAM, int protocol = 0);
 
-	// like unique_lock but for flock instead of mutexes...and not trying
-	// to hide the many and subtle differences between those two things *at all*.
+	/// like unique_lock but for flock instead of mutexes...and not trying
+	/// to hide the many and subtle differences between those two things *at all*.
 	class Flock {
 		int	m_fd;
 		bool	m_locked;
@@ -170,7 +199,7 @@ namespace crucible {
 		int fd();
 	};
 
-	// Doesn't use Fd objects because it's usually just used to replace stdin/stdout/stderr.
+	/// Doesn't use Fd objects because it's usually just used to replace stdin/stdout/stderr.
 	void dup2_or_die(int fd_in, int fd_out);
 
 }

include/crucible/fs.h

@@ -1,6 +1,8 @@
 #ifndef CRUCIBLE_FS_H
 #define CRUCIBLE_FS_H
 
+#include "crucible/bytevector.h"
+#include "crucible/endian.h"
 #include "crucible/error.h"
 
 // Terribly Linux-specific FS-wrangling functions
@@ -13,6 +15,7 @@
 
 #include <cstdint>
 #include <iosfwd>
+#include <set>
 #include <vector>
 
 #include <fcntl.h>
@@ -24,23 +27,16 @@ namespace crucible {
 	// wrapper around fallocate(...FALLOC_FL_PUNCH_HOLE...)
 	void punch_hole(int fd, off_t offset, off_t len);
 
-	struct BtrfsExtentInfo : public btrfs_ioctl_same_extent_info {
-		BtrfsExtentInfo(int dst_fd, off_t dst_offset);
-	};
-
-	struct BtrfsExtentSame : public btrfs_ioctl_same_args {
+	struct BtrfsExtentSame {
 		virtual ~BtrfsExtentSame();
 		BtrfsExtentSame(int src_fd, off_t src_offset, off_t src_length);
-		void add(int fd, off_t offset);
+		void add(int fd, uint64_t offset);
 		virtual void do_ioctl();
 
+		uint64_t m_logical_offset = 0;
+		uint64_t m_length = 0;
 		int m_fd;
-		vector<BtrfsExtentInfo> m_info;
-	};
-
-	struct BtrfsExtentSameByClone : public BtrfsExtentSame {
-		using BtrfsExtentSame::BtrfsExtentSame;
-		void do_ioctl() override;
+		vector<btrfs_ioctl_same_extent_info> m_info;
 	};
 
 	ostream & operator<<(ostream &os, const btrfs_ioctl_same_extent_info *info);
@@ -55,26 +51,49 @@ namespace crucible {
 
 	ostream & operator<<(ostream &os, const BtrfsInodeOffsetRoot &p);
 
-	struct BtrfsDataContainer : public btrfs_data_container {
+	struct BtrfsDataContainer {
 		BtrfsDataContainer(size_t size = 64 * 1024);
-		void *prepare();
+		void *prepare(size_t size);
 
 		size_t get_size() const;
-		decltype(bytes_left) get_bytes_left() const;
-		decltype(bytes_missing) get_bytes_missing() const;
-		decltype(elem_cnt) get_elem_cnt() const;
-		decltype(elem_missed) get_elem_missed() const;
+		decltype(btrfs_data_container::bytes_left) get_bytes_left() const;
+		decltype(btrfs_data_container::bytes_missing) get_bytes_missing() const;
+		decltype(btrfs_data_container::elem_cnt) get_elem_cnt() const;
+		decltype(btrfs_data_container::elem_missed) get_elem_missed() const;
 
-		vector<char> m_data;
+		ByteVector m_data;
 	};
 
-	struct BtrfsIoctlLogicalInoArgs : public btrfs_ioctl_logical_ino_args {
-		BtrfsIoctlLogicalInoArgs(uint64_t logical, size_t buf_size = 64 * 1024);
+	struct BtrfsIoctlLogicalInoArgs {
+		BtrfsIoctlLogicalInoArgs(uint64_t logical, size_t buf_size = 16 * 1024 * 1024);
+
+		uint64_t get_flags() const;
+		void set_flags(uint64_t new_flags);
+
 		virtual void do_ioctl(int fd);
 		virtual bool do_ioctl_nothrow(int fd);
 
+		struct BtrfsInodeOffsetRootSpan {
+			using iterator = BtrfsInodeOffsetRoot*;
+			using const_iterator = const BtrfsInodeOffsetRoot*;
+			size_t size() const;
+			iterator begin() const;
+			iterator end() const;
+			const_iterator cbegin() const;
+			const_iterator cend() const;
+			iterator data() const;
+			void clear();
+		private:
+			iterator m_begin = nullptr;
+			iterator m_end = nullptr;
+		friend struct BtrfsIoctlLogicalInoArgs;
+		} m_iors;
+	private:
+		size_t m_container_size;
 		BtrfsDataContainer m_container;
-		vector<BtrfsInodeOffsetRoot> m_iors;
+		uint64_t m_logical;
+		uint64_t m_flags = 0;
+	friend ostream & operator<<(ostream &os, const BtrfsIoctlLogicalInoArgs *p);
 	};
 
 	ostream & operator<<(ostream &os, const BtrfsIoctlLogicalInoArgs &p);
@@ -84,7 +103,7 @@ namespace crucible {
 		virtual void do_ioctl(int fd);
 		virtual bool do_ioctl_nothrow(int fd);
 
-		BtrfsDataContainer m_container;
+		size_t m_container_size;
 		vector<string> m_paths;
 	};
 
@@ -106,15 +125,6 @@ namespace crucible {
 
 	ostream & operator<<(ostream &os, const BtrfsIoctlDefragRangeArgs *p);
 
-	// in btrfs/ctree.h, but that's a nightmare to #include here
-	typedef enum {
-		BTRFS_COMPRESS_NONE  = 0,
-		BTRFS_COMPRESS_ZLIB  = 1,
-		BTRFS_COMPRESS_LZO   = 2,
-		BTRFS_COMPRESS_TYPES = 2,
-		BTRFS_COMPRESS_LAST  = 3,
-	} btrfs_compression_type;
-
 	struct FiemapExtent : public fiemap_extent {
 		FiemapExtent();
 		FiemapExtent(const fiemap_extent &that);
@@ -123,16 +133,26 @@ namespace crucible {
 		off_t end() const;
 	};
 
-	struct Fiemap : public fiemap {
+	struct Fiemap {
+
+		// because fiemap.h insists on giving FIEMAP_MAX_OFFSET
+		// a different type from the struct fiemap members
+		static const uint64_t s_fiemap_max_offset = FIEMAP_MAX_OFFSET;
 
 		// Get entire file
-		Fiemap(uint64_t start = 0, uint64_t length = FIEMAP_MAX_OFFSET);
+		Fiemap(uint64_t start = 0, uint64_t length = s_fiemap_max_offset);
 
 		void do_ioctl(int fd);
 
 		vector<FiemapExtent> m_extents;
-		uint64_t m_min_count = (4096 - sizeof(fiemap)) / sizeof(fiemap_extent);
-		uint64_t m_max_count = 16 * 1024 * 1024 / sizeof(fiemap_extent);
+		decltype(fiemap::fm_extent_count) m_min_count = (4096 - sizeof(fiemap)) / sizeof(fiemap_extent);
+		decltype(fiemap::fm_extent_count) m_max_count = 16 * 1024 * 1024 / sizeof(fiemap_extent);
+		uint64_t m_start;
+		uint64_t m_length;
+		// FIEMAP is slow and full of lies.
+		// This makes FIEMAP even slower, but reduces the lies a little.
+		decltype(fiemap::fm_flags) m_flags = FIEMAP_FLAG_SYNC;
+	friend ostream &operator<<(ostream &, const Fiemap &);
 	};
 
 	ostream & operator<<(ostream &os, const fiemap_extent *info);
@@ -148,79 +168,64 @@ namespace crucible {
 
 	struct BtrfsIoctlSearchHeader : public btrfs_ioctl_search_header {
 		BtrfsIoctlSearchHeader();
-		vector<char> m_data;
-		size_t set_data(const vector<char> &v, size_t offset);
+		ByteVector m_data;
+		size_t set_data(const ByteVector &v, size_t offset);
+		bool operator<(const BtrfsIoctlSearchHeader &that) const;
 	};
 
+	// Perf blames this function for a few percent overhead; move it here so it can be inline
+	inline bool BtrfsIoctlSearchHeader::operator<(const BtrfsIoctlSearchHeader &that) const
+	{
+		return tie(objectid, type, offset, len, transid) < tie(that.objectid, that.type, that.offset, that.len, that.transid);
+	}
+
 	ostream & operator<<(ostream &os, const btrfs_ioctl_search_header &hdr);
 	ostream & operator<<(ostream &os, const BtrfsIoctlSearchHeader &hdr);
 
 	struct BtrfsIoctlSearchKey : public btrfs_ioctl_search_key {
-		BtrfsIoctlSearchKey(size_t buf_size = 1024 * 1024);
-		virtual bool do_ioctl_nothrow(int fd);
-		virtual void do_ioctl(int fd);
+		BtrfsIoctlSearchKey(size_t buf_size = 1024);
+		bool do_ioctl_nothrow(int fd);
+		void do_ioctl(int fd);
 
 		// Copy objectid/type/offset so we move forward
 		void next_min(const BtrfsIoctlSearchHeader& ref);
 
+		// move forward to next object of a single type
+		void next_min(const BtrfsIoctlSearchHeader& ref, const uint8_t type);
+
 		size_t m_buf_size;
-		vector<BtrfsIoctlSearchHeader> m_result;
+		set<BtrfsIoctlSearchHeader> m_result;
 	};
 
 	ostream & operator<<(ostream &os, const btrfs_ioctl_search_key &key);
 	ostream & operator<<(ostream &os, const BtrfsIoctlSearchKey &key);
 
 	string btrfs_search_type_ntoa(unsigned type);
-	string btrfs_search_objectid_ntoa(unsigned objectid);
+	string btrfs_search_objectid_ntoa(uint64_t objectid);
+	string btrfs_compress_type_ntoa(uint8_t type);
 
 	uint64_t btrfs_get_root_id(int fd);
 	uint64_t btrfs_get_root_transid(int fd);
 
-	template<class T>
+	template<class T, class V>
 	const T*
-	get_struct_ptr(vector<char> &v, size_t offset = 0)
+	get_struct_ptr(const V &v, size_t offset = 0)
 	{
-		// OK so sometimes btrfs overshoots a little
-		if (offset + sizeof(T) > v.size()) {
-			v.resize(offset + sizeof(T), 0);
-		}
-		THROW_CHECK2(invalid_argument, v.size(), offset + sizeof(T), offset + sizeof(T) <= v.size());
-		return reinterpret_cast<const T*>(v.data() + offset);
+		THROW_CHECK2(out_of_range, v.size(), offset + sizeof(T), offset + sizeof(T) <= v.size());
+		const uint8_t *const data_ptr = v.data();
+		return reinterpret_cast<const T*>(data_ptr + offset);
 	}
 
-	template<class A, class R>
-	R
-	call_btrfs_get(R (*func)(const A*), vector<char> &v, size_t offset = 0)
-	{
-		return func(get_struct_ptr<A>(v, offset));
-	}
-
-	template <class T> struct btrfs_get_le;
-
-	template<> struct btrfs_get_le<__le64> {
-		uint64_t operator()(const void *p) { return get_unaligned_le64(p); }
-	};
-
-	template<> struct btrfs_get_le<__le32> {
-		uint32_t operator()(const void *p) { return get_unaligned_le32(p); }
-	};
-
-	template<> struct btrfs_get_le<__le16> {
-		uint16_t operator()(const void *p) { return get_unaligned_le16(p); }
-	};
-
-	template<> struct btrfs_get_le<__le8> {
-		uint8_t operator()(const void *p) { return get_unaligned_le8(p); }
-	};
-
-	template<class S, class T>
+	template<class S, class T, class V>
 	T
-	btrfs_get_member(T S::* member, vector<char> &v, size_t offset = 0)
+	btrfs_get_member(T S::* member, V &v, size_t offset = 0)
 	{
-		const S *sp = reinterpret_cast<const S*>(NULL);
-		const T *spm = &(sp->*member);
-		auto member_offset = reinterpret_cast<const char *>(spm) - reinterpret_cast<const char *>(sp);
-		return btrfs_get_le<T>()(get_struct_ptr<S>(v, offset + member_offset));
+		const S *const sp = nullptr;
+		const T *const spm = &(sp->*member);
+		const auto member_offset = reinterpret_cast<const uint8_t *>(spm) - reinterpret_cast<const uint8_t *>(sp);
+		const void *struct_ptr = get_struct_ptr<T>(v, offset + member_offset);
+		const T unaligned_t = get_unaligned<T>(struct_ptr);
+		return le_to_cpu(unaligned_t);
 	}
 
 	struct Statvfs : public statvfs {
@@ -232,12 +237,14 @@ namespace crucible {
 		unsigned long available() const;
 	};
 
-	ostream &hexdump(ostream &os, const vector<char> &v);
+	template<class V> ostream &hexdump(ostream &os, const V &v);
 
-	struct BtrfsIoctlFsInfoArgs : public btrfs_ioctl_fs_info_args {
+	struct BtrfsIoctlFsInfoArgs : public btrfs_ioctl_fs_info_args_v3 {
 		BtrfsIoctlFsInfoArgs();
 		void do_ioctl(int fd);
-		string uuid() const;
+		uint16_t csum_type() const;
+		uint16_t csum_size() const;
+		uint64_t generation() const;
 	};
 
 	ostream & operator<<(ostream &os, const BtrfsIoctlFsInfoArgs &a);

include/crucible/hexdump.h

@@ -0,0 +1,36 @@
+#ifndef CRUCIBLE_HEXDUMP_H
+#define CRUCIBLE_HEXDUMP_H
+
+#include "crucible/string.h"
+
+#include <ostream>
+
+namespace crucible {
+	using namespace std;
+
+	template <class V>
+	ostream &
+	hexdump(ostream &os, const V &v)
+	{
+		os << "V { size = " << v.size() << ", data:\n";
+		for (size_t i = 0; i < v.size(); i += 8) {
+			string hex, ascii;
+			for (size_t j = i; j < i + 8; ++j) {
+				if (j < v.size()) {
+					uint8_t c = v[j];
+					char buf[8];
+					sprintf(buf, "%02x ", c);
+					hex += buf;
+					ascii += (c < 32 || c > 126) ? '.' : c;
+				} else {
+					hex += "   ";
+					ascii += ' ';
+				}
+			}
+			os << astringprintf("\t%08x %s %s\n", i, hex.c_str(), ascii.c_str());
+		}
+		return os << "}";
+	}
+};
+
+#endif // CRUCIBLE_HEXDUMP_H

include/crucible/interp.h

@@ -1,106 +0,0 @@
-#ifndef CRUCIBLE_INTERP_H
-#define CRUCIBLE_INTERP_H
-
-#include "crucible/error.h"
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace crucible {
-	using namespace std;
-
-	struct ArgList : public vector<string> {
-		ArgList(const char **argv);
-		// using vector<string>::vector ... doesn't work:
-		// error: ‘std::vector<std::basic_string<char> >::vector’ names constructor
-		// Still doesn't work in 4.9 because it can't manage a conversion
-		ArgList(const vector<string> &&that);
-	};
-
-	struct ArgActor {
-		struct ArgActorBase {
-			virtual void predicate(void *obj, string arg);
-		};
-
-		template <class T>
-		struct ArgActorDerived {
-			function<void(T, string)> m_func;
-
-			ArgActorDerived(decltype(m_func) func) :
-				m_func(func)
-			{
-			}
-
-			void predicate(void *obj, string arg) override
-			{
-				T &op = *(reinterpret_cast<T*>(obj));
-				m_func(op, obj);
-			}
-		};
-
-		template <class T>
-		ArgActor(T, function<void(T, string)> func) :
-			m_actor(make_shared(ArgActorDerived<T>(func)))
-		{
-		}
-
-		ArgActor() = default;
-
-		void predicate(void *t, string arg)
-		{
-			if (m_actor) {
-				m_actor->predicate(t, arg);
-			} else {
-				THROW_ERROR(invalid_argument, "null m_actor for predicate arg '" << arg << "'");
-			}
-		}
-
-	private:
-		shared_ptr<ArgActorBase> m_actor;
-	};
-
-	struct ArgParser {
-		~ArgParser();
-		ArgParser();
-
-		void add_opt(string opt, ArgActor actor);
-
-		template <class T>
-		void
-		parse(T t, const ArgList &args)
-		{
-			void *vt = &t;
-			parse_backend(vt, args);
-		}
-		
-	private:
-		void parse_backend(void *t, const ArgList &args);
-		map<string, ArgActor>	m_string_opts;
-	};
-
-	struct Command {
-		virtual ~Command();
-		virtual int exec(const ArgList &args) = 0;
-	};
-
-	struct Proc : public Command {
-		int exec(const ArgList &args) override;
-		Proc(const function<int(const ArgList &)> &f);
-	private:
-		function<int(const ArgList &)> m_cmd;
-	};
-
-	struct Interp {
-		virtual ~Interp();
-		Interp(const map<string, shared_ptr<Command> > &cmdlist);
-		void add_command(const string &name, const shared_ptr<Command> &command);
-		int exec(const ArgList &args);
-	private:
-		Interp(const Interp &) = delete;
-		map<string, shared_ptr<Command> > m_commands;
-	};
-
-};
-#endif // CRUCIBLE_INTERP_H

include/crucible/lockset.h

@@ -1,14 +1,17 @@
 #ifndef CRUCIBLE_LOCKSET_H
 #define CRUCIBLE_LOCKSET_H
 
-#include <crucible/error.h>
+#include "crucible/error.h"
+#include "crucible/process.h"
 
 #include <cassert>
 
 #include <condition_variable>
 #include <iostream>
+#include <limits>
+#include <map>
+#include <memory>
 #include <mutex>
-#include <set>
 
 namespace crucible {
 	using namespace std;
@@ -17,14 +20,36 @@ namespace crucible {
 	class LockSet {
 
 	public:
-		using key_type = T;
-		using set_type = set<T>;
+		using set_type = map<T, pid_t>;
+		using key_type = typename set_type::key_type;
 
 	private:
 
 		set_type			m_set;
 		mutex				m_mutex;
 		condition_variable		m_condvar;
+		size_t				m_max_size = numeric_limits<size_t>::max();
+
+		bool full();
+		bool locked(const key_type &name);
+
+		class Lock {
+			LockSet		&m_lockset;
+			key_type	m_name;
+			bool		m_locked;
+
+			Lock() = delete;
+			Lock(const Lock &) = delete;
+			Lock& operator=(const Lock &) = delete;
+			Lock(Lock &&that) = delete;
+			Lock& operator=(Lock &&that) = delete;
+		public:
+			~Lock();
+			Lock(LockSet &lockset, const key_type &name, bool start_locked = true);
+			void lock();
+			void unlock();
+			bool try_lock();
+		};
 
 	public:
 		~LockSet();
@@ -36,26 +61,21 @@ namespace crucible {
 		size_t size();
 		bool empty();
 		set_type copy();
-		void wait_unlock(double interval);
 
-		class Lock {
-			LockSet		&m_lockset;
-			key_type	m_name;
-			bool		m_locked;
+		void max_size(size_t max);
+
+		class LockHandle {
+			shared_ptr<Lock> m_lock;
 
-			Lock() = delete;
-			Lock(const Lock &) = delete;
-			Lock& operator=(const Lock &) = delete;
 		public:
-			~Lock();
-			Lock(LockSet &lockset, const key_type &m_name, bool start_locked = true);
-			Lock(Lock &&that);
-			Lock& operator=(Lock &&that);
-			void lock();
-			void unlock();
-			bool try_lock();
+			LockHandle(LockSet &lockset, const key_type &name, bool start_locked = true) :
+				m_lock(make_shared<Lock>(lockset, name, start_locked)) {}
+			void lock() { m_lock->lock(); }
+			void unlock() { m_lock->unlock(); }
+			bool try_lock() { return m_lock->try_lock(); }
 		};
 
+		LockHandle make_lock(const key_type &name, bool start_locked = true);
 	};
 
 	template <class T>
@@ -68,15 +88,36 @@ namespace crucible {
 		assert(m_set.empty());
 	}
 
+	template <class T>
+	bool
+	LockSet<T>::full()
+	{
+		return m_set.size() >= m_max_size;
+	}
+
+	template <class T>
+	bool
+	LockSet<T>::locked(const key_type &name)
+	{
+		return m_set.count(name);
+	}
+
+	template <class T>
+	void
+	LockSet<T>::max_size(size_t s)
+	{
+		m_max_size = s;
+	}
+
 	template <class T>
 	void
 	LockSet<T>::lock(const key_type &name)
 	{
 		unique_lock<mutex> lock(m_mutex);
-		while (m_set.count(name)) {
+		while (full() || locked(name)) {
 			m_condvar.wait(lock);
 		}
-		auto rv = m_set.insert(name);
+		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
 		THROW_CHECK0(runtime_error, rv.second);
 	}
 
@@ -85,10 +126,10 @@ namespace crucible {
 	LockSet<T>::try_lock(const key_type &name)
 	{
 		unique_lock<mutex> lock(m_mutex);
-		if (m_set.count(name)) {
+		if (full() || locked(name)) {
 			return false;
 		}
-		auto rv = m_set.insert(name);
+		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
 		THROW_CHECK1(runtime_error, name, rv.second);
 		return true;
 	}
@@ -98,20 +139,11 @@ namespace crucible {
 	LockSet<T>::unlock(const key_type &name)
 	{
 		unique_lock<mutex> lock(m_mutex);
-		m_condvar.notify_all();
 		auto erase_count = m_set.erase(name);
+		m_condvar.notify_all();
 		THROW_CHECK1(invalid_argument, erase_count, erase_count == 1);
 	}
 
-	template <class T>
-	void
-	LockSet<T>::wait_unlock(double interval)
-	{
-		unique_lock<mutex> lock(m_mutex);
-		if (m_set.empty()) return;
-		m_condvar.wait_for(lock, chrono::duration<double>(interval));
-	}
-
 	template <class T>
 	size_t
 	LockSet<T>::size()
@@ -133,7 +165,10 @@ namespace crucible {
 	LockSet<T>::copy()
 	{
 		unique_lock<mutex> lock(m_mutex);
-		return m_set;
+		// Make temporary copy of set while protected by mutex
+		auto rv = m_set;
+		// Return temporary copy after releasing lock
+		return rv;
 	}
 
 	template <class T>
@@ -183,26 +218,10 @@ namespace crucible {
 	}
 
 	template <class T>
-	LockSet<T>::Lock::Lock(Lock &&that) :
-		m_lockset(that.lockset),
-		m_name(that.m_name),
-		m_locked(that.m_locked)
+	typename LockSet<T>::LockHandle
+	LockSet<T>::make_lock(const key_type &name, bool start_locked)
 	{
-		that.m_locked = false;
-	}
-
-	template <class T>
-	typename LockSet<T>::Lock &
-	LockSet<T>::Lock::operator=(Lock &&that)
-	{
-		THROW_CHECK2(invalid_argument, &m_lockset, &that.m_lockset, &m_lockset == &that.m_lockset);
-		if (m_locked && that.m_name != m_name) {
-			unlock();
-		}
-		m_name = that.m_name;
-		m_locked = that.m_locked;
-		that.m_locked = false;
-		return *this;
+		return LockHandle(*this, name, start_locked);
 	}
 
 }

include/crucible/multilock.h

@@ -0,0 +1,40 @@
+#ifndef CRUCIBLE_MULTILOCK_H
+#define CRUCIBLE_MULTILOCK_H
+
+#include <condition_variable>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <string>
+
+namespace crucible {
+        using namespace std;
+
+	class MultiLocker {
+		mutex m_mutex;
+		condition_variable m_cv;
+		map<string, size_t> m_counters;
+
+		class LockHandle {
+			const string m_type;
+			MultiLocker &m_parent;
+			bool m_locked = false;
+			void set_locked(bool state);
+		public:
+			~LockHandle();
+			LockHandle(const string &type, MultiLocker &parent);
+		friend class MultiLocker;
+		};
+
+		friend class LockHandle;
+
+		bool is_lock_available(const string &type);
+		void put_lock(const string &type);
+		shared_ptr<LockHandle> get_lock_private(const string &type);
+	public:
+		static shared_ptr<LockHandle> get_lock(const string &type);
+	};
+
+}
+
+#endif // CRUCIBLE_MULTILOCK_H

include/crucible/namedptr.h

@@ -0,0 +1,225 @@
+#ifndef CRUCIBLE_NAMEDPTR_H
+#define CRUCIBLE_NAMEDPTR_H
+
+#include "crucible/lockset.h"
+
+#include <functional>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <tuple>
+
+namespace crucible {
+	using namespace std;
+
+	/// A thread-safe container for RAII of shared resources with unique names.
+
+	template <class Return, class... Arguments>
+	class NamedPtr {
+	public:
+		/// The name in "NamedPtr"
+		using Key = tuple<Arguments...>;
+		/// A shared pointer to the named object with ownership
+		/// tracking that erases the object's stored name when
+		/// the last shared pointer is destroyed.
+		using Ptr = shared_ptr<Return>;
+		/// A function that translates a name into a shared pointer to an object.
+		using Func = function<Ptr(Arguments...)>;
+	private:
+		struct Value;
+		using WeakPtr = weak_ptr<Value>;
+		using MapType = map<Key, WeakPtr>;
+		struct MapRep {
+			MapType		m_map;
+			mutex		m_mutex;
+		};
+		using MapPtr = shared_ptr<MapRep>;
+		/// Container for Return pointers.  Destructor removes entry from map.
+		struct Value {
+			Ptr	m_ret_ptr;
+			MapPtr	m_map_rep;
+			Key	m_ret_key;
+			~Value();
+			Value(Ptr&& ret_ptr, const Key &key, const MapPtr &map_rep);
+		};
+
+		Func		m_fn;
+		MapPtr		m_map_rep = make_shared<MapRep>();
+		LockSet<Key>	m_lockset;
+
+		Ptr lookup_item(const Key &k);
+		Ptr insert_item(Func fn, Arguments... args);
+
+	public:
+		NamedPtr(Func f = Func());
+
+		void func(Func f);
+
+		Ptr operator()(Arguments... args);
+
+		Ptr insert(const Ptr &r, Arguments... args);
+	};
+
+	/// Construct NamedPtr map and define a function to turn a name into a pointer.
+	template <class Return, class... Arguments>
+	NamedPtr<Return, Arguments...>::NamedPtr(Func f) :
+		m_fn(f)
+	{
+	}
+
+	/// Construct a Value wrapper: the value to store, the argument key to store the value under,
+	/// and a pointer to the map.  Everything needed to remove the key from the map when the
+	/// last NamedPtr is deleted.  NamedPtr then releases its own pointer to the value, which
+	/// may or may not trigger deletion there.
+	template <class Return, class... Arguments>
+	NamedPtr<Return, Arguments...>::Value::Value(Ptr&& ret_ptr, const Key &key, const MapPtr &map_rep) :
+		m_ret_ptr(ret_ptr),
+		m_map_rep(map_rep),
+		m_ret_key(key)
+	{
+	}
+
+	/// Destroy a Value wrapper: remove a dead Key from the map, then let the member destructors
+	/// do the rest.  The Key might be in the map and not dead, so leave it alone in that case.
+	template <class Return, class... Arguments>
+	NamedPtr<Return, Arguments...>::Value::~Value()
+	{
+		unique_lock<mutex> lock(m_map_rep->m_mutex);
+		// We are called from the shared_ptr destructor, so we
+		// know that the weak_ptr in the map has already expired;
+		// however, if another thread already noticed that the
+		// map entry expired while we were waiting for the lock,
+		// the other thread will have already replaced the map
+		// entry with a pointer to some other object, and that
+		// object now owns the map entry.  So we do a key lookup
+		// here instead of storing a map iterator, and only erase
+		// "our" map entry if it exists and is expired.  The other
+		// thread would have done the same for us if the race had
+		// a different winner.
+		const auto found = m_map_rep->m_map.find(m_ret_key);
+		if (found != m_map_rep->m_map.end() && found->second.expired()) {
+			m_map_rep->m_map.erase(found);
+		}
+	}
+
+	/// Find a Return by key and fetch a strong Return pointer.
+	/// Ignore Keys that have expired weak pointers.
+	template <class Return, class... Arguments>
+	typename NamedPtr<Return, Arguments...>::Ptr
+	NamedPtr<Return, Arguments...>::lookup_item(const Key &k)
+	{
+		// Must be called with lock held
+		const auto found = m_map_rep->m_map.find(k);
+		if (found != m_map_rep->m_map.end()) {
+			// Get the strong pointer back
+			const auto rv = found->second.lock();
+			if (rv) {
+				// Have strong pointer.  Return value that shares map entry.
+				return shared_ptr<Return>(rv, rv->m_ret_ptr.get());
+			}
+			// Have expired weak pointer.  Another thread is trying to delete it,
+			// but we got the lock first.  Leave the map entry alone here.
+			// The other thread will erase it, or we will put a different entry
+			// in the same map entry.
+		}
+		return Ptr();
+	}
+
+	/// Insert the Return value of calling Func(Arguments...).
+	/// If the value already exists in the map, return the existing value.
+	/// If another thread is already running Func(Arguments...) then this thread
+	/// will block until the other thread finishes inserting the Return in the
+	/// map, and both threads will return the same Return value.
+	template <class Return, class... Arguments>
+	typename NamedPtr<Return, Arguments...>::Ptr
+	NamedPtr<Return, Arguments...>::insert_item(Func fn, Arguments... args)
+	{
+		Key k(args...);
+
+		// Is it already in the map?
+		unique_lock<mutex> lock_lookup(m_map_rep->m_mutex);
+		auto rv = lookup_item(k);
+		if (rv) {
+			return rv;
+		}
+
+		// Release map lock and acquire key lock
+		lock_lookup.unlock();
+		const auto key_lock = m_lockset.make_lock(k);
+
+		// Did item appear in map while we were waiting for key?
+		lock_lookup.lock();
+		rv = lookup_item(k);
+		if (rv) {
+			return rv;
+		}
+
+		// We now hold key and index locks, but item not in map (or expired).
+		// Release map lock so other threads can use the map
+		lock_lookup.unlock();
+
+		// Call the function and create a new Value outside of the map
+		const auto new_value_ptr = make_shared<Value>(fn(args...), k, m_map_rep);
+
+		// Function must return a non-null pointer
+		THROW_CHECK0(runtime_error, new_value_ptr->m_ret_ptr);
+
+		// Reacquire index lock for map insertion.  We still hold the key lock.
+		// Use a different lock object to make exceptions unlock in the right order
+		unique_lock<mutex> lock_insert(m_map_rep->m_mutex);
+
+		// Insert return value in map or overwrite existing
+		// empty or expired weak_ptr value.
+		WeakPtr &new_item_ref = m_map_rep->m_map[k];
+
+		// We searched the map while holding both locks and
+		// found no entry or an expired weak_ptr; therefore, no
+		// other thread could have inserted a new non-expired
+		// weak_ptr, and the weak_ptr in the map is expired
+		// or was default-constructed as a nullptr.  So if the
+		// new_item_ref is not expired, we have a bug we need
+		// to find and fix.
+		assert(new_item_ref.expired());
+
+		// Update the map slot we are sure is empty
+		new_item_ref = new_value_ptr;
+
+		// Return shared_ptr to Return using strong pointer's reference counter
+		return shared_ptr<Return>(new_value_ptr, new_value_ptr->m_ret_ptr.get());
+
+		// Release map lock, then key lock
+	}
+
+	/// (Re)define a function to turn a name into a pointer.
+	template <class Return, class... Arguments>
+	void
+	NamedPtr<Return, Arguments...>::func(Func func)
+	{
+		unique_lock<mutex> lock(m_map_rep->m_mutex);
+		m_fn = func;
+	}
+
+	/// Convert a name into a pointer using the configured function.
+	template<class Return, class... Arguments>
+	typename NamedPtr<Return, Arguments...>::Ptr
+	NamedPtr<Return, Arguments...>::operator()(Arguments... args)
+	{
+		return insert_item(m_fn, args...);
+	}
+
+	/// Insert a pointer that has already been created under the
+	/// given name.  Useful for inserting a pointer to a derived
+	/// class when the name doesn't contain all of the information
+	/// required for the object, or when the Return is already known by
+	/// some cheaper method than calling the function.
+	template<class Return, class... Arguments>
+	typename NamedPtr<Return, Arguments...>::Ptr
+	NamedPtr<Return, Arguments...>::insert(const Ptr &r, Arguments... args)
+	{
+		THROW_CHECK0(invalid_argument, r);
+		return insert_item([&](Arguments...) { return r; }, args...);
+	}
+
+}
+
+#endif // CRUCIBLE_NAMEDPTR_H

include/crucible/ntoa.h

@@ -7,12 +7,12 @@ namespace crucible {
 	using namespace std;
 
 	struct bits_ntoa_table {
-		unsigned long n;
-		unsigned long mask;
+		unsigned long long n;
+		unsigned long long mask;
 		const char *a;
 	};
 
-	string bits_ntoa(unsigned long n, const bits_ntoa_table *a);
+	string bits_ntoa(unsigned long long n, const bits_ntoa_table *a);
 
 };
 
@@ -20,9 +20,9 @@ namespace crucible {
 #define NTOA_TABLE_ENTRY_BITS(x) { .n = (x), .mask = (x), .a = (#x) }
 
 // Enumerations (entire value matches all bits)
-#define NTOA_TABLE_ENTRY_ENUM(x) { .n = (x), .mask = ~0UL,  .a = (#x) }
+#define NTOA_TABLE_ENTRY_ENUM(x) { .n = (x), .mask = ~0ULL,  .a = (#x) }
 
-// End of table (sorry, gcc doesn't implement this)
+// End of table (sorry, C++ didn't get C99's compound literals, so we have to write out all the member names)
 #define NTOA_TABLE_ENTRY_END() { .n = 0, .mask = 0, .a = nullptr }
 
 #endif // CRUCIBLE_NTOA_H

include/crucible/pool.h

@@ -0,0 +1,185 @@
+#ifndef CRUCIBLE_POOL_H
+#define CRUCIBLE_POOL_H
+
+#include "crucible/error.h"
+
+#include <functional>
+#include <list>
+#include <memory>
+#include <mutex>
+
+namespace crucible {
+	using namespace std;
+
+	/// Storage for reusable anonymous objects that are too expensive to create and/or destroy frequently
+
+	template <class T>
+	class Pool {
+	public:
+		using Ptr = shared_ptr<T>;
+		using Generator = function<Ptr()>;
+		using Checker = function<void(Ptr)>;
+
+		~Pool();
+		Pool(Generator f = Generator(), Checker checkin = Checker(), Checker checkout = Checker());
+
+		/// Function to create new objects when Pool is empty
+		void generator(Generator f);
+
+		/// Optional function called when objects exit the pool (user handle is created and returned to user)
+		void checkout(Checker f);
+
+		/// Optional function called when objects enter the pool (last user handle is destroyed)
+		void checkin(Checker f);
+
+		/// Pool() returns a handle to an object of type shared_ptr<T>
+		Ptr operator()();
+
+		/// Destroy all objects in Pool that are not in use
+		void clear();
+
+	private:
+		struct PoolRep {
+			list<Ptr>	m_list;
+			mutex		m_mutex;
+			Checker		m_checkin;
+			PoolRep(Checker checkin);
+		};
+		struct Handle {
+			weak_ptr<PoolRep> m_list_rep;
+			Ptr	            m_ret_ptr;
+			Handle(shared_ptr<PoolRep> list_rep, Ptr ret_ptr);
+			~Handle();
+		};
+
+		Generator		m_fn;
+		Checker			m_checkout;
+		shared_ptr<PoolRep>	m_list_rep;
+	};
+
+	template <class T>
+	Pool<T>::PoolRep::PoolRep(Checker checkin) :
+		m_checkin(checkin)
+	{
+	}
+
+	template <class T>
+	Pool<T>::Pool(Generator f, Checker checkin, Checker checkout) :
+		m_fn(f),
+		m_checkout(checkout),
+		m_list_rep(make_shared<PoolRep>(checkin))
+	{
+	}
+
+	template <class T>
+	Pool<T>::~Pool()
+	{
+		auto list_rep = m_list_rep;
+		unique_lock<mutex> lock(list_rep->m_mutex);
+		m_list_rep.reset();
+	}
+
+	template <class T>
+	Pool<T>::Handle::Handle(shared_ptr<PoolRep> list_rep, Ptr ret_ptr) :
+		m_list_rep(list_rep),
+		m_ret_ptr(ret_ptr)
+	{
+	}
+
+	template <class T>
+	Pool<T>::Handle::~Handle()
+	{
+		// Checkin prepares the object for storage and reuse.
+		// Neither of those will happen if there is no Pool.
+		// If the Pool was destroyed, just let m_ret_ptr expire.
+		auto list_rep = m_list_rep.lock();
+		if (!list_rep) {
+			return;
+		}
+
+		unique_lock<mutex> lock(list_rep->m_mutex);
+		// If a checkin function is defined, call it
+		auto checkin = list_rep->m_checkin;
+		if (checkin) {
+			lock.unlock();
+			checkin(m_ret_ptr);
+			lock.lock();
+		}
+
+		// Place object back in pool
+		list_rep->m_list.push_front(m_ret_ptr);
+	}
+
+	template <class T>
+	typename Pool<T>::Ptr
+	Pool<T>::operator()()
+	{
+		Ptr rv;
+
+		// Do we have an object in the pool we can return instead?
+		unique_lock<mutex> lock(m_list_rep->m_mutex);
+		if (m_list_rep->m_list.empty()) {
+			// No, release cache lock and call the function
+			lock.unlock();
+
+			// Create new value
+			rv = m_fn();
+		} else {
+			rv = m_list_rep->m_list.front();
+			m_list_rep->m_list.pop_front();
+
+			// Release lock so we don't deadlock with Handle destructor
+			lock.unlock();
+		}
+
+		// rv now points to a T object that is not in the list.
+		THROW_CHECK0(runtime_error, rv);
+
+		// Construct a shared_ptr for Handle which will refcount the Handle objects
+		// and reinsert the T into the Pool when the last Handle is destroyed.
+		auto hv = make_shared<Handle>(m_list_rep, rv);
+
+		// If a checkout function is defined, call it
+		if (m_checkout) {
+			m_checkout(rv);
+		}
+
+		// T an alias shared_ptr for the T using Handle's refcount.
+		return Ptr(hv, rv.get());
+	}
+
+	template <class T>
+	void
+	Pool<T>::generator(Generator func)
+	{
+		unique_lock<mutex> lock(m_list_rep->m_mutex);
+		m_fn = func;
+	}
+
+	template <class T>
+	void
+	Pool<T>::checkin(Checker func)
+	{
+		unique_lock<mutex> lock(m_list_rep->m_mutex);
+		m_list_rep->m_checkin = func;
+	}
+
+	template <class T>
+	void
+	Pool<T>::checkout(Checker func)
+	{
+		unique_lock<mutex> lock(m_list_rep->m_mutex);
+		m_checkout = func;
+	}
+
+	template <class T>
+	void
+	Pool<T>::clear()
+	{
+		unique_lock<mutex> lock(m_list_rep->m_mutex);
+		m_list_rep->m_list.clear();
+	}
+
+}
+
+#endif // POOL_H

include/crucible/process.h

@@ -74,5 +74,10 @@ namespace crucible {
 	typedef ResourceHandle<Process::id, Process> Pid;
 
 	pid_t gettid();
+	double getloadavg1();
+	double getloadavg5();
+	double getloadavg15();
+
+	string signal_ntoa(int sig);
 }
 #endif // CRUCIBLE_PROCESS_H

include/crucible/progress.h

@@ -0,0 +1,122 @@
+#ifndef CRUCIBLE_PROGRESS_H
+#define CRUCIBLE_PROGRESS_H
+
+#include "crucible/error.h"
+
+#include <functional>
+#include <map>
+#include <memory>
+#include <mutex>
+
+namespace crucible {
+	using namespace std;
+
+	template <class T>
+	class ProgressTracker {
+		struct ProgressTrackerState;
+		class ProgressHolderState;
+	public:
+		using value_type = T;
+		using ProgressHolder = shared_ptr<ProgressHolderState>;
+
+		ProgressTracker(const value_type &v);
+		value_type begin() const;
+		value_type end() const;
+
+		ProgressHolder hold(const value_type &v);
+
+	friend class ProgressHolderState;
+
+	private:
+		struct ProgressTrackerState {
+			using key_type = pair<value_type, ProgressHolderState *>;
+			mutex			m_mutex;
+			map<key_type, bool>	m_in_progress;
+			value_type		m_begin;
+			value_type		m_end;
+		};
+
+		class ProgressHolderState {
+			shared_ptr<ProgressTrackerState>	m_state;
+			const value_type			m_value;
+		public:
+			ProgressHolderState(shared_ptr<ProgressTrackerState> state, const value_type &v);
+			~ProgressHolderState();
+			value_type get() const;
+		};
+
+
+		shared_ptr<ProgressTrackerState>	m_state;
+	};
+
+	template <class T>
+	typename ProgressTracker<T>::value_type
+	ProgressTracker<T>::begin() const
+	{
+		unique_lock<mutex> lock(m_state->m_mutex);
+		return m_state->m_begin;
+	}
+
+	template <class T>
+	typename ProgressTracker<T>::value_type
+	ProgressTracker<T>::end() const
+	{
+		unique_lock<mutex> lock(m_state->m_mutex);
+		return m_state->m_end;
+	}
+
+	template <class T>
+	typename ProgressTracker<T>::value_type
+	ProgressTracker<T>::ProgressHolderState::get() const
+	{
+		return m_value;
+	}
+
+	template <class T>
+	ProgressTracker<T>::ProgressTracker(const ProgressTracker::value_type &t) :
+		m_state(make_shared<ProgressTrackerState>())
+	{
+		m_state->m_begin = t;
+		m_state->m_end = t;
+	}
+
+	template <class T>
+	ProgressTracker<T>::ProgressHolderState::ProgressHolderState(shared_ptr<ProgressTrackerState> state, const value_type &v) :
+		m_state(state),
+		m_value(v)
+	{
+		unique_lock<mutex> lock(m_state->m_mutex);
+		m_state->m_in_progress[make_pair(m_value, this)] = true;
+		if (m_state->m_end < m_value) {
+			m_state->m_end = m_value;
+		}
+	}
+
+	template <class T>
+	ProgressTracker<T>::ProgressHolderState::~ProgressHolderState()
+	{
+		unique_lock<mutex> lock(m_state->m_mutex);
+		m_state->m_in_progress[make_pair(m_value, this)] = false;
+		auto p = m_state->m_in_progress.begin();
+		while (p != m_state->m_in_progress.end()) {
+			if (p->second) {
+				break;
+			}
+			if (m_state->m_begin < p->first.first) {
+				m_state->m_begin = p->first.first;
+			}
+			m_state->m_in_progress.erase(p);
+			p = m_state->m_in_progress.begin();
+		}
+	}
+
+	template <class T>
+	shared_ptr<typename ProgressTracker<T>::ProgressHolderState>
+	ProgressTracker<T>::hold(const value_type &v)
+	{
+		return make_shared<ProgressHolderState>(m_state, v);
+	}
+
+}
+
+#endif // CRUCIBLE_PROGRESS_H

include/crucible/resource.h

@@ -8,6 +8,7 @@
 #include <memory>
 #include <mutex>
 #include <iostream>
+#include <stdexcept>
 
 namespace crucible {
 	using namespace std;
@@ -44,36 +45,29 @@ namespace crucible {
 
 	private:
 		using traits_type = ResourceTraits<Key, Resource>;
-
-		class ResourceHolder {
-			resource_ptr_type m_ptr;
-		public:
-			~ResourceHolder();
-			ResourceHolder(resource_ptr_type that);
-			ResourceHolder(const ResourceHolder &that) = default;
-			ResourceHolder(ResourceHolder &&that) = default;
-			ResourceHolder& operator=(ResourceHolder &&that) = default;
-			ResourceHolder& operator=(const ResourceHolder &that) = default;
-			resource_ptr_type get_resource_ptr() const;
-		};
-
-		using holder_ptr_type = shared_ptr<ResourceHolder>;
-		using weak_holder_ptr_type = weak_ptr<ResourceHolder>;
-		using map_type = map<key_type, weak_holder_ptr_type>;
+		using weak_ptr_type = weak_ptr<Resource>;
+		using map_type = map<key_type, weak_ptr_type>;
 
 		// The only instance variable
-		holder_ptr_type m_ptr;
+		resource_ptr_type m_ptr;
 
 		// A bunch of static variables and functions
-		static mutex &s_mutex();
-		static shared_ptr<map_type> s_map();
-		static holder_ptr_type insert(const key_type &key);
-		static holder_ptr_type insert(const resource_ptr_type &res);
-		static void erase(const key_type &key);
+		static mutex s_map_mutex;
+		static map_type s_map;
+		static resource_ptr_type insert(const key_type &key);
+		static resource_ptr_type insert(const resource_ptr_type &res);
+		static void clean_locked();
 		static ResourceTraits<Key, Resource> s_traits;
 
 	public:
 
+		// Exceptions
+		struct duplicate_resource : public invalid_argument {
+			key_type m_key;
+			key_type get_key() const;
+			duplicate_resource(const key_type &key);
+		};
+
 		// test for resource.  A separate operator because key_type could be confused with bool.
 		bool operator!() const;
 
@@ -89,8 +83,15 @@ namespace crucible {
 		ResourceHandle(const resource_ptr_type &res);
 		ResourceHandle& operator=(const resource_ptr_type &res);
 
-		// default constructor is public
+		// default construct/assign/move is public and mostly harmless
 		ResourceHandle() = default;
+		ResourceHandle(const ResourceHandle &that) = default;
+		ResourceHandle(ResourceHandle &&that) = default;
+		ResourceHandle& operator=(const ResourceHandle &that) = default;
+		ResourceHandle& operator=(ResourceHandle &&that) = default;
+
+		// Nontrivial destructor
+		~ResourceHandle();
 
 		// forward anything else to the Resource constructor
 		// if we can do so unambiguously
@@ -109,7 +110,7 @@ namespace crucible {
 
 		// get pointer to Resource object (nothrow, result may be null)
 		resource_ptr_type get_resource_ptr() const;
-		// this version throws and is probably not thread safe
+		// this version throws
 		resource_ptr_type operator->() const;
 
 		// dynamic casting of the resource (throws if cast fails)
@@ -145,139 +146,94 @@ namespace crucible {
 	}
 
 	template <class Key, class Resource>
-	ResourceHandle<Key, Resource>::ResourceHolder::ResourceHolder(resource_ptr_type that) :
-		m_ptr(that)
+	ResourceHandle<Key, Resource>::duplicate_resource::duplicate_resource(const key_type &key) :
+		invalid_argument("duplicate resource"),
+		m_key(key)
 	{
-		// Cannot insert ourselves here since our shared_ptr does not exist yet.
 	}
 
 	template <class Key, class Resource>
-	mutex &
-	ResourceHandle<Key, Resource>::s_mutex()
+	auto
+	ResourceHandle<Key, Resource>::duplicate_resource::get_key() const -> key_type
 	{
-		static mutex gcc_won_t_instantiate_this_either;
-		return gcc_won_t_instantiate_this_either;
-	}
-
-	template <class Key, class Resource>
-	shared_ptr<typename ResourceHandle<Key, Resource>::map_type>
-	ResourceHandle<Key, Resource>::s_map()
-	{
-		static shared_ptr<map_type> gcc_won_t_instantiate_the_damn_static_vars;
-		if (!gcc_won_t_instantiate_the_damn_static_vars) {
-			gcc_won_t_instantiate_the_damn_static_vars = make_shared<map_type>();
-		}
-		return gcc_won_t_instantiate_the_damn_static_vars;
+		return m_key;
 	}
 
 	template <class Key, class Resource>
 	void
-	ResourceHandle<Key, Resource>::erase(const key_type &key)
+	ResourceHandle<Key, Resource>::clean_locked()
 	{
-		unique_lock<mutex> lock(s_mutex());
-		// Resources are allowed to set their Keys to null.
-		if (s_traits.is_null_key(key)) {
-			// Clean out any dead weak_ptr objects.
-			for (auto i = s_map()->begin(); i != s_map()->end(); ) {
-				if (! (*i).second.lock()) {
-					i = s_map()->erase(i);
-				} else {
-					++i;
-				}
+		// Must be called with lock held
+		for (auto i = s_map.begin(); i != s_map.end(); ) {
+			auto this_i = i;
+			++i;
+			if (this_i->second.expired()) {
+				s_map.erase(this_i);
 			}
-			return;
-		}
-		auto erased = s_map()->erase(key);
-		if (erased != 1) {
-			cerr << __PRETTY_FUNCTION__ << ": WARNING: s_map()->erase(" << key << ") returned " << erased << " != 1" << endl;
 		}
 	}
 
 	template <class Key, class Resource>
-	ResourceHandle<Key, Resource>::ResourceHolder::~ResourceHolder()
-	{
-		if (!m_ptr) {
-			// Probably something harmless like a failed constructor.
-			cerr << __PRETTY_FUNCTION__ << ": WARNING: destroying null m_ptr" << endl;
-			return;
-		}
-		Key key = s_traits.get_key(*m_ptr);
-		ResourceHandle::erase(key);
-	}
-
-	template <class Key, class Resource>
-	typename ResourceHandle<Key, Resource>::holder_ptr_type
+	typename ResourceHandle<Key, Resource>::resource_ptr_type
 	ResourceHandle<Key, Resource>::insert(const key_type &key)
 	{
 		// no Resources for null keys
 		if (s_traits.is_null_key(key)) {
-			return holder_ptr_type();
+			return resource_ptr_type();
 		}
-		unique_lock<mutex> lock(s_mutex());
-		// find ResourceHolder for non-null key
-		auto found = s_map()->find(key);
-		if (found != s_map()->end()) {
-			holder_ptr_type rv = (*found).second.lock();
-			// a weak_ptr may have expired
+		unique_lock<mutex> lock(s_map_mutex);
+		auto found = s_map.find(key);
+		if (found != s_map.end()) {
+			resource_ptr_type rv = found->second.lock();
 			if (rv) {
+				// Use existing Resource
 				return rv;
+			} else {
+				// It's OK for the map to temporarily contain an expired weak_ptr to some dead Resource
+				clean_locked();
 			}
 		}
 		// not found or expired, throw any existing ref away and make a new one
 		resource_ptr_type rpt = s_traits.make_resource(key);
-		holder_ptr_type hpt = make_shared<ResourceHolder>(rpt);
 		// store weak_ptr in map
-		(*s_map())[key] = hpt;
+		s_map[key] = rpt;
 		// return shared_ptr
-		return hpt;
+		return rpt;
 	};
 
 	template <class Key, class Resource>
-	typename ResourceHandle<Key, Resource>::holder_ptr_type
+	typename ResourceHandle<Key, Resource>::resource_ptr_type
 	ResourceHandle<Key, Resource>::insert(const resource_ptr_type &res)
 	{
-		// no Resource, no ResourceHolder.
+		// no Resources for null keys
 		if (!res) {
-			return holder_ptr_type();
+			return resource_ptr_type();
 		}
-		// no ResourceHolders for null keys either.
 		key_type key = s_traits.get_key(*res);
 		if (s_traits.is_null_key(key)) {
-			return holder_ptr_type();
+			return resource_ptr_type();
 		}
-		unique_lock<mutex> lock(s_mutex());
-		// find ResourceHolder for non-null key
-		auto found = s_map()->find(key);
-		if (found != s_map()->end()) {
-			holder_ptr_type rv = (*found).second.lock();
-			// The map doesn't own the ResourceHolders, the ResourceHandles do.
-			// It's OK for the map to contain an expired weak_ptr to some dead ResourceHolder...
+		unique_lock<mutex> lock(s_map_mutex);
+		// find Resource for non-null key
+		auto found = s_map.find(key);
+		if (found != s_map.end()) {
+			resource_ptr_type rv = found->second.lock();
+			// It's OK for the map to temporarily contain an expired weak_ptr to some dead Resource...
 			if (rv) {
-				// found ResourceHolder, look at pointer
-				resource_ptr_type rp = rv->get_resource_ptr();
-				// We do not store references to null Resources.
-				assert(rp);
-				// Key retrieved for an existing object must match key searched or be null.
-				key_type found_key = s_traits.get_key(*rp);
-				bool found_key_is_null = s_traits.is_null_key(found_key);
-				assert(found_key_is_null || found_key == key);
-				if (!found_key_is_null) {
-					// We do not store references to duplicate resources.
-					if (rp.owner_before(res) || res.owner_before(rp)) {
-						cerr << "inserting new Resource with existing Key " << key << " not allowed at " << __PRETTY_FUNCTION__ << endl;;
-						abort();
-						// THROW_ERROR(out_of_range, "inserting new Resource with existing Key " << key << " not allowed at " << __PRETTY_FUNCTION__);
-					}
-					// rv is good, return it
-					return rv;
+				// ...but not a duplicate Resource.
+				if (rv.owner_before(res) || res.owner_before(rv)) {
+					throw duplicate_resource(key);
 				}
+				// Use the existing Resource (discard the caller's).
+				return rv;
+			} else {
+				// Clean out expired weak_ptrs
+				clean_locked();
 			}
 		}
-		// not found or expired, make a new one
-		holder_ptr_type rv = make_shared<ResourceHolder>(res);
-		s_map()->insert(make_pair(key, weak_holder_ptr_type(rv)));
-		// no need to check s_map result, we are either replacing a dead weak_ptr or adding a new one
-		return rv;
+		// not found or expired, make a new one or replace old one
+		s_map[key] = res;
+		return res;
 	};
 
 	template <class Key, class Resource>
@@ -309,31 +265,47 @@ namespace crucible {
 	}
 
 	template <class Key, class Resource>
-	typename ResourceHandle<Key, Resource>::resource_ptr_type
-	ResourceHandle<Key, Resource>::ResourceHolder::get_resource_ptr() const
+	ResourceHandle<Key, Resource>::~ResourceHandle()
 	{
-		return m_ptr;
+		// No pointer, nothing to do
+		if (!m_ptr) {
+			return;
+		}
+		// Save key so we can clean the map
+		auto key = s_traits.get_key(*m_ptr);
+		// Save a weak_ptr so we can tell if we need to clean the map
+		weak_ptr_type wp = m_ptr;
+		// Drop shared_ptr
+		m_ptr.reset();
+		// If there are still other references to the shared_ptr, we can stop now
+		if (!wp.expired()) {
+			return;
+		}
+		// Remove weak_ptr from map if it has expired
+		// (and not been replaced in the meantime)
+		unique_lock<mutex> lock_map(s_map_mutex);
+		auto found = s_map.find(key);
+		// Map entry may have been replaced, so check for expiry again
+		if (found != s_map.end() && found->second.expired()) {
+			s_map.erase(key);
+		}
 	}
 
 	template <class Key, class Resource>
 	typename ResourceHandle<Key, Resource>::resource_ptr_type
 	ResourceHandle<Key, Resource>::get_resource_ptr() const
 	{
-		if (!m_ptr) {
-			return resource_ptr_type();
-		}
-		return m_ptr->get_resource_ptr();
+		return m_ptr;
 	}
 
 	template <class Key, class Resource>
 	typename ResourceHandle<Key, Resource>::resource_ptr_type
 	ResourceHandle<Key, Resource>::operator->() const
 	{
-		resource_ptr_type rp = get_resource_ptr();
-		if (!rp) {
+		if (!m_ptr) {
 			THROW_ERROR(out_of_range, __PRETTY_FUNCTION__ << " called on null Resource");
 		}
-		return rp;
+		return m_ptr;
 	}
 
 	template <class Key, class Resource>
@@ -342,11 +314,10 @@ namespace crucible {
 	ResourceHandle<Key, Resource>::cast() const
 	{
 		shared_ptr<T> dp;
-		resource_ptr_type rp = get_resource_ptr();
-		if (!rp) {
+		if (!m_ptr) {
 			return dp;
 		}
-		dp = dynamic_pointer_cast<T>(rp);
+		dp = dynamic_pointer_cast<T>(m_ptr);
 		if (!dp) {
 			throw bad_cast();
 		}
@@ -357,11 +328,10 @@ namespace crucible {
 	typename ResourceHandle<Key, Resource>::key_type
 	ResourceHandle<Key, Resource>::get_key() const
 	{
-		resource_ptr_type rp = get_resource_ptr();
-		if (!rp) {
+		if (!m_ptr) {
 			return s_traits.get_null_key();
 		} else {
-			return s_traits.get_key(*rp);
+			return s_traits.get_key(*m_ptr);
 		}
 	}
 
@@ -378,9 +348,15 @@ namespace crucible {
 		return s_traits.is_null_key(operator key_type());
 	}
 
+	// Apparently GCC wants these to be used before they are defined.
 	template <class Key, class Resource>
 	ResourceTraits<Key, Resource> ResourceHandle<Key, Resource>::s_traits;
 
+	template <class Key, class Resource>
+	mutex ResourceHandle<Key, Resource>::s_map_mutex;
+
+	template <class Key, class Resource>
+	typename ResourceHandle<Key, Resource>::map_type ResourceHandle<Key, Resource>::s_map;
 
 }
 

include/crucible/seeker.h

@@ -0,0 +1,163 @@
+#ifndef _CRUCIBLE_SEEKER_H_
+#define _CRUCIBLE_SEEKER_H_
+
+#include "crucible/error.h"
+
+#include <algorithm>
+#include <limits>
+
+#include <cstdint>
+
+#if 1
+#include <iostream>
+#include <sstream>
+#define DINIT(__x) __x
+#define DLOG(__x) do { logs << __x << std::endl; } while (false)
+#define DOUT(__err) do { __err << logs.str(); } while (false)
+#else
+#define DINIT(__x) do {} while (false)
+#define DLOG(__x) do {} while (false)
+#define DOUT(__x) do {} while (false)
+#endif
+
+namespace crucible {
+	using namespace std;
+
+	// Requirements for Container<Pos> Fetch(Pos lower, Pos upper):
+	// - fetches objects in Pos order, starting from lower (must be >= lower)
+	// - must return upper if present, may or may not return objects after that
+	// - returns a container of Pos objects with begin(), end(), rbegin(), rend()
+	// - container must iterate over objects in Pos order
+	// - uniqueness of Pos objects not required
+	// - should store the underlying data as a side effect
+	//
+	// Requirements for Pos:
+	// - should behave like an unsigned integer type
+	// - must have specializations in numeric_limits<T> for digits, max(), min()
+	// - must support +, -, -=, and related operators
+	// - must support <, <=, ==, and related operators
+	// - must support Pos / 2 (only)
+	//
+	// Requirements for seek_backward:
+	// - calls Fetch to search Pos space near target_pos
+	// - if no key exists with value <= target_pos, returns the minimum Pos value
+	// - returns the highest key value <= target_pos
+	// - returned key value may not be part of most recent Fetch result
+	// - 1 loop iteration when target_pos exists
+
+	template <class Fetch, class Pos = uint64_t>
+	Pos
+	seek_backward(Pos const target_pos, Fetch fetch, Pos min_step = 1, size_t max_loops = numeric_limits<size_t>::max())
+	{
+		DINIT(ostringstream logs);
+		try {
+			static const Pos end_pos = numeric_limits<Pos>::max();
+			// TBH this probably won't work if begin_pos != 0, i.e. any signed type
+			static const Pos begin_pos = numeric_limits<Pos>::min();
+			// Run a binary search looking for the highest key below target_pos.
+			// Initial upper bound of the search is target_pos.
+			// Find initial lower bound by doubling the size of the range until a key below target_pos
+			// is found, or the lower bound reaches the beginning of the search space.
+			// If the lower bound search reaches the beginning of the search space without finding a key,
+			// return the beginning of the search space; otherwise, perform a binary search between
+			// the bounds now established.
+			Pos lower_bound = 0;
+			Pos upper_bound = target_pos;
+			bool found_low = false;
+			Pos probe_pos = target_pos;
+			// We need one loop for each bit of the search space to find the lower bound,
+			// one loop for each bit of the search space to find the upper bound,
+			// and one extra loop to confirm the boundary is correct.
+			for (size_t loop_count = min(numeric_limits<Pos>::digits * size_t(2) + 1, max_loops); loop_count; --loop_count) {
+				DLOG("fetch(probe_pos = " << probe_pos << ", target_pos = " << target_pos << ")");
+				auto result = fetch(probe_pos, target_pos);
+				const Pos low_pos = result.empty() ? end_pos : *result.begin();
+				const Pos high_pos = result.empty() ? end_pos : *result.rbegin();
+				DLOG(" = " << low_pos << ".." << high_pos);
+				// check for correct behavior of the fetch function
+				THROW_CHECK2(out_of_range, high_pos, probe_pos, probe_pos <= high_pos);
+				THROW_CHECK2(out_of_range, low_pos, probe_pos, probe_pos <= low_pos);
+				THROW_CHECK2(out_of_range, low_pos, high_pos, low_pos <= high_pos);
+				if (!found_low) {
+					// if target_pos == end_pos then we will find it in every empty result set,
+					// so in that case we force the lower bound to be lower than end_pos
+					if ((target_pos == end_pos) ? (low_pos < target_pos) : (low_pos <= target_pos)) {
+						// found a lower bound, set the low bound there and switch to binary search
+						found_low = true;
+						lower_bound = low_pos;
+						DLOG("found_low = true, lower_bound = " << lower_bound);
+					} else {
+						// still looking for lower bound
+						// if probe_pos was begin_pos then we can stop with no result
+						if (probe_pos == begin_pos) {
+							DLOG("return: probe_pos == begin_pos " << begin_pos);
+							return begin_pos;
+						}
+						// double the range size, or use the distance between objects found so far
+						THROW_CHECK2(out_of_range, upper_bound, probe_pos, probe_pos <= upper_bound);
+						// already checked low_pos <= high_pos above
+						const Pos want_delta = max(upper_bound - probe_pos, min_step);
+						// avoid underflowing the beginning of the search space
+						const Pos have_delta = min(want_delta, probe_pos - begin_pos);
+						THROW_CHECK2(out_of_range, want_delta, have_delta, have_delta <= want_delta);
+						// move probe and try again
+						probe_pos = probe_pos - have_delta;
+						DLOG("probe_pos " << probe_pos << " = probe_pos - have_delta " << have_delta << " (want_delta " << want_delta << ")");
+						continue;
+					}
+				}
+				if (low_pos <= target_pos && target_pos <= high_pos) {
+					// have keys on either side of target_pos in result
+					// search from the high end until we find the highest key below target
+					for (auto i = result.rbegin(); i != result.rend(); ++i) {
+						// more correctness checking for fetch
+						THROW_CHECK2(out_of_range, *i, probe_pos, probe_pos <= *i);
+						if (*i <= target_pos) {
+							DLOG("return: *i " << *i << " <= target_pos " << target_pos);
+							return *i;
+						}
+					}
+					// if the list is empty then low_pos = high_pos = end_pos
+					// if target_pos = end_pos also, then we will execute the loop
+					// above but not find any matching entries.
+					THROW_CHECK0(runtime_error, result.empty());
+				}
+				if (target_pos <= low_pos) {
+					// results are all too high, so probe_pos..low_pos is too high
+					// lower the high bound to the probe pos
+					upper_bound = probe_pos;
+					DLOG("upper_bound = probe_pos " << probe_pos);
+				}
+				if (high_pos < target_pos) {
+					// results are all too low, so probe_pos..high_pos is too low
+					// raise the low bound to the high_pos
+					DLOG("lower_bound = high_pos " << high_pos);
+					lower_bound = high_pos;
+				}
+				// compute a new probe pos at the middle of the range and try again
+				// we can't have a zero-size range here because we would not have set found_low yet
+				THROW_CHECK2(out_of_range, lower_bound, upper_bound, lower_bound <= upper_bound);
+				const Pos delta = (upper_bound - lower_bound) / 2;
+				probe_pos = lower_bound + delta;
+				if (delta < 1) {
+					// nothing can exist in the range (lower_bound, upper_bound)
+					// and an object is known to exist at lower_bound
+					DLOG("return: probe_pos == lower_bound " << lower_bound);
+					return lower_bound;
+				}
+				THROW_CHECK2(out_of_range, lower_bound, probe_pos, lower_bound <= probe_pos);
+				THROW_CHECK2(out_of_range, upper_bound, probe_pos, probe_pos <= upper_bound);
+				DLOG("loop: lower_bound " << lower_bound << ", probe_pos " << probe_pos << ", upper_bound " << upper_bound);
+			}
+			THROW_ERROR(runtime_error, "FIXME: should not reach this line: "
+				"lower_bound..upper_bound " << lower_bound << ".." << upper_bound << ", "
+				"found_low " << found_low);
+		} catch (...) {
+			DOUT(cerr);
+			throw;
+		}
+	}
+}
+
+#endif // _CRUCIBLE_SEEKER_H_
+

include/crucible/string.h

@@ -11,23 +11,6 @@
 namespace crucible {
 	using namespace std;
 
-	// Zero-initialize a base class object (usually a C struct)
-	template <class Base>
-	void
-	memset_zero(Base *that)
-	{
-		memset(that, 0, sizeof(Base));
-	}
-
-	// Copy a base class object (usually a C struct) into a vector<char>
-	template <class Base>
-	vector<char>
-	vector_copy_struct(Base *that)
-	{
-		const char *begin_that = reinterpret_cast<const char *>(static_cast<const Base *>(that));
-		return vector<char>(begin_that, begin_that + sizeof(Base));
-	}
-
 	// int->hex conversion with sprintf
 	string to_hex(uint64_t i);
 
@@ -60,7 +43,7 @@ namespace crucible {
 	ptrdiff_t
 	pointer_distance(const P1 *a, const P2 *b)
 	{
-		return reinterpret_cast<const char *>(a) - reinterpret_cast<const char *>(b);
+		return reinterpret_cast<const uint8_t *>(a) - reinterpret_cast<const uint8_t *>(b);
 	}
 };
 

include/crucible/task.h

@@ -0,0 +1,184 @@
+#ifndef CRUCIBLE_TASK_H
+#define CRUCIBLE_TASK_H
+
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <ostream>
+#include <string>
+
+namespace crucible {
+	using namespace std;
+
+	class TaskState;
+
+	using TaskId = uint64_t;
+
+	/// A unit of work to be scheduled by TaskMaster.
+	class Task {
+		shared_ptr<TaskState> m_task_state;
+
+		Task(shared_ptr<TaskState> pts);
+
+	public:
+
+		/// Create empty Task object.
+		Task() = default;
+
+		/// Create Task object containing closure and description.
+		Task(string title, function<void()> exec_fn);
+
+		/// Schedule Task for at most one future execution.
+		/// May run Task in current thread or in other thread.
+		/// May run Task before or after returning.
+		/// Schedules Task at the end of the global execution queue.
+		///
+		/// Only one instance of a Task may execute at a time.
+		/// If a Task is already scheduled, run() does nothing.
+		/// If a Task is already running when a new instance reaches
+		/// the front of the queue, the new instance will execute
+		/// after the current instance exits.
+		void run() const;
+
+		/// Schedule Task to run after this Task has run or
+		/// been destroyed.
+		void append(const Task &task) const;
+
+		/// Describe Task as text.
+		string title() const;
+
+		/// Returns currently executing task if called from exec_fn.
+		/// Usually used to reschedule the currently executing Task.
+		static Task current_task();
+
+		/// Returns number of currently existing Task objects.
+		/// Good for spotting leaks.
+		static size_t instance_count();
+
+		/// Ordering operator for containers
+		bool operator<(const Task &that) const;
+
+		/// Null test
+		operator bool() const;
+
+		/// Unique non-repeating(ish) ID for task
+		TaskId id() const;
+	};
+
+	ostream &operator<<(ostream &os, const Task &task);
+
+	class TaskMaster {
+	public:
+		/// Blocks until the running thread count reaches this number
+		static void set_thread_count(size_t threads);
+
+		/// Sets minimum thread count when load average tracking enabled
+		static void set_thread_min_count(size_t min_threads);
+
+		/// Calls set_thread_count with default
+		static void set_thread_count();
+
+		/// Creates thread to track load average and adjust thread count dynamically
+		static void set_loadavg_target(double target);
+
+		/// Writes the current non-executing Task queue
+		static ostream & print_queue(ostream &);
+
+		/// Writes the current executing Task for each worker
+		static ostream & print_workers(ostream &);
+
+		/// Gets the current number of queued Tasks
+		static size_t get_queue_count();
+
+		/// Gets the current number of active workers
+		static size_t get_thread_count();
+
+		/// Gets the current load tracking statistics
+		struct LoadStats {
+			/// Current load extracted from last two 5-second load average samples
+			double current_load;
+			/// Target thread count computed from previous thread count and current load
+			double thread_target;
+			/// Load average for last 60 seconds
+			double loadavg;
+		};
+		static LoadStats get_current_load();
+
+		/// Drop the current queue and discard new Tasks without
+		/// running them.  Currently executing tasks are not
+		/// affected (use set_thread_count(0) to wait for those
+		/// to complete).
+		static void cancel();
+
+		/// Stop running any new Tasks.  All existing
+		/// Consumer threads will exit.  Does not affect queue.
+		/// Does not wait for threads to exit.  Reversible.
+		static void pause(bool paused = true);
+	};
+
+	class BarrierState;
+
+	/// Barrier delays the execution of one or more Tasks.
+	/// The Tasks are executed when the last shared reference to the
+	/// BarrierState is released.  Copies of Barrier objects refer
+	/// to the same Barrier state.
+	class Barrier {
+		shared_ptr<BarrierState> m_barrier_state;
+
+	public:
+		Barrier();
+
+		/// Schedule a task for execution when last Barrier is released.
+		void insert_task(Task t);
+
+		/// Release this reference to the barrier state.
+		/// Last released reference executes the task.
+		/// Barrier can only be released once, after which the
+		/// object can no longer be used.
+		void release();
+	};
+
+	class ExclusionLock {
+		shared_ptr<Task> m_owner;
+		ExclusionLock(shared_ptr<Task> owner);
+	friend class Exclusion;
+	public:
+		/// Explicit default constructor because we have other kinds
+		ExclusionLock() = default;
+
+		/// Release this Lock immediately and permanently
+		void release();
+
+		/// Test for locked state
+		operator bool() const;
+	};
+
+	class Exclusion {
+		mutex m_mutex;
+		weak_ptr<Task> m_owner;
+
+	public:
+		/// Attempt to obtain a Lock.  If successful, current Task
+		/// owns the Lock until the ExclusionLock is released
+		/// (it is the ExclusionLock that owns the lock, so it can
+		/// be passed to other Tasks or threads, but this is not
+		/// recommended practice).
+		/// If not successful, current Task is appended to the
+		/// task that currently holds the lock.  Current task is
+		/// expected to release any other ExclusionLock
+		/// objects it holds, and exit its Task function.
+		ExclusionLock try_lock(const Task &task);
+
+		/// Execute Task when Exclusion is unlocked (possibly
+		/// immediately).
+		void insert_task(const Task &t);
+	};
+
+	/// Wrapper around pthread_setname_np which handles length limits
+	void pthread_setname(const string &name);
+
+	/// Wrapper around pthread_getname_np for symmetry
+	string pthread_getname();
+}
+
+#endif // CRUCIBLE_TASK_H

include/crucible/time.h

@@ -4,6 +4,8 @@
 #include "crucible/error.h"
 
 #include <chrono>
+#include <condition_variable>
+#include <limits>
 #include <mutex>
 #include <ostream>
 
@@ -17,10 +19,9 @@ namespace crucible {
 	public:
 		Timer();
 		double age() const;
+		chrono::high_resolution_clock::time_point get() const;
 		double report(int precision = 1000) const;
 		void reset();
-		void set(const chrono::high_resolution_clock::time_point &start);
-		void set(double delta);
 		double lap();
 		bool operator<(double d) const;
 		bool operator>(double d) const;
@@ -32,18 +33,73 @@ namespace crucible {
 		Timer	m_timer;
 		double	m_rate;
 		double	m_burst;
-		double  m_tokens;
+		double  m_tokens = 0.0;
 		mutex	m_mutex;
 
 		void update_tokens();
+		RateLimiter() = delete;
 	public:
 		RateLimiter(double rate, double burst);
 		RateLimiter(double rate);
 		void sleep_for(double cost = 1.0);
+		double sleep_time(double cost = 1.0);
 		bool is_ready();
 		void borrow(double cost = 1.0);
 	};
 
+	class RateEstimator {
+		mutable mutex m_mutex;
+		mutable condition_variable m_condvar;
+		Timer m_timer;
+		double m_num = 0.0;
+		double m_den = 0.0;
+		uint64_t m_last_count = numeric_limits<uint64_t>::max();
+		Timer m_last_update;
+		const double m_decay = 0.99;
+		Timer m_last_decay;
+		double m_min_delay;
+		double m_max_delay;
+
+		chrono::duration<double> duration_unlocked(uint64_t relative_count) const;
+		chrono::high_resolution_clock::time_point time_point_unlocked(uint64_t absolute_count) const;
+		double rate_unlocked() const;
+		pair<double, double> ratio_unlocked() const;
+		void update_unlocked(uint64_t new_count);
+	public:
+		RateEstimator(double min_delay = 1, double max_delay = 3600);
+
+		// Block until count reached
+		void wait_for(uint64_t new_count_relative) const;
+		void wait_until(uint64_t new_count_absolute) const;
+
+		// Computed rates and ratios
+		double rate() const;
+		pair<double, double> ratio() const;
+
+		// Inspect raw num/den
+		pair<double, double> raw() const;
+
+		// Write count
+		void update(uint64_t new_count);
+
+		// Ignore counts that go backwards
+		void update_monotonic(uint64_t new_count);
+
+		// Read count
+		uint64_t count() const;
+
+		// Convert counts to chrono types
+		chrono::high_resolution_clock::time_point time_point(uint64_t absolute_count) const;
+		chrono::duration<double> duration(uint64_t relative_count) const;
+
+		// Polling delay until count reached (limited by min/max delay)
+		double seconds_for(uint64_t new_count_relative) const;
+		double seconds_until(uint64_t new_count_absolute) const;
+	};
+
+	ostream &
+	operator<<(ostream &os, const RateEstimator &re);
+
 }
 
 #endif // CRUCIBLE_TIME_H

include/crucible/timequeue.h

@@ -1,188 +0,0 @@
-#ifndef CRUCIBLE_TIMEQUEUE_H
-#define CRUCIBLE_TIMEQUEUE_H
-
-#include <crucible/error.h>
-#include <crucible/time.h>
-
-#include <condition_variable>
-#include <limits>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <set>
-
-namespace crucible {
-	using namespace std;
-
-	template <class Task>
-	class TimeQueue {
-
-	public:
-		using Timestamp = chrono::high_resolution_clock::time_point;
-
-	private:
-		struct Item {
-			Timestamp m_time;
-			unsigned m_id;
-			Task m_task;
-
-			bool operator<(const Item &that) const {
-				if (m_time < that.m_time) return true;
-				if (that.m_time < m_time) return false;
-				return m_id < that.m_id;
-			}
-			static unsigned s_id;
-
-			Item(const Timestamp &time, const Task& task) :
-				m_time(time),
-				m_id(++s_id),
-				m_task(task)
-			{
-			}
-
-		};
-
-		set<Item>		m_set;
-		mutable mutex		m_mutex;
-		condition_variable	m_cond_full, m_cond_empty;
-		size_t			m_max_queue_depth;
-
-	public:
-		~TimeQueue();
-		TimeQueue(size_t max_queue_depth = numeric_limits<size_t>::max());
-
-		void push(const Task &task, double delay = 0);
-		void push_nowait(const Task &task, double delay = 0);
-		Task pop();
-		bool pop_nowait(Task &t);
-		double when() const;
-
-		size_t size() const;
-		bool empty() const;
-
-		list<Task> peek(size_t count) const;
-	};
-
-	template <class Task> unsigned TimeQueue<Task>::Item::s_id = 0;
-
-	template <class Task>
-	TimeQueue<Task>::~TimeQueue()
-	{
-		if (!m_set.empty()) {
-			cerr << "ERROR: " << m_set.size() << " locked items still in TimeQueue at destruction" << endl;
-		}
-	}
-
-	template <class Task>
-	void
-	TimeQueue<Task>::push(const Task &task, double delay)
-	{
-		Timestamp time = chrono::high_resolution_clock::now() + 
-			chrono::duration_cast<chrono::high_resolution_clock::duration>(chrono::duration<double>(delay));
-		unique_lock<mutex> lock(m_mutex);
-		while (m_set.size() > m_max_queue_depth) {
-			m_cond_full.wait(lock);
-		}
-		m_set.insert(Item(time, task));
-		m_cond_empty.notify_all();
-	}
-
-	template <class Task>
-	void
-	TimeQueue<Task>::push_nowait(const Task &task, double delay)
-	{
-		Timestamp time = chrono::high_resolution_clock::now() + 
-			chrono::duration_cast<chrono::high_resolution_clock::duration>(chrono::duration<double>(delay));
-		unique_lock<mutex> lock(m_mutex);
-		m_set.insert(Item(time, task));
-		m_cond_empty.notify_all();
-	}
-
-	template <class Task>
-	Task
-	TimeQueue<Task>::pop()
-	{
-		unique_lock<mutex> lock(m_mutex);
-		while (1) {
-			while (m_set.empty()) {
-				m_cond_empty.wait(lock);
-			}
-			Timestamp now = chrono::high_resolution_clock::now();
-			if (now > m_set.begin()->m_time) {
-				Task rv = m_set.begin()->m_task;
-				m_set.erase(m_set.begin());
-				m_cond_full.notify_all();
-				return rv;
-			}
-			m_cond_empty.wait_until(lock, m_set.begin()->m_time);
-		}
-	}
-
-	template <class Task>
-	bool
-	TimeQueue<Task>::pop_nowait(Task &t)
-	{
-		unique_lock<mutex> lock(m_mutex);
-		if (m_set.empty()) {
-			return false;
-		}
-		Timestamp now = chrono::high_resolution_clock::now();
-		if (now <= m_set.begin()->m_time) {
-			return false;
-		}
-		t = m_set.begin()->m_task;
-		m_set.erase(m_set.begin());
-		m_cond_full.notify_all();
-		return true;
-	}
-
-	template <class Task>
-	double
-	TimeQueue<Task>::when() const
-	{
-		unique_lock<mutex> lock(m_mutex);
-		if (m_set.empty()) {
-			return numeric_limits<double>::infinity();
-		}
-		return chrono::duration<double>(m_set.begin()->m_time - chrono::high_resolution_clock::now()).count();
-	}
-
-	template <class Task>
-	size_t
-	TimeQueue<Task>::size() const
-	{
-		unique_lock<mutex> lock(m_mutex);
-		return m_set.size();
-	}
-
-	template <class Task>
-	bool
-	TimeQueue<Task>::empty() const
-	{
-		unique_lock<mutex> lock(m_mutex);
-		return m_set.empty();
-	}
-
-	template <class Task>
-	list<Task>
-	TimeQueue<Task>::peek(size_t count) const
-	{
-		unique_lock<mutex> lock(m_mutex);
-		list<Task> rv;
-		auto it = m_set.begin();
-		while (count-- && it != m_set.end()) {
-			rv.push_back(it->m_task);
-			++it;
-		}
-		return rv;
-	}
-
-	template <class Task>
-	TimeQueue<Task>::TimeQueue(size_t max_depth) :
-		m_max_queue_depth(max_depth)
-	{
-	}
-
-}
-
-#endif // CRUCIBLE_TIMEQUEUE_H

include/crucible/uname.h

@@ -0,0 +1,14 @@
+#ifndef CRUCIBLE_UNAME_H
+#define CRUCIBLE_UNAME_H
+
+#include <sys/utsname.h>
+
+namespace crucible {
+	using namespace std;
+
+	struct Uname : public utsname {
+		Uname();
+	};
+}
+
+#endif

include/crucible/uuid.h

@@ -1,14 +0,0 @@
-#ifndef CRUCIBLE_UUID_H
-#define CRUCIBLE_UUID_H
-
-#include <string>
-
-#include <uuid/uuid.h>
-
-namespace crucible {
-	using namespace std;
-
-	string uuid_unparse(const unsigned char a[16]);
-}
-
-#endif // CRUCIBLE_UUID_H

include/crucible/version.h

@@ -0,0 +1,8 @@
+#ifndef CRUCIBLE_VERSION_H
+#define CRUCIBLE_VERSION_H
+
+namespace crucible {
+	extern const char *VERSION;
+}
+
+#endif CRUCIBLE_VERSION_H

include/crucible/workqueue.h

@@ -1,189 +0,0 @@
-#ifndef CRUCIBLE_WORKQUEUE_H
-#define CRUCIBLE_WORKQUEUE_H
-
-#include <crucible/error.h>
-
-#include <condition_variable>
-#include <limits>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <set>
-
-namespace crucible {
-	using namespace std;
-
-	template <class Task>
-	class WorkQueue {
-
-	public:
-		using set_type = set<Task>;
-		using key_type = Task;
-
-	private:
-
-		set_type		m_set;
-		mutable mutex			m_mutex;
-		condition_variable	m_cond_full, m_cond_empty;
-		size_t			m_max_queue_depth;
-
-	public:
-		~WorkQueue();
-		template <class... Args> WorkQueue(size_t max_queue_depth, Args... args);
-		template <class... Args> WorkQueue(Args... args);
-
-		void push(const key_type &name);
-		void push_wait(const key_type &name, size_t limit);
-		void push_nowait(const key_type &name);
-
-		key_type pop();
-		bool pop_nowait(key_type &rv);
-		key_type peek();
-
-		size_t size() const;
-		bool empty();
-		set_type copy();
-		list<Task> peek(size_t count) const;
-
-	};
-
-	template <class Task>
-	WorkQueue<Task>::~WorkQueue()
-	{
-		if (!m_set.empty()) {
-			cerr << "ERROR: " << m_set.size() << " locked items still in WorkQueue " << this << " at destruction" << endl;
-		}
-	}
-
-	template <class Task>
-	void
-	WorkQueue<Task>::push(const key_type &name)
-	{
-		unique_lock<mutex> lock(m_mutex);
-		while (!m_set.count(name) && m_set.size() > m_max_queue_depth) {
-			m_cond_full.wait(lock);
-		}
-		m_set.insert(name);
-		m_cond_empty.notify_all();
-	}
-
-	template <class Task>
-	void
-	WorkQueue<Task>::push_wait(const key_type &name, size_t limit)
-	{
-		unique_lock<mutex> lock(m_mutex);
-		while (!m_set.count(name) && m_set.size() >= limit) {
-			m_cond_full.wait(lock);
-		}
-		m_set.insert(name);
-		m_cond_empty.notify_all();
-	}
-
-	template <class Task>
-	void
-	WorkQueue<Task>::push_nowait(const key_type &name)
-	{
-		unique_lock<mutex> lock(m_mutex);
-		m_set.insert(name);
-		m_cond_empty.notify_all();
-	}
-
-	template <class Task>
-	typename WorkQueue<Task>::key_type
-	WorkQueue<Task>::pop()
-	{
-		unique_lock<mutex> lock(m_mutex);
-		while (m_set.empty()) {
-			m_cond_empty.wait(lock);
-		}
-		key_type rv = *m_set.begin();
-		m_set.erase(m_set.begin());
-		m_cond_full.notify_all();
-		return rv;
-	}
-
-	template <class Task>
-	bool
-	WorkQueue<Task>::pop_nowait(key_type &rv)
-	{
-		unique_lock<mutex> lock(m_mutex);
-		if (m_set.empty()) {
-			return false;
-		}
-		rv = *m_set.begin();
-		m_set.erase(m_set.begin());
-		m_cond_full.notify_all();
-		return true;
-	}
-
-	template <class Task>
-	typename WorkQueue<Task>::key_type
-	WorkQueue<Task>::peek()
-	{
-		unique_lock<mutex> lock(m_mutex);
-		if (m_set.empty()) {
-			return key_type();
-		} else {
-			return *m_set.begin();
-		}
-	}
-
-	template <class Task>
-	size_t
-	WorkQueue<Task>::size() const
-	{
-		unique_lock<mutex> lock(m_mutex);
-		return m_set.size();
-	}
-
-	template <class Task>
-	bool
-	WorkQueue<Task>::empty()
-	{
-		unique_lock<mutex> lock(m_mutex);
-		return m_set.empty();
-	}
-
-	template <class Task>
-	typename WorkQueue<Task>::set_type
-	WorkQueue<Task>::copy()
-	{
-		unique_lock<mutex> lock(m_mutex);
-		return m_set;
-	}
-
-	template <class Task>
-	list<Task>
-	WorkQueue<Task>::peek(size_t count) const
-	{
-		unique_lock<mutex> lock(m_mutex);
-		list<Task> rv;
-		for (auto i : m_set) {
-			if (count--) {
-				rv.push_back(i);
-			} else {
-				break;
-			}
-		}
-		return rv;
-	}
-
-	template <class Task>
-	template <class... Args>
-	WorkQueue<Task>::WorkQueue(Args... args) :
-		m_set(args...),
-		m_max_queue_depth(numeric_limits<size_t>::max())
-	{
-	}
-
-	template <class Task>
-	template <class... Args>
-	WorkQueue<Task>::WorkQueue(size_t max_depth, Args... args) :
-		m_set(args...),
-		m_max_queue_depth(max_depth)
-	{
-	}
-
-}
-
-#endif // CRUCIBLE_WORKQUEUE_H

lib/.gitignore

@@ -0,0 +1 @@
+.version.*

lib/Makefile

@@ -1,37 +1,42 @@
-default: libcrucible.so
+default: libcrucible.a
+%.a: Makefile
 
-OBJS = \
-	crc64.o \
+CRUCIBLE_OBJS = \
+	bytevector.o \
+	btrfs-tree.o \
 	chatter.o \
+	city.o \
+	cleanup.o \
+	crc64.o \
 	error.o \
-	execpipe.o \
 	extentwalker.o \
 	fd.o \
 	fs.o \
-	interp.o \
+	multilock.o \
 	ntoa.o \
 	path.o \
 	process.o \
 	string.o \
+	task.o \
 	time.o \
-	uuid.o \
+	uname.o \
 
 include ../makeflags
+-include ../localconf
+include ../Defines.mk
 
-LDFLAGS = -shared -luuid
+BEES_LDFLAGS = $(LDFLAGS)
 
-depends.mk: *.c *.cc
-	for x in *.c; do $(CC) $(CFLAGS) -M "$$x"; done > depends.mk.new
-	for x in *.cc; do $(CXX) $(CXXFLAGS) -M "$$x"; done >> depends.mk.new
-	mv -fv depends.mk.new depends.mk
+configure.h: configure.h.in
+	$(TEMPLATE_COMPILER)
 
--include depends.mk
+%.dep: %.cc configure.h Makefile
+	$(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
 
-%.o: %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
+include $(CRUCIBLE_OBJS:%.o=%.dep)
 
-%.o: %.cc ../include/crucible/%.h
-	$(CXX) $(CXXFLAGS) -o $@ -c $<
+%.o: %.cc ../makeflags
+	$(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
 
-libcrucible.so: $(OBJS) Makefile
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS)
+libcrucible.a: $(CRUCIBLE_OBJS)
+	$(AR) rcs $@ $^

lib/btrfs-tree.cc

@@ -0,0 +1,684 @@
+#include "crucible/btrfs-tree.h"
+#include "crucible/btrfs.h"
+#include "crucible/error.h"
+#include "crucible/fs.h"
+#include "crucible/hexdump.h"
+#include "crucible/seeker.h"
+
+namespace crucible {
+	using namespace std;
+
+	uint64_t
+	BtrfsTreeItem::extent_begin() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_ITEM_KEY);
+		return m_objectid;
+	}
+
+	uint64_t
+	BtrfsTreeItem::extent_end() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_ITEM_KEY);
+		return m_objectid + m_offset;
+	}
+
+	uint64_t
+	BtrfsTreeItem::extent_generation() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_ITEM_KEY);
+		return btrfs_get_member(&btrfs_extent_item::generation, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::root_ref_dirid() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_ROOT_BACKREF_KEY);
+		return btrfs_get_member(&btrfs_root_ref::dirid, m_data);
+	}
+
+	string
+	BtrfsTreeItem::root_ref_name() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_ROOT_BACKREF_KEY);
+		const auto name_len = btrfs_get_member(&btrfs_root_ref::name_len, m_data);
+		const auto name_start = sizeof(struct btrfs_root_ref);
+		const auto name_end = name_len + name_start;
+		THROW_CHECK2(runtime_error, m_data.size(), name_end, m_data.size() >= name_end);
+		return string(m_data.data() + name_start, m_data.data() + name_end);
+	}
+
+	uint64_t
+	BtrfsTreeItem::root_ref_parent_rootid() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_ROOT_BACKREF_KEY);
+		return offset();
+	}
+
+	uint64_t
+	BtrfsTreeItem::root_flags() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_ROOT_ITEM_KEY);
+		return btrfs_get_member(&btrfs_root_item::flags, m_data);
+	}
+
+	ostream &
+	operator<<(ostream &os, const BtrfsTreeItem &bti)
+	{
+		os << "BtrfsTreeItem {"
+			<< " objectid = " << to_hex(bti.objectid())
+			<< ", type = " << btrfs_search_type_ntoa(bti.type())
+			<< ", offset = " << to_hex(bti.offset())
+			<< ", transid = " << bti.transid()
+			<< ", data = ";
+		hexdump(os, bti.data());
+		return os;
+	}
+
+	uint64_t
+	BtrfsTreeItem::block_group_flags() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_BLOCK_GROUP_ITEM_KEY);
+		return btrfs_get_member(&btrfs_block_group_item::flags, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::block_group_used() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_BLOCK_GROUP_ITEM_KEY);
+		return btrfs_get_member(&btrfs_block_group_item::used, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::chunk_length() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_CHUNK_ITEM_KEY);
+		return btrfs_get_member(&btrfs_chunk::length, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::chunk_type() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_CHUNK_ITEM_KEY);
+		return btrfs_get_member(&btrfs_chunk::type, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::dev_extent_chunk_offset() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_DEV_EXTENT_KEY);
+		return btrfs_get_member(&btrfs_dev_extent::chunk_offset, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::dev_extent_length() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_DEV_EXTENT_KEY);
+		return btrfs_get_member(&btrfs_dev_extent::length, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::dev_item_total_bytes() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_DEV_ITEM_KEY);
+		return btrfs_get_member(&btrfs_dev_item::total_bytes, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::dev_item_bytes_used() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_DEV_ITEM_KEY);
+		return btrfs_get_member(&btrfs_dev_item::bytes_used, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::inode_size() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_INODE_ITEM_KEY);
+		return btrfs_get_member(&btrfs_inode_item::size, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::file_extent_logical_bytes() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_DATA_KEY);
+		const auto file_extent_item_type = btrfs_get_member(&btrfs_file_extent_item::type, m_data);
+		switch (file_extent_item_type) {
+			case BTRFS_FILE_EXTENT_INLINE:
+				return btrfs_get_member(&btrfs_file_extent_item::ram_bytes, m_data);
+			case BTRFS_FILE_EXTENT_PREALLOC:
+			case BTRFS_FILE_EXTENT_REG:
+				return btrfs_get_member(&btrfs_file_extent_item::num_bytes, m_data);
+			default:
+				THROW_ERROR(runtime_error, "unknown btrfs_file_extent_item type " << file_extent_item_type);
+		}
+	}
+
+	uint64_t
+	BtrfsTreeItem::file_extent_offset() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_DATA_KEY);
+		const auto file_extent_item_type = btrfs_get_member(&btrfs_file_extent_item::type, m_data);
+		switch (file_extent_item_type) {
+			case BTRFS_FILE_EXTENT_INLINE:
+				THROW_ERROR(invalid_argument, "extent is inline " << *this);
+			case BTRFS_FILE_EXTENT_PREALLOC:
+			case BTRFS_FILE_EXTENT_REG:
+				return btrfs_get_member(&btrfs_file_extent_item::offset, m_data);
+			default:
+				THROW_ERROR(runtime_error, "unknown btrfs_file_extent_item type " << file_extent_item_type << " in " << *this);
+		}
+	}
+
+	uint64_t
+	BtrfsTreeItem::file_extent_generation() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_DATA_KEY);
+		return btrfs_get_member(&btrfs_file_extent_item::generation, m_data);
+	}
+
+	uint64_t
+	BtrfsTreeItem::file_extent_bytenr() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_DATA_KEY);
+		auto file_extent_item_type = btrfs_get_member(&btrfs_file_extent_item::type, m_data);
+		switch (file_extent_item_type) {
+			case BTRFS_FILE_EXTENT_INLINE:
+				THROW_ERROR(invalid_argument, "extent is inline " << *this);
+			case BTRFS_FILE_EXTENT_PREALLOC:
+			case BTRFS_FILE_EXTENT_REG:
+				return btrfs_get_member(&btrfs_file_extent_item::disk_bytenr, m_data);
+			default:
+				THROW_ERROR(runtime_error, "unknown btrfs_file_extent_item type " << file_extent_item_type << " in " << *this);
+		}
+	}
+
+	uint8_t
+	BtrfsTreeItem::file_extent_type() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_DATA_KEY);
+		return btrfs_get_member(&btrfs_file_extent_item::type, m_data);
+	}
+
+	btrfs_compression_type
+	BtrfsTreeItem::file_extent_compression() const
+	{
+		THROW_CHECK1(invalid_argument, btrfs_search_type_ntoa(m_type), m_type == BTRFS_EXTENT_DATA_KEY);
+		return static_cast<btrfs_compression_type>(btrfs_get_member(&btrfs_file_extent_item::compression, m_data));
+	}
+
+	BtrfsTreeItem::BtrfsTreeItem(const BtrfsIoctlSearchHeader &bish) :
+		m_objectid(bish.objectid),
+		m_offset(bish.offset),
+		m_transid(bish.transid),
+		m_data(bish.m_data),
+		m_type(bish.type)
+	{
+	}
+
+	BtrfsTreeItem &
+	BtrfsTreeItem::operator=(const BtrfsIoctlSearchHeader &bish)
+	{
+		m_objectid = bish.objectid;
+		m_offset = bish.offset;
+		m_transid = bish.transid;
+		m_data = bish.m_data;
+		m_type = bish.type;
+		return *this;
+	}
+
+	bool
+	BtrfsTreeItem::operator!() const
+	{
+		return m_transid == 0 && m_objectid == 0 && m_offset == 0 && m_type == 0;
+	}
+
+	uint64_t
+	BtrfsTreeFetcher::block_size() const
+	{
+		return m_block_size;
+	}
+
+	BtrfsTreeFetcher::BtrfsTreeFetcher(Fd new_fd) :
+		m_fd(new_fd)
+	{
+		BtrfsIoctlFsInfoArgs bifia;
+		bifia.do_ioctl(fd());
+		m_block_size = bifia.sectorsize;
+		THROW_CHECK1(runtime_error, m_block_size, m_block_size > 0);
+		// We don't believe sector sizes that aren't multiples of 4K
+		THROW_CHECK1(runtime_error, m_block_size, (m_block_size % 4096) == 0);
+		m_lookbehind_size = 128 * 1024;
+		m_scale_size = m_block_size;
+	}
+
+	Fd
+	BtrfsTreeFetcher::fd() const
+	{
+		return m_fd;
+	}
+
+	void
+	BtrfsTreeFetcher::fd(Fd fd)
+	{
+		m_fd = fd;
+	}
+
+	void
+	BtrfsTreeFetcher::type(uint8_t type)
+	{
+		m_type = type;
+	}
+
+	void
+	BtrfsTreeFetcher::tree(uint64_t tree)
+	{
+		m_tree = tree;
+	}
+
+	void
+	BtrfsTreeFetcher::transid(uint64_t min_transid, uint64_t max_transid)
+	{
+		m_min_transid = min_transid;
+		m_max_transid = max_transid;
+	}
+
+	uint64_t
+	BtrfsTreeFetcher::lookbehind_size() const
+	{
+		return m_lookbehind_size;
+	}
+
+	void
+	BtrfsTreeFetcher::lookbehind_size(uint64_t lookbehind_size)
+	{
+		m_lookbehind_size = lookbehind_size;
+	}
+
+	uint64_t
+	BtrfsTreeFetcher::scale_size() const
+	{
+		return m_scale_size;
+	}
+
+	void
+	BtrfsTreeFetcher::scale_size(uint64_t scale_size)
+	{
+		m_scale_size = scale_size;
+	}
+
+	void
+	BtrfsTreeFetcher::fill_sk(BtrfsIoctlSearchKey &sk, uint64_t object)
+	{
+		(void)object;
+		// btrfs allows tree ID 0 meaning the current tree, but we do not.
+		THROW_CHECK0(invalid_argument, m_tree != 0);
+		sk.tree_id = m_tree;
+		sk.min_type = m_type;
+		sk.max_type = m_type;
+		sk.min_transid = m_min_transid;
+		sk.max_transid = m_max_transid;
+		sk.nr_items = 1;
+	}
+
+	void
+	BtrfsTreeFetcher::next_sk(BtrfsIoctlSearchKey &key, const BtrfsIoctlSearchHeader &hdr)
+	{
+		key.next_min(hdr, m_type);
+	}
+
+	BtrfsTreeItem
+	BtrfsTreeFetcher::at(uint64_t logical)
+	{
+		BtrfsIoctlSearchKey &sk = m_sk;
+		fill_sk(sk, logical);
+		// Exact match, should return 0 or 1 items
+		sk.max_type = sk.min_type;
+		sk.nr_items = 1;
+		sk.do_ioctl(fd());
+		THROW_CHECK1(runtime_error, sk.m_result.size(), sk.m_result.size() < 2);
+		for (const auto &i : sk.m_result) {
+			if (hdr_logical(i) == logical && hdr_match(i)) {
+				return i;
+			}
+		}
+		return BtrfsTreeItem();
+	}
+
+	uint64_t
+	BtrfsTreeFetcher::scale_logical(const uint64_t logical) const
+	{
+		THROW_CHECK1(invalid_argument, logical, (logical % m_scale_size) == 0 || logical == s_max_logical);
+		return logical / m_scale_size;
+	}
+
+	uint64_t
+	BtrfsTreeFetcher::scaled_max_logical() const
+	{
+		return scale_logical(s_max_logical);
+	}
+
+	uint64_t
+	BtrfsTreeFetcher::unscale_logical(const uint64_t logical) const
+	{
+		THROW_CHECK1(invalid_argument, logical, logical <= scaled_max_logical());
+		if (logical == scaled_max_logical()) {
+			return s_max_logical;
+		}
+		return logical * scale_size();
+	}
+
+	BtrfsTreeItem
+	BtrfsTreeFetcher::rlower_bound(uint64_t logical)
+	{
+	#if 0
+	#define BTFRLB_DEBUG(x) do { cerr << x; } while (false)
+	#else
+	#define BTFRLB_DEBUG(x) do { } while (false)
+	#endif
+		BtrfsTreeItem closest_item;
+		uint64_t closest_logical = 0;
+		BtrfsIoctlSearchKey &sk = m_sk;
+		size_t loops = 0;
+		BTFRLB_DEBUG("rlower_bound: " << to_hex(logical) << endl);
+		seek_backward(scale_logical(logical), [&](uint64_t lower_bound, uint64_t upper_bound) {
+			++loops;
+			fill_sk(sk, unscale_logical(min(scaled_max_logical(), lower_bound)));
+			set<uint64_t> rv;
+			do {
+				sk.nr_items = 4;
+				sk.do_ioctl(fd());
+				BTFRLB_DEBUG("fetch: loop " << loops << " lower_bound..upper_bound " << to_hex(lower_bound) << ".." << to_hex(upper_bound));
+				for (auto &i : sk.m_result) {
+					next_sk(sk, i);
+					const auto this_logical = hdr_logical(i);
+					const auto scaled_hdr_logical = scale_logical(this_logical);
+					BTFRLB_DEBUG(" " << to_hex(scaled_hdr_logical));
+					if (hdr_match(i)) {
+						if (this_logical <= logical && this_logical > closest_logical) {
+							closest_logical = this_logical;
+							closest_item = i;
+						}
+						BTFRLB_DEBUG("(match)");
+						rv.insert(scaled_hdr_logical);
+					}
+					if (scaled_hdr_logical > upper_bound || hdr_stop(i)) {
+						if (scaled_hdr_logical >= upper_bound) {
+							BTFRLB_DEBUG("(" << to_hex(scaled_hdr_logical) << " >= " << to_hex(upper_bound) << ")");
+						}
+						if (hdr_stop(i)) {
+							rv.insert(numeric_limits<uint64_t>::max());
+							BTFRLB_DEBUG("(stop)");
+						}
+						break;
+					} else {
+						BTFRLB_DEBUG("(cont'd)");
+					}
+				}
+				BTFRLB_DEBUG(endl);
+				// We might get a search result that contains only non-matching items.
+				// Keep looping until we find any matching item or we run out of tree.
+			} while (rv.empty() && !sk.m_result.empty());
+			return rv;
+		}, scale_logical(lookbehind_size()));
+		return closest_item;
+	#undef BTFRLB_DEBUG
+	}
+
+	BtrfsTreeItem
+	BtrfsTreeFetcher::lower_bound(uint64_t logical)
+	{
+		BtrfsIoctlSearchKey &sk = m_sk;
+		fill_sk(sk, logical);
+		do {
+			assert(sk.max_offset == s_max_logical);
+			sk.do_ioctl(fd());
+			for (const auto &i : sk.m_result) {
+				if (hdr_match(i)) {
+					return i;
+				}
+				if (hdr_stop(i)) {
+					return BtrfsTreeItem();
+				}
+				next_sk(sk, i);
+			}
+		} while (!sk.m_result.empty());
+		return BtrfsTreeItem();
+	}
+
+	BtrfsTreeItem
+	BtrfsTreeFetcher::next(uint64_t logical)
+	{
+		const auto scaled_logical = scale_logical(logical);
+		if (scaled_logical + 1 > scaled_max_logical()) {
+			return BtrfsTreeItem();
+		}
+		return lower_bound(unscale_logical(scaled_logical + 1));
+	}
+
+	BtrfsTreeItem
+	BtrfsTreeFetcher::prev(uint64_t logical)
+	{
+		const auto scaled_logical = scale_logical(logical);
+		if (scaled_logical < 1) {
+			return BtrfsTreeItem();
+		}
+		return rlower_bound(unscale_logical(scaled_logical - 1));
+	}
+
+	void
+	BtrfsTreeObjectFetcher::fill_sk(BtrfsIoctlSearchKey &sk, uint64_t object)
+	{
+		BtrfsTreeFetcher::fill_sk(sk, object);
+		sk.min_offset = 0;
+		sk.max_offset = numeric_limits<decltype(sk.max_offset)>::max();
+		sk.min_objectid = object;
+		sk.max_objectid = numeric_limits<decltype(sk.max_objectid)>::max();
+	}
+
+	uint64_t
+	BtrfsTreeObjectFetcher::hdr_logical(const BtrfsIoctlSearchHeader &hdr)
+	{
+		return hdr.objectid;
+	}
+
+	bool
+	BtrfsTreeObjectFetcher::hdr_match(const BtrfsIoctlSearchHeader &hdr)
+	{
+		// If you're calling this method without overriding it, you should have set type first
+		assert(m_type);
+		return hdr.type == m_type;
+	}
+
+	bool
+	BtrfsTreeObjectFetcher::hdr_stop(const BtrfsIoctlSearchHeader &hdr)
+	{
+		return false;
+		(void)hdr;
+	}
+
+	uint64_t
+	BtrfsTreeOffsetFetcher::hdr_logical(const BtrfsIoctlSearchHeader &hdr)
+	{
+		return hdr.offset;
+	}
+
+	bool
+	BtrfsTreeOffsetFetcher::hdr_match(const BtrfsIoctlSearchHeader &hdr)
+	{
+		assert(m_type);
+		return hdr.type == m_type && hdr.objectid == m_objectid;
+	}
+
+	bool
+	BtrfsTreeOffsetFetcher::hdr_stop(const BtrfsIoctlSearchHeader &hdr)
+	{
+		assert(m_type);
+		return hdr.objectid > m_objectid || hdr.type > m_type;
+	}
+
+	void
+	BtrfsTreeOffsetFetcher::objectid(uint64_t objectid)
+	{
+		m_objectid = objectid;
+	}
+
+	uint64_t
+	BtrfsTreeOffsetFetcher::objectid() const
+	{
+		return m_objectid;
+	}
+
+	void
+	BtrfsTreeOffsetFetcher::fill_sk(BtrfsIoctlSearchKey &sk, uint64_t offset)
+	{
+		BtrfsTreeFetcher::fill_sk(sk, offset);
+		sk.min_offset = offset;
+		sk.max_offset = numeric_limits<decltype(sk.max_offset)>::max();
+		sk.min_objectid = m_objectid;
+		sk.max_objectid = m_objectid;
+	}
+
+	void
+	BtrfsCsumTreeFetcher::get_sums(uint64_t const logical, size_t count, function<void(uint64_t logical, const uint8_t *buf, size_t bytes)> output)
+	{
+	#if 0
+	#define BCTFGS_DEBUG(x) do { cerr << x; } while (false)
+	#else
+	#define BCTFGS_DEBUG(x) do { } while (false)
+	#endif
+		const uint64_t logical_end = logical + count * block_size();
+		BtrfsTreeItem bti = rlower_bound(logical);
+		size_t loops = 0;
+		BCTFGS_DEBUG("get_sums " << to_hex(logical) << ".." << to_hex(logical_end) << endl);
+		while (!!bti) {
+			BCTFGS_DEBUG("get_sums[" << loops << "]: " << bti << endl);
+			++loops;
+			// Reject wrong type or objectid
+			THROW_CHECK1(runtime_error, bti.type(), bti.type() == BTRFS_EXTENT_CSUM_KEY);
+			THROW_CHECK1(runtime_error, bti.objectid(), bti.objectid() == BTRFS_EXTENT_CSUM_OBJECTID);
+			// Is this object in range?
+			const uint64_t data_logical = bti.offset();
+			if (data_logical >= logical_end) {
+				// csum object is past end of range, we are done
+				return;
+			}
+			// Figure out how long this csum item is in various units
+			const size_t csum_byte_count = bti.data().size();
+			THROW_CHECK1(runtime_error, csum_byte_count, (csum_byte_count % m_sum_size) == 0);
+			THROW_CHECK1(runtime_error, csum_byte_count, csum_byte_count > 0);
+			const size_t csum_count = csum_byte_count / m_sum_size;
+			const uint64_t data_byte_count = csum_count * block_size();
+			const uint64_t data_logical_end = data_logical + data_byte_count;
+			if (data_logical_end <= logical) {
+				// too low, look at next item
+				bti = lower_bound(logical);
+				continue;
+			}
+			// There is some overlap?
+			const uint64_t overlap_begin = max(logical, data_logical);
+			const uint64_t overlap_end = min(logical_end, data_logical_end);
+			THROW_CHECK2(runtime_error, overlap_begin, overlap_end, overlap_begin < overlap_end);
+			const uint64_t overlap_offset = overlap_begin - data_logical;
+			THROW_CHECK1(runtime_error, overlap_offset, (overlap_offset % block_size()) == 0);
+			const uint64_t overlap_index = overlap_offset * m_sum_size / block_size();
+			const uint64_t overlap_byte_count = overlap_end - overlap_begin;
+			const uint64_t overlap_csum_byte_count = overlap_byte_count * m_sum_size / block_size();
+			// Can't be bigger than a btrfs item
+			THROW_CHECK1(runtime_error, overlap_index, overlap_index < 65536);
+			THROW_CHECK1(runtime_error, overlap_csum_byte_count, overlap_csum_byte_count < 65536);
+			// Yes, process the overlap
+			output(overlap_begin, bti.data().data() + overlap_index, overlap_csum_byte_count);
+			// Advance
+			bti = lower_bound(overlap_end);
+		}
+	#undef BCTFGS_DEBUG
+	}
+
+	uint32_t
+	BtrfsCsumTreeFetcher::sum_type() const
+	{
+		return m_sum_type;
+	}
+
+	size_t
+	BtrfsCsumTreeFetcher::sum_size() const
+	{
+		return m_sum_size;
+	}
+
+	BtrfsCsumTreeFetcher::BtrfsCsumTreeFetcher(const Fd &new_fd) :
+		BtrfsTreeOffsetFetcher(new_fd)
+	{
+		type(BTRFS_EXTENT_CSUM_KEY);
+		tree(BTRFS_CSUM_TREE_OBJECTID);
+		objectid(BTRFS_EXTENT_CSUM_OBJECTID);
+		BtrfsIoctlFsInfoArgs bifia;
+		bifia.do_ioctl(fd());
+		m_sum_type = static_cast<btrfs_compression_type>(bifia.csum_type());
+		m_sum_size = bifia.csum_size();
+		if (m_sum_type == BTRFS_CSUM_TYPE_CRC32 && m_sum_size == 0) {
+			// Older kernel versions don't fill in this field
+			m_sum_size = 4;
+		}
+		THROW_CHECK1(runtime_error, m_sum_size, m_sum_size > 0);
+	}
+
+	BtrfsExtentItemFetcher::BtrfsExtentItemFetcher(const Fd &new_fd) :
+		BtrfsTreeObjectFetcher(new_fd)
+	{
+		tree(BTRFS_EXTENT_TREE_OBJECTID);
+		type(BTRFS_EXTENT_ITEM_KEY);
+	}
+
+	BtrfsExtentDataFetcher::BtrfsExtentDataFetcher(const Fd &new_fd) :
+		BtrfsTreeOffsetFetcher(new_fd)
+	{
+		type(BTRFS_EXTENT_DATA_KEY);
+	}
+
+	BtrfsFsTreeFetcher::BtrfsFsTreeFetcher(const Fd &new_fd, uint64_t subvol) :
+		BtrfsTreeObjectFetcher(new_fd)
+	{
+		tree(subvol);
+		type(BTRFS_EXTENT_DATA_KEY);
+		scale_size(1);
+	}
+
+	BtrfsInodeFetcher::BtrfsInodeFetcher(const Fd &fd) :
+		BtrfsTreeObjectFetcher(fd)
+	{
+		type(BTRFS_INODE_ITEM_KEY);
+		scale_size(1);
+	}
+
+	BtrfsTreeItem
+	BtrfsInodeFetcher::stat(uint64_t subvol, uint64_t inode)
+	{
+		tree(subvol);
+		const auto item = at(inode);
+		if (!!item) {
+			THROW_CHECK2(runtime_error, item.objectid(), inode, inode == item.objectid());
+			THROW_CHECK2(runtime_error, item.type(), BTRFS_INODE_ITEM_KEY, item.type() == BTRFS_INODE_ITEM_KEY);
+		}
+		return item;
+	}
+
+	BtrfsRootFetcher::BtrfsRootFetcher(const Fd &fd) :
+		BtrfsTreeObjectFetcher(fd)
+	{
+		tree(BTRFS_ROOT_TREE_OBJECTID);
+		type(BTRFS_ROOT_ITEM_KEY);
+		scale_size(1);
+	}
+
+	BtrfsTreeItem
+	BtrfsRootFetcher::root(uint64_t subvol)
+	{
+		const auto item = at(subvol);
+		if (!!item) {
+			THROW_CHECK2(runtime_error, item.objectid(), subvol, subvol == item.objectid());
+			THROW_CHECK2(runtime_error, item.type(), BTRFS_ROOT_ITEM_KEY, item.type() == BTRFS_ROOT_ITEM_KEY);
+		}
+		return item;
+	}
+}

lib/bytevector.cc

@@ -0,0 +1,190 @@
+#include "crucible/bytevector.h"
+
+#include "crucible/error.h"
+#include "crucible/hexdump.h"
+#include "crucible/string.h"
+
+#include <cassert>
+
+namespace crucible {
+	using namespace std;
+
+	ByteVector::iterator
+	ByteVector::begin() const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return m_ptr.get();
+	}
+
+	ByteVector::iterator
+	ByteVector::end() const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return m_ptr.get() + m_size;
+	}
+
+	size_t
+	ByteVector::size() const
+	{
+		return m_size;
+	}
+
+	bool
+	ByteVector::empty() const
+	{
+		return !m_ptr || !m_size;
+	}
+
+	void
+	ByteVector::clear()
+	{
+		unique_lock<mutex> lock(m_mutex);
+		m_ptr.reset();
+		m_size = 0;
+	}
+
+	ByteVector::value_type&
+	ByteVector::operator[](size_t size) const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return m_ptr.get()[size];
+	}
+
+	ByteVector::ByteVector(const ByteVector &that)
+	{
+		unique_lock<mutex> lock(that.m_mutex);
+		m_ptr = that.m_ptr;
+		m_size = that.m_size;
+	}
+
+	ByteVector&
+	ByteVector::operator=(const ByteVector &that)
+	{
+		// If &that == this, there's no need to do anything, but
+		// especially don't try to lock the same mutex twice.
+		if (&m_mutex != &that.m_mutex) {
+			unique_lock<mutex> lock_this(m_mutex, defer_lock);
+			unique_lock<mutex> lock_that(that.m_mutex, defer_lock);
+			lock(lock_this, lock_that);
+			m_ptr = that.m_ptr;
+			m_size = that.m_size;
+		}
+		return *this;
+	}
+
+	ByteVector::ByteVector(const ByteVector &that, size_t start, size_t length)
+	{
+		THROW_CHECK0(out_of_range, that.m_ptr);
+		THROW_CHECK2(out_of_range, start, that.m_size, start <= that.m_size);
+		THROW_CHECK2(out_of_range, start + length, that.m_size + length, start + length <= that.m_size + length);
+		m_ptr = Pointer(that.m_ptr, that.m_ptr.get() + start);
+		m_size = length;
+	}
+
+	ByteVector
+	ByteVector::at(size_t start, size_t length) const
+	{
+		return ByteVector(*this, start, length);
+	}
+
+	ByteVector::value_type&
+	ByteVector::at(size_t size) const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		THROW_CHECK0(out_of_range, m_ptr);
+		THROW_CHECK2(out_of_range, size, m_size, size < m_size);
+		return m_ptr.get()[size];
+	}
+
+	static
+	void *
+	bv_allocate(size_t size)
+	{
+#ifdef BEES_VALGRIND
+		// XXX: only do this to shut up valgrind
+		return calloc(1, size);
+#else
+		return malloc(size);
+#endif
+	}
+
+	ByteVector::ByteVector(size_t size)
+	{
+		m_ptr = Pointer(static_cast<value_type*>(bv_allocate(size)), free);
+		// bad_alloc doesn't fit THROW_CHECK's template
+		THROW_CHECK0(runtime_error, m_ptr);
+		m_size = size;
+	}
+
+	ByteVector::ByteVector(iterator begin, iterator end, size_t min_size)
+	{
+		const size_t size = end - begin;
+		const size_t alloc_size = max(size, min_size);
+		m_ptr = Pointer(static_cast<value_type*>(bv_allocate(alloc_size)), free);
+		THROW_CHECK0(runtime_error, m_ptr);
+		m_size = alloc_size;
+		memcpy(m_ptr.get(), begin, size);
+	}
+
+	bool
+	ByteVector::operator==(const ByteVector &that) const
+	{
+		unique_lock<mutex> lock_this(m_mutex, defer_lock);
+		unique_lock<mutex> lock_that(that.m_mutex, defer_lock);
+		lock(lock_this, lock_that);
+		if (!m_ptr) {
+			return !that.m_ptr;
+		}
+		if (!that.m_ptr) {
+			return false;
+		}
+		if (m_size != that.m_size) {
+			return false;
+		}
+		if (m_ptr.get() == that.m_ptr.get()) {
+			return true;
+		}
+		return !memcmp(m_ptr.get(), that.m_ptr.get(), m_size);
+	}
+
+	void
+	ByteVector::erase(iterator begin, iterator end)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		const size_t size = end - begin;
+		if (!size) return;
+		THROW_CHECK0(out_of_range, m_ptr);
+		const iterator my_begin = m_ptr.get();
+		const iterator my_end = my_begin + m_size;
+		THROW_CHECK4(out_of_range, my_begin, begin, my_end, end, my_begin == begin || my_end == end);
+		if (begin == my_begin) {
+			if (end == my_end) {
+				m_size = 0;
+				m_ptr.reset();
+				return;
+			}
+			m_ptr = Pointer(m_ptr, end);
+		}
+		m_size -= size;
+	}
+
+	void
+	ByteVector::erase(iterator begin)
+	{
+		erase(begin, begin + 1);
+	}
+
+	ByteVector::value_type*
+	ByteVector::data() const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return m_ptr.get();
+	}
+
+	ostream&
+	operator<<(ostream &os, const ByteVector &bv) {
+		unique_lock<mutex> lock(bv.m_mutex);
+		hexdump(os, bv);
+		return os;
+	}
+}

lib/chatter.cc

@@ -15,8 +15,10 @@
 namespace crucible {
 	using namespace std;
 
-	static auto_ptr<set<string>> chatter_names;
+	static shared_ptr<set<string>> chatter_names;
 	static const char *SPACETAB = " \t";
+	static bool add_prefix_timestamp = true;
+	static bool add_prefix_level = true;
 
 	static
 	void
@@ -43,28 +45,52 @@ namespace crucible {
 		}
 	}
 
-	Chatter::Chatter(string name, ostream &os)
-		: m_name(name), m_os(os)
+	Chatter::Chatter(int loglevel, string name, ostream &os)
+		: m_loglevel(loglevel), m_name(name), m_os(os)
 	{
 	}
 
+	void
+	Chatter::enable_timestamp(bool prefix_timestamp)
+	{
+		add_prefix_timestamp = prefix_timestamp;
+	}
+
+	void
+	Chatter::enable_level(bool prefix_level)
+	{
+		add_prefix_level = prefix_level;
+	}
+
 	Chatter::~Chatter()
 	{
 		ostringstream header_stream;
 
-		time_t ltime;
-		DIE_IF_MINUS_ONE(time(&ltime));
-		struct tm ltm;
-		DIE_IF_ZERO(localtime_r(&ltime, &ltm));
+		if (add_prefix_timestamp) {
+			time_t ltime;
+			DIE_IF_MINUS_ONE(time(&ltime));
+			struct tm ltm;
+			DIE_IF_ZERO(localtime_r(&ltime, &ltm));
 
-		char buf[1024];
-		DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm));
+			char buf[1024];
+			DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm));
 
-		header_stream << buf;
-		header_stream << " " << getpid() << "." << gettid();
-		if (!m_name.empty()) {
-			header_stream << " " << m_name;
+			header_stream << buf;
+			header_stream << " " << getpid() << "." << crucible::gettid();
+			if (add_prefix_level) {
+				header_stream << "<" << m_loglevel << ">";
+			}
+			if (!m_name.empty()) {
+				header_stream << " " << m_name;
+			}
+		} else {
+			if (add_prefix_level) {
+				header_stream << "<" << m_loglevel << ">";
+			}
+			header_stream << (m_name.empty() ? "thread" : m_name);
+			header_stream << "[" << crucible::gettid() << "]";
 		}
+
 		header_stream << ": ";
 
 		string out = m_oss.str();
@@ -86,7 +112,7 @@ namespace crucible {
 	}
 
 	Chatter::Chatter(Chatter &&c)
-		: m_name(c.m_name), m_os(c.m_os), m_oss(c.m_oss.str())
+		: m_loglevel(c.m_loglevel), m_name(c.m_name), m_os(c.m_os), m_oss(c.m_oss.str())
 	{
 		c.m_oss.str("");
 	}
@@ -110,6 +136,7 @@ namespace crucible {
 		} else if (!chatter_names->empty()) {
 			cerr << "CRUCIBLE_CHATTER does not list '" << m_file << "' or '" << m_pretty_function << "'" << endl;
 		}
+		(void)m_line; // not implemented yet
 		// cerr << "ChatterBox " << reinterpret_cast<void*>(this) << " constructed" << endl;
 	}
 
@@ -132,7 +159,7 @@ namespace crucible {
 
 	ChatterUnwinder::~ChatterUnwinder()
 	{
-		if (uncaught_exception()) {
+		if (current_exception()) {
 			m_func();
 		}
 	}

lib/city.cc

@@ -0,0 +1,513 @@
+// Copyright (c) 2011 Google, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// CityHash, by Geoff Pike and Jyrki Alakuijala
+//
+// This file provides CityHash64() and related functions.
+//
+// It's probably possible to create even faster hash functions by
+// writing a program that systematically explores some of the space of
+// possible hash functions, by using SIMD instructions, or by
+// compromising on hash quality.
+
+#include "crucible/city.h"
+
+#include <algorithm>
+#include <string.h>  // for memcpy and memset
+
+using namespace std;
+
+static uint64 UNALIGNED_LOAD64(const char *p) {
+  uint64 result;
+  memcpy(&result, p, sizeof(result));
+  return result;
+}
+
+static uint32 UNALIGNED_LOAD32(const char *p) {
+  uint32 result;
+  memcpy(&result, p, sizeof(result));
+  return result;
+}
+
+#ifdef _MSC_VER
+
+#include <stdlib.h>
+#define bswap_32(x) _byteswap_ulong(x)
+#define bswap_64(x) _byteswap_uint64(x)
+
+#elif defined(__APPLE__)
+
+// Mac OS X / Darwin features
+#include <libkern/OSByteOrder.h>
+#define bswap_32(x) OSSwapInt32(x)
+#define bswap_64(x) OSSwapInt64(x)
+
+#elif defined(__sun) || defined(sun)
+
+#include <sys/byteorder.h>
+#define bswap_32(x) BSWAP_32(x)
+#define bswap_64(x) BSWAP_64(x)
+
+#elif defined(__FreeBSD__)
+
+#include <sys/endian.h>
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+
+#elif defined(__OpenBSD__)
+
+#include <sys/types.h>
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
+
+#elif defined(__NetBSD__)
+
+#include <sys/types.h>
+#include <machine/bswap.h>
+#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
+#define bswap_32(x) bswap32(x)
+#define bswap_64(x) bswap64(x)
+#endif
+
+#else
+
+#include <byteswap.h>
+
+#endif
+
+#ifdef WORDS_BIGENDIAN
+#define uint32_in_expected_order(x) (bswap_32(x))
+#define uint64_in_expected_order(x) (bswap_64(x))
+#else
+#define uint32_in_expected_order(x) (x)
+#define uint64_in_expected_order(x) (x)
+#endif
+
+#if !defined(LIKELY)
+#if HAVE_BUILTIN_EXPECT
+#define LIKELY(x) (__builtin_expect(!!(x), 1))
+#else
+#define LIKELY(x) (x)
+#endif
+#endif
+
+static uint64 Fetch64(const char *p) {
+  return uint64_in_expected_order(UNALIGNED_LOAD64(p));
+}
+
+static uint32 Fetch32(const char *p) {
+  return uint32_in_expected_order(UNALIGNED_LOAD32(p));
+}
+
+// Some primes between 2^63 and 2^64 for various uses.
+static const uint64 k0 = 0xc3a5c85c97cb3127ULL;
+static const uint64 k1 = 0xb492b66fbe98f273ULL;
+static const uint64 k2 = 0x9ae16a3b2f90404fULL;
+
+// Magic numbers for 32-bit hashing.  Copied from Murmur3.
+static const uint32 c1 = 0xcc9e2d51;
+static const uint32 c2 = 0x1b873593;
+
+// A 32-bit to 32-bit integer hash copied from Murmur3.
+static uint32 fmix(uint32 h)
+{
+  h ^= h >> 16;
+  h *= 0x85ebca6b;
+  h ^= h >> 13;
+  h *= 0xc2b2ae35;
+  h ^= h >> 16;
+  return h;
+}
+
+static uint32 Rotate32(uint32 val, int shift) {
+  // Avoid shifting by 32: doing so yields an undefined result.
+  return shift == 0 ? val : ((val >> shift) | (val << (32 - shift)));
+}
+
+#undef PERMUTE3
+#define PERMUTE3(a, b, c) do { std::swap(a, b); std::swap(a, c); } while (0)
+
+static uint32 Mur(uint32 a, uint32 h) {
+  // Helper from Murmur3 for combining two 32-bit values.
+  a *= c1;
+  a = Rotate32(a, 17);
+  a *= c2;
+  h ^= a;
+  h = Rotate32(h, 19);
+  return h * 5 + 0xe6546b64;
+}
+
+static uint32 Hash32Len13to24(const char *s, size_t len) {
+  uint32 a = Fetch32(s - 4 + (len >> 1));
+  uint32 b = Fetch32(s + 4);
+  uint32 c = Fetch32(s + len - 8);
+  uint32 d = Fetch32(s + (len >> 1));
+  uint32 e = Fetch32(s);
+  uint32 f = Fetch32(s + len - 4);
+  uint32 h = len;
+
+  return fmix(Mur(f, Mur(e, Mur(d, Mur(c, Mur(b, Mur(a, h)))))));
+}
+
+static uint32 Hash32Len0to4(const char *s, size_t len) {
+  uint32 b = 0;
+  uint32 c = 9;
+  for (size_t i = 0; i < len; i++) {
+    signed char v = s[i];
+    b = b * c1 + v;
+    c ^= b;
+  }
+  return fmix(Mur(b, Mur(len, c)));
+}
+
+static uint32 Hash32Len5to12(const char *s, size_t len) {
+  uint32 a = len, b = len * 5, c = 9, d = b;
+  a += Fetch32(s);
+  b += Fetch32(s + len - 4);
+  c += Fetch32(s + ((len >> 1) & 4));
+  return fmix(Mur(c, Mur(b, Mur(a, d))));
+}
+
+uint32 CityHash32(const char *s, size_t len) {
+  if (len <= 24) {
+    return len <= 12 ?
+        (len <= 4 ? Hash32Len0to4(s, len) : Hash32Len5to12(s, len)) :
+        Hash32Len13to24(s, len);
+  }
+
+  // len > 24
+  uint32 h = len, g = c1 * len, f = g;
+  uint32 a0 = Rotate32(Fetch32(s + len - 4) * c1, 17) * c2;
+  uint32 a1 = Rotate32(Fetch32(s + len - 8) * c1, 17) * c2;
+  uint32 a2 = Rotate32(Fetch32(s + len - 16) * c1, 17) * c2;
+  uint32 a3 = Rotate32(Fetch32(s + len - 12) * c1, 17) * c2;
+  uint32 a4 = Rotate32(Fetch32(s + len - 20) * c1, 17) * c2;
+  h ^= a0;
+  h = Rotate32(h, 19);
+  h = h * 5 + 0xe6546b64;
+  h ^= a2;
+  h = Rotate32(h, 19);
+  h = h * 5 + 0xe6546b64;
+  g ^= a1;
+  g = Rotate32(g, 19);
+  g = g * 5 + 0xe6546b64;
+  g ^= a3;
+  g = Rotate32(g, 19);
+  g = g * 5 + 0xe6546b64;
+  f += a4;
+  f = Rotate32(f, 19);
+  f = f * 5 + 0xe6546b64;
+  size_t iters = (len - 1) / 20;
+  do {
+    uint32 a0 = Rotate32(Fetch32(s) * c1, 17) * c2;
+    uint32 a1 = Fetch32(s + 4);
+    uint32 a2 = Rotate32(Fetch32(s + 8) * c1, 17) * c2;
+    uint32 a3 = Rotate32(Fetch32(s + 12) * c1, 17) * c2;
+    uint32 a4 = Fetch32(s + 16);
+    h ^= a0;
+    h = Rotate32(h, 18);
+    h = h * 5 + 0xe6546b64;
+    f += a1;
+    f = Rotate32(f, 19);
+    f = f * c1;
+    g += a2;
+    g = Rotate32(g, 18);
+    g = g * 5 + 0xe6546b64;
+    h ^= a3 + a1;
+    h = Rotate32(h, 19);
+    h = h * 5 + 0xe6546b64;
+    g ^= a4;
+    g = bswap_32(g) * 5;
+    h += a4 * 5;
+    h = bswap_32(h);
+    f += a0;
+    PERMUTE3(f, h, g);
+    s += 20;
+  } while (--iters != 0);
+  g = Rotate32(g, 11) * c1;
+  g = Rotate32(g, 17) * c1;
+  f = Rotate32(f, 11) * c1;
+  f = Rotate32(f, 17) * c1;
+  h = Rotate32(h + g, 19);
+  h = h * 5 + 0xe6546b64;
+  h = Rotate32(h, 17) * c1;
+  h = Rotate32(h + f, 19);
+  h = h * 5 + 0xe6546b64;
+  h = Rotate32(h, 17) * c1;
+  return h;
+}
+
+// Bitwise right rotate.  Normally this will compile to a single
+// instruction, especially if the shift is a manifest constant.
+static uint64 Rotate(uint64 val, int shift) {
+  // Avoid shifting by 64: doing so yields an undefined result.
+  return shift == 0 ? val : ((val >> shift) | (val << (64 - shift)));
+}
+
+static uint64 ShiftMix(uint64 val) {
+  return val ^ (val >> 47);
+}
+
+static uint64 HashLen16(uint64 u, uint64 v) {
+  return Hash128to64(uint128(u, v));
+}
+
+static uint64 HashLen16(uint64 u, uint64 v, uint64 mul) {
+  // Murmur-inspired hashing.
+  uint64 a = (u ^ v) * mul;
+  a ^= (a >> 47);
+  uint64 b = (v ^ a) * mul;
+  b ^= (b >> 47);
+  b *= mul;
+  return b;
+}
+
+static uint64 HashLen0to16(const char *s, size_t len) {
+  if (len >= 8) {
+    uint64 mul = k2 + len * 2;
+    uint64 a = Fetch64(s) + k2;
+    uint64 b = Fetch64(s + len - 8);
+    uint64 c = Rotate(b, 37) * mul + a;
+    uint64 d = (Rotate(a, 25) + b) * mul;
+    return HashLen16(c, d, mul);
+  }
+  if (len >= 4) {
+    uint64 mul = k2 + len * 2;
+    uint64 a = Fetch32(s);
+    return HashLen16(len + (a << 3), Fetch32(s + len - 4), mul);
+  }
+  if (len > 0) {
+    uint8 a = s[0];
+    uint8 b = s[len >> 1];
+    uint8 c = s[len - 1];
+    uint32 y = static_cast<uint32>(a) + (static_cast<uint32>(b) << 8);
+    uint32 z = len + (static_cast<uint32>(c) << 2);
+    return ShiftMix(y * k2 ^ z * k0) * k2;
+  }
+  return k2;
+}
+
+// This probably works well for 16-byte strings as well, but it may be overkill
+// in that case.
+static uint64 HashLen17to32(const char *s, size_t len) {
+  uint64 mul = k2 + len * 2;
+  uint64 a = Fetch64(s) * k1;
+  uint64 b = Fetch64(s + 8);
+  uint64 c = Fetch64(s + len - 8) * mul;
+  uint64 d = Fetch64(s + len - 16) * k2;
+  return HashLen16(Rotate(a + b, 43) + Rotate(c, 30) + d,
+                   a + Rotate(b + k2, 18) + c, mul);
+}
+
+// Return a 16-byte hash for 48 bytes.  Quick and dirty.
+// Callers do best to use "random-looking" values for a and b.
+static pair<uint64, uint64> WeakHashLen32WithSeeds(
+    uint64 w, uint64 x, uint64 y, uint64 z, uint64 a, uint64 b) {
+  a += w;
+  b = Rotate(b + a + z, 21);
+  uint64 c = a;
+  a += x;
+  a += y;
+  b += Rotate(a, 44);
+  return make_pair(a + z, b + c);
+}
+
+// Return a 16-byte hash for s[0] ... s[31], a, and b.  Quick and dirty.
+static pair<uint64, uint64> WeakHashLen32WithSeeds(
+    const char* s, uint64 a, uint64 b) {
+  return WeakHashLen32WithSeeds(Fetch64(s),
+                                Fetch64(s + 8),
+                                Fetch64(s + 16),
+                                Fetch64(s + 24),
+                                a,
+                                b);
+}
+
+// Return an 8-byte hash for 33 to 64 bytes.
+static uint64 HashLen33to64(const char *s, size_t len) {
+  uint64 mul = k2 + len * 2;
+  uint64 a = Fetch64(s) * k2;
+  uint64 b = Fetch64(s + 8);
+  uint64 c = Fetch64(s + len - 24);
+  uint64 d = Fetch64(s + len - 32);
+  uint64 e = Fetch64(s + 16) * k2;
+  uint64 f = Fetch64(s + 24) * 9;
+  uint64 g = Fetch64(s + len - 8);
+  uint64 h = Fetch64(s + len - 16) * mul;
+  uint64 u = Rotate(a + g, 43) + (Rotate(b, 30) + c) * 9;
+  uint64 v = ((a + g) ^ d) + f + 1;
+  uint64 w = bswap_64((u + v) * mul) + h;
+  uint64 x = Rotate(e + f, 42) + c;
+  uint64 y = (bswap_64((v + w) * mul) + g) * mul;
+  uint64 z = e + f + c;
+  a = bswap_64((x + z) * mul + y) + b;
+  b = ShiftMix((z + a) * mul + d + h) * mul;
+  return b + x;
+}
+
+uint64 CityHash64(const char *s, size_t len) {
+  if (len <= 32) {
+    if (len <= 16) {
+      return HashLen0to16(s, len);
+    } else {
+      return HashLen17to32(s, len);
+    }
+  } else if (len <= 64) {
+    return HashLen33to64(s, len);
+  }
+
+  // For strings over 64 bytes we hash the end first, and then as we
+  // loop we keep 56 bytes of state: v, w, x, y, and z.
+  uint64 x = Fetch64(s + len - 40);
+  uint64 y = Fetch64(s + len - 16) + Fetch64(s + len - 56);
+  uint64 z = HashLen16(Fetch64(s + len - 48) + len, Fetch64(s + len - 24));
+  pair<uint64, uint64> v = WeakHashLen32WithSeeds(s + len - 64, len, z);
+  pair<uint64, uint64> w = WeakHashLen32WithSeeds(s + len - 32, y + k1, x);
+  x = x * k1 + Fetch64(s);
+
+  // Decrease len to the nearest multiple of 64, and operate on 64-byte chunks.
+  len = (len - 1) & ~static_cast<size_t>(63);
+  do {
+    x = Rotate(x + y + v.first + Fetch64(s + 8), 37) * k1;
+    y = Rotate(y + v.second + Fetch64(s + 48), 42) * k1;
+    x ^= w.second;
+    y += v.first + Fetch64(s + 40);
+    z = Rotate(z + w.first, 33) * k1;
+    v = WeakHashLen32WithSeeds(s, v.second * k1, x + w.first);
+    w = WeakHashLen32WithSeeds(s + 32, z + w.second, y + Fetch64(s + 16));
+    std::swap(z, x);
+    s += 64;
+    len -= 64;
+  } while (len != 0);
+  return HashLen16(HashLen16(v.first, w.first) + ShiftMix(y) * k1 + z,
+                   HashLen16(v.second, w.second) + x);
+}
+
+uint64 CityHash64WithSeed(const char *s, size_t len, uint64 seed) {
+  return CityHash64WithSeeds(s, len, k2, seed);
+}
+
+uint64 CityHash64WithSeeds(const char *s, size_t len,
+                           uint64 seed0, uint64 seed1) {
+  return HashLen16(CityHash64(s, len) - seed0, seed1);
+}
+
+// A subroutine for CityHash128().  Returns a decent 128-bit hash for strings
+// of any length representable in signed long.  Based on City and Murmur.
+static uint128 CityMurmur(const char *s, size_t len, uint128 seed) {
+  uint64 a = Uint128Low64(seed);
+  uint64 b = Uint128High64(seed);
+  uint64 c = 0;
+  uint64 d = 0;
+  signed long l = len - 16;
+  if (l <= 0) {  // len <= 16
+    a = ShiftMix(a * k1) * k1;
+    c = b * k1 + HashLen0to16(s, len);
+    d = ShiftMix(a + (len >= 8 ? Fetch64(s) : c));
+  } else {  // len > 16
+    c = HashLen16(Fetch64(s + len - 8) + k1, a);
+    d = HashLen16(b + len, c + Fetch64(s + len - 16));
+    a += d;
+    do {
+      a ^= ShiftMix(Fetch64(s) * k1) * k1;
+      a *= k1;
+      b ^= a;
+      c ^= ShiftMix(Fetch64(s + 8) * k1) * k1;
+      c *= k1;
+      d ^= c;
+      s += 16;
+      l -= 16;
+    } while (l > 0);
+  }
+  a = HashLen16(a, c);
+  b = HashLen16(d, b);
+  return uint128(a ^ b, HashLen16(b, a));
+}
+
+uint128 CityHash128WithSeed(const char *s, size_t len, uint128 seed) {
+  if (len < 128) {
+    return CityMurmur(s, len, seed);
+  }
+
+  // We expect len >= 128 to be the common case.  Keep 56 bytes of state:
+  // v, w, x, y, and z.
+  pair<uint64, uint64> v, w;
+  uint64 x = Uint128Low64(seed);
+  uint64 y = Uint128High64(seed);
+  uint64 z = len * k1;
+  v.first = Rotate(y ^ k1, 49) * k1 + Fetch64(s);
+  v.second = Rotate(v.first, 42) * k1 + Fetch64(s + 8);
+  w.first = Rotate(y + z, 35) * k1 + x;
+  w.second = Rotate(x + Fetch64(s + 88), 53) * k1;
+
+  // This is the same inner loop as CityHash64(), manually unrolled.
+  do {
+    x = Rotate(x + y + v.first + Fetch64(s + 8), 37) * k1;
+    y = Rotate(y + v.second + Fetch64(s + 48), 42) * k1;
+    x ^= w.second;
+    y += v.first + Fetch64(s + 40);
+    z = Rotate(z + w.first, 33) * k1;
+    v = WeakHashLen32WithSeeds(s, v.second * k1, x + w.first);
+    w = WeakHashLen32WithSeeds(s + 32, z + w.second, y + Fetch64(s + 16));
+    std::swap(z, x);
+    s += 64;
+    x = Rotate(x + y + v.first + Fetch64(s + 8), 37) * k1;
+    y = Rotate(y + v.second + Fetch64(s + 48), 42) * k1;
+    x ^= w.second;
+    y += v.first + Fetch64(s + 40);
+    z = Rotate(z + w.first, 33) * k1;
+    v = WeakHashLen32WithSeeds(s, v.second * k1, x + w.first);
+    w = WeakHashLen32WithSeeds(s + 32, z + w.second, y + Fetch64(s + 16));
+    std::swap(z, x);
+    s += 64;
+    len -= 128;
+  } while (LIKELY(len >= 128));
+  x += Rotate(v.first + z, 49) * k0;
+  y = y * k0 + Rotate(w.second, 37);
+  z = z * k0 + Rotate(w.first, 27);
+  w.first *= 9;
+  v.first *= k0;
+  // If 0 < len < 128, hash up to 4 chunks of 32 bytes each from the end of s.
+  for (size_t tail_done = 0; tail_done < len; ) {
+    tail_done += 32;
+    y = Rotate(x + y, 42) * k0 + v.second;
+    w.first += Fetch64(s + len - tail_done + 16);
+    x = x * k0 + w.first;
+    z += w.second + Fetch64(s + len - tail_done);
+    w.second += v.first;
+    v = WeakHashLen32WithSeeds(s + len - tail_done, v.first + z, v.second);
+    v.first *= k0;
+  }
+  // At this point our 56 bytes of state should contain more than
+  // enough information for a strong 128-bit hash.  We use two
+  // different 56-byte-to-8-byte hashes to get a 16-byte final result.
+  x = HashLen16(x, v.first);
+  y = HashLen16(y + z, w.first);
+  return uint128(HashLen16(x + v.second, w.second) + y,
+                 HashLen16(x + w.second, y + v.second));
+}
+
+uint128 CityHash128(const char *s, size_t len) {
+  return len >= 16 ?
+      CityHash128WithSeed(s + 16, len - 16,
+                          uint128(Fetch64(s), Fetch64(s + 8) + k0)) :
+      CityHash128WithSeed(s, len, uint128(k0, k1));
+}
+

lib/cleanup.cc

@@ -0,0 +1,17 @@
+#include "crucible/cleanup.h"
+
+namespace crucible {
+
+	Cleanup::Cleanup(function<void()> func) :
+		m_cleaner(func)
+	{
+	}
+
+	Cleanup::~Cleanup()
+	{
+		if (m_cleaner) {
+			m_cleaner();
+		}
+	}
+
+}

lib/configure.h.in

@@ -0,0 +1,6 @@
+#ifndef _CONFIGURE_H
+
+#define ETC_PREFIX "@ETC_PREFIX@"
+
+#define _CONFIGURE_H
+#endif

lib/crc64.cc

@@ -1,3 +1,31 @@
+/* crc64.c -- compute CRC-64
+ * Copyright (C) 2013 Mark Adler
+ * Version 1.4  16 Dec 2013  Mark Adler
+ */
+
+/*
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the author be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Mark Adler
+ madler@alumni.caltech.edu
+ */
+
+/* Substantially modified by Paul Jones for usage in bees */
+
 #include "crucible/crc64.h"
 
 #define POLY64REV 0xd800000000000000ULL
@@ -5,13 +33,16 @@
 namespace crucible {
 
 	static bool init = false;
-	static uint64_t CRCTable[256];
+	static uint64_t CRCTable[8][256];
 
 	static void init_crc64_table()
 	{
 		if (!init) {
-			for (int i = 0; i <= 255; i++) {
-				uint64_t part = i;
+			uint64_t crc;
+
+			// Generate CRCs for all single byte sequences
+			for (int n = 0; n < 256; n++) {
+				uint64_t part = n;
 				for (int j = 0; j < 8; j++) {
 					if (part & 1) {
 						part = (part >> 1) ^ POLY64REV;
@@ -19,37 +50,53 @@ namespace crucible {
 						part >>= 1;
 					}
 				}
-				CRCTable[i] = part;
+				CRCTable[0][n] = part;
+			}
+
+			// Generate nested CRC table for slice-by-8 lookup
+			for (int n = 0; n < 256; n++) {
+				crc = CRCTable[0][n];
+				for (int k = 1; k < 8; k++) {
+					crc = CRCTable[0][crc & 0xff] ^ (crc >> 8);
+					CRCTable[k][n] = crc;
+				}
 			}
 			init = true;
 		}
 	}
 
-	uint64_t
-	Digest::CRC::crc64(const char *s)
-	{
-		init_crc64_table();
-
-		uint64_t crc = 0;
-		for (; *s; s++) {
-			uint64_t temp1 = crc >> 8;
-			uint64_t temp2 = CRCTable[(crc ^ static_cast<uint64_t>(*s)) & 0xff];
-			crc = temp1 ^ temp2;
-		}
-
-		return crc;
-	}
-
 	uint64_t
 	Digest::CRC::crc64(const void *p, size_t len)
 	{
 		init_crc64_table();
-
+		const unsigned char *next = static_cast<const unsigned char *>(p);
 		uint64_t crc = 0;
-		for (const unsigned char *s = static_cast<const unsigned char *>(p); len; --len) {
-			uint64_t temp1 = crc >> 8;
-			uint64_t temp2 = CRCTable[(crc ^ *s++) & 0xff];
-			crc = temp1 ^ temp2;
+
+		// Process individual bytes until we reach an 8-byte aligned pointer
+		while (len && (reinterpret_cast<uintptr_t>(next) & 7) != 0) {
+			crc = CRCTable[0][(crc ^ *next++) & 0xff] ^ (crc >> 8);
+			len--;
+		}
+
+		// Fast middle processing, 8 bytes (aligned!) per loop
+		while (len >= 8) {
+			crc ^= *(reinterpret_cast< const uint64_t *>(next));
+			crc = CRCTable[7][crc & 0xff] ^
+				  CRCTable[6][(crc >> 8) & 0xff] ^
+				  CRCTable[5][(crc >> 16) & 0xff] ^
+				  CRCTable[4][(crc >> 24) & 0xff] ^
+				  CRCTable[3][(crc >> 32) & 0xff] ^
+				  CRCTable[2][(crc >> 40) & 0xff] ^
+				  CRCTable[1][(crc >> 48) & 0xff] ^
+				  CRCTable[0][crc >> 56];
+			next += 8;
+			len -= 8;
+		}
+
+		// Process remaining bytes (can't be larger than 8)
+		while (len) {
+			crc = CRCTable[0][(crc ^ *next++) & 0xff] ^ (crc >> 8);
+			len--;
 		}
 
 		return crc;

lib/error.cc

@@ -32,7 +32,7 @@ namespace crucible {
 
 	// FIXME:  could probably avoid some of these levels of indirection
 	static
-	function<void(string s)> current_catch_explainer = [&](string s) {
+	function<void(string s)> current_catch_explainer = [](string s) {
 		cerr << s << endl;
 	};
 

lib/execpipe.cc

@@ -1,104 +0,0 @@
-#include "crucible/execpipe.h"
-
-#include "crucible/chatter.h"
-#include "crucible/error.h"
-#include "crucible/process.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-namespace crucible {
-	using namespace std;
-
-	void
-	redirect_stdin(const Fd &child_fd)
-	{
-		dup2_or_die(child_fd, STDIN_FILENO);
-	}
-
-	void
-	redirect_stdin_stdout(const Fd &child_fd)
-	{
-		dup2_or_die(child_fd, STDOUT_FILENO);
-		dup2_or_die(child_fd, STDIN_FILENO);
-	}
-
-	void
-	redirect_stdin_stdout_stderr(const Fd &child_fd)
-	{
-		dup2_or_die(child_fd, STDERR_FILENO);
-		dup2_or_die(child_fd, STDOUT_FILENO);
-		dup2_or_die(child_fd, STDIN_FILENO);
-	}
-
-	void
-	redirect_stdout_stderr(const Fd &child_fd)
-	{
-		dup2_or_die(child_fd, STDERR_FILENO);
-		dup2_or_die(child_fd, STDOUT_FILENO);
-	}
-
-	void
-	redirect_stdout(const Fd &child_fd)
-	{
-		dup2_or_die(child_fd, STDOUT_FILENO);
-	}
-
-	void
-	redirect_stderr(const Fd &child_fd)
-	{
-		dup2_or_die(child_fd, STDERR_FILENO);
-	}
-
-	Fd popen(function<int()> f, function<void(const Fd &child_fd)> import_fd_fn)
-	{
-		Fd parent_fd, child_fd;
-		{
-			pair<Fd, Fd> fd_pair = socketpair_or_die();
-			parent_fd = fd_pair.first;
-			child_fd = fd_pair.second;
-		}
-
-		pid_t fv;
-		DIE_IF_MINUS_ONE(fv = fork());
-
-		if (fv) {
-			child_fd->close();
-			return parent_fd;
-		} else {
-			int rv = EXIT_FAILURE;
-			catch_all([&]() {
-				parent_fd->close();
-				import_fd_fn(child_fd);
-				// system("ls -l /proc/$$/fd/ >&2");
-
-				rv = f();
-			});
-			_exit(rv);
-			cerr << "PID " << getpid() << " TID " << gettid() << "STILL ALIVE" << endl;
-			system("ls -l /proc/$$/task/ >&2");
-			exit(EXIT_FAILURE);
-		}
-	}
-
-	string
-	read_all(Fd fd, size_t max_bytes, size_t chunk_bytes)
-	{
-		char buf[chunk_bytes];
-		string str;
-		size_t rv;
-		while (1) {
-			read_partial_or_die(fd, static_cast<void *>(buf), chunk_bytes, rv);
-			if (rv == 0) {
-				break;
-			}
-			if (max_bytes - str.size() < rv) {
-				THROW_ERROR(out_of_range, "Output size limit " << max_bytes << " exceeded by appending " << rv << " bytes read to " << str.size() << " already in string");
-			}
-			str.append(buf, rv);
-		}
-		return str;
-	}
-}

lib/extentwalker.cc

@@ -6,26 +6,40 @@
 #include "crucible/limits.h"
 #include "crucible/string.h"
 
-
 namespace crucible {
 	using namespace std;
 
-	const off_t ExtentWalker::sc_step_size;
-
 	// fm_start, fm_length, fm_flags, m_extents
 	// fe_logical, fe_physical, fe_length, fe_flags
 
-	static const off_t MAX_OFFSET = numeric_limits<off_t>::max();
 	static const off_t FIEMAP_BLOCK_SIZE = 4096;
 
-	static bool __ew_do_log = getenv("EXTENTWALKER_DEBUG");
+	// Maximum number of extents from TREE_SEARCH.
+	static const unsigned sc_extent_fetch_max = 16;
 
+	// Minimum number of extents from TREE_SEARCH.
+	// If we don't get this number, we'll binary search backward
+	// until we reach the beginning of the file or find at least this
+	// number of extents.
+	static const unsigned sc_extent_fetch_min = 4;
+
+	// This is a guess that tries to land at least one extent
+	// before the target extent, so we don't have to search backward as often.
+	static const off_t sc_back_step_size = 64 * 1024;
+
+#ifdef EXTENTWALKER_DEBUG
 #define EWLOG(x) do { \
-	if (__ew_do_log) { \
-		CHATTER(x); \
-	} \
+	m_log << x << endl; \
 } while (0)
 
+#define EWTRACE(x) do { \
+	CHATTER_UNWIND(x); \
+} while (0)
+#else
+#define EWLOG(x)   do {} while (0)
+#define EWTRACE(x) do {} while (0)
+#endif
+
 	ostream &
 	operator<<(ostream &os, const Extent &e)
 	{
@@ -43,9 +57,7 @@ namespace crucible {
 		if (e.m_flags & Extent::OBSCURED) {
 			os << "Extent::OBSCURED|";
 		}
-		if (e.m_flags & ~(Extent::HOLE | Extent::PREALLOC | Extent::OBSCURED)) {
-			os << fiemap_extent_flags_ntoa(e.m_flags & ~(Extent::HOLE | Extent::PREALLOC | Extent::OBSCURED));
-		}
+		os << fiemap_extent_flags_ntoa(e.m_flags & ~(Extent::HOLE | Extent::PREALLOC | Extent::OBSCURED));
 		if (e.m_physical_len) {
 			os << ", physical_len = " << to_hex(e.m_physical_len);
 		}
@@ -71,23 +83,16 @@ namespace crucible {
 	ostream &
 	operator<<(ostream &os, const ExtentWalker &ew)
 	{
-		return os << "ExtentWalker {"
+		os << "ExtentWalker {"
 			<< " fd = " << name_fd(ew.m_fd)
 			<< ", stat.st_size = " << to_hex(ew.m_stat.st_size)
 			<< ", extents = " << ew.m_extents
 			<< ", current = [" << ew.m_current - ew.m_extents.begin()
-			<< "] }";
-	}
-
-	Extent::Extent() :
-		m_begin(0),
-		m_end(0),
-		m_physical(0),
-		m_flags(0),
-		m_physical_len(0),
-		m_logical_len(0),
-		m_offset(0)
-	{
+			<< "] ";
+#ifdef EXTENTWALKER_DEBUG
+		os << "\nLog:\n" << ew.m_log.str() << "\nEnd log";
+#endif
+		return os << "}";
 	}
 
 	Extent::operator bool() const
@@ -109,6 +114,18 @@ namespace crucible {
 		return m_begin == that.m_begin && m_end == that.m_end && m_physical == that.m_physical && m_flags == that.m_flags;
 	}
 
+	bool
+	Extent::compressed() const
+	{
+		return m_flags & FIEMAP_EXTENT_ENCODED;
+	}
+
+	uint64_t
+	Extent::bytenr() const
+	{
+		return compressed() ? m_physical : m_physical - m_offset;
+	}
+
 	ExtentWalker::ExtentWalker(Fd fd) :
 		m_fd(fd),
 		m_current(m_extents.begin())
@@ -161,8 +178,7 @@ namespace crucible {
 	void
 	ExtentWalker::run_fiemap(off_t pos)
 	{
-		ostringstream log;
-		CHATTER_UNWIND("Log of run_fiemap: " << log.str());
+		EWTRACE("Log of run_fiemap: " << m_log.str());
 
 		EWLOG("pos = " << to_hex(pos));
 
@@ -170,18 +186,24 @@ namespace crucible {
 
 		Vec fm;
 
-		off_t step_size = pos;
-		off_t begin = pos - min(pos, sc_step_size);
+		// Start backward search by dropping lowest bit
+		off_t step_size = (pos > 0) ? (pos ^ (pos & (pos - 1))) * 2 : 0;
+
+		// Start first pass through loop just a little before the target extent,
+		// because the first iteration will be wasted if we have an exact match.
+		off_t begin = pos - min(pos, sc_back_step_size);
 
 		// This loop should not run forever
 		int loop_count = 0;
-		int loop_limit = 99;
+		const int loop_limit = 99;
 		while (true) {
-			if (loop_count == 90) {
-				EWLOG(log.str());
+#ifdef EXTENTWALKER_DEBUG
+			if (loop_count >= loop_limit) {
+				cerr << "Too many loops!" << endl << m_log.str() << endl;
+				abort();
 			}
-
-			THROW_CHECK1(runtime_error, loop_count, loop_count < loop_limit);
+#endif
+			THROW_CHECK2(runtime_error, *this, loop_count, loop_count < loop_limit);
 			++loop_count;
 
 			// Get file size every time in case it changes under us
@@ -189,7 +211,16 @@ namespace crucible {
 
 			// Get fiemap begin..EOF
 			fm = get_extent_map(begin);
-			EWLOG("fiemap result loop count #" << loop_count << ":" << fm);
+			EWLOG("fiemap result loop count #" << loop_count << " begin " << to_hex(begin) << " pos "
+				<< to_hex(pos) << " step_size " << to_hex(step_size) << ":\n" << fm);
+
+			// Sanity check on the data:  in order, not overlapping, not empty, not before pos
+			off_t sanity_pos = begin;
+			for (auto const &i : fm) {
+				THROW_CHECK1(runtime_error, fm, i.begin() >= sanity_pos);
+				THROW_CHECK1(runtime_error, fm, i.end() > i.begin());
+				sanity_pos = i.end();
+			}
 
 			// This algorithm seeks at least three extents: one before,
 			// one after, and one containing pos.  Files which contain
@@ -197,15 +228,15 @@ namespace crucible {
 			// so handle those cases separately.
 
 			// FIEMAP lies, and we catch it in a lie about the size of the
-			// second extent.  To work around this, try getting more than 3.
+			// second extent.  To work around this, sc_extent_fetch_min is at least 4.
 
 			// 0..2(ish) extents
 			if (fm.size() < sc_extent_fetch_min) {
-				// If we are not at beginning of file, move backward
+				// If we are not at beginning of file, move backward by zeroing the lowest bit
 				if (begin > 0) {
-					step_size /= 2;
+					step_size = (begin > 0) ? (begin ^ (begin & (begin - 1))) : 0;
 					auto next_begin = (begin - min(step_size, begin)) & ~(FIEMAP_BLOCK_SIZE - 1);
-					EWLOG("step backward " << to_hex(begin) << " -> " << to_hex(next_begin) << " extents size " << fm.size());
+					EWLOG("step backward " << to_hex(begin) << " -> " << to_hex(next_begin));
 					if (begin == next_begin) {
 						EWLOG("step backward stopped");
 						break;
@@ -233,18 +264,18 @@ namespace crucible {
 			// We have at least three extents, so there is now a first and last.
 			// We want pos to be between first and last.  There doesn't have
 			// to be an extent between these (it could be a hole).
-			auto &first_extent = fm.at(sc_extent_fetch_min - 2);
+			auto &first_extent = *fm.begin();
 			auto &last_extent = *fm.rbegin();
 			EWLOG("first_extent = " << first_extent);
 			EWLOG("last_extent = " << last_extent);
 
-			// First extent must end on or before pos
+			// First extent must end on or before pos; otherwise, go further back
 			if (first_extent.end() > pos) {
 				// Can we move backward?
 				if (begin > 0) {
-					step_size /= 2;
+					step_size = (begin > 0) ? (begin ^ (begin & (begin - 1))) : 0;
 					auto next_begin = (begin - min(step_size, begin)) & ~(FIEMAP_BLOCK_SIZE - 1);
-					EWLOG("step backward " << to_hex(begin) << " -> " << to_hex(next_begin) << " extents size " << fm.size());
+					EWLOG("step backward " << to_hex(begin) << " -> " << to_hex(next_begin));
 					if (begin == next_begin) {
 						EWLOG("step backward stopped");
 						break;
@@ -254,38 +285,29 @@ namespace crucible {
 				}
 
 				// We are as far back as we can go, so there must be no
-				// extent before pos (i.e. file starts with a hole).
+				// extent before pos (i.e. file starts with a hole
+				// or first extent starts at pos 0).
 				EWLOG("no extent before pos");
 				break;
 			}
 
-			// First extent ends on or before pos.
-
-			// If last extent is EOF then we have the entire file in the buffer.
+			// If last extent is EOF then we cannot more any further forward.
 			// pos could be in last extent, so skip the later checks that
 			// insist pos be located prior to the last extent.
 			if (last_extent.flags() & FIEMAP_EXTENT_LAST) {
 				break;
 			}
 
-			// Don't have EOF, must have an extent after pos.
+			// Don't have EOF, must have an extent after pos; otherwise, go forward
 			if (last_extent.begin() <= pos) {
+				// Set the bit just below the one we last cleared
 				step_size /= 2;
-				auto new_begin = (begin + step_size) & ~(FIEMAP_BLOCK_SIZE - 1);
+				auto new_begin = (begin + max(FIEMAP_BLOCK_SIZE, step_size)) & ~(FIEMAP_BLOCK_SIZE - 1);
 				EWLOG("step forward " << to_hex(begin) << " -> " << to_hex(new_begin));
-				if (begin == new_begin) {
-					EWLOG("step forward stopped");
-					break;
-				}
 				begin = new_begin;
 				continue;
 			}
 
-			// Last extent begins after pos, first extent ends on or before pos.
-			// All other cases should have been handled before here.
-			THROW_CHECK2(runtime_error, pos, first_extent, first_extent.end() <= pos);
-			THROW_CHECK2(runtime_error, pos, last_extent, last_extent.begin() > pos);
-
 			// We should probably stop now
 			break;
 		}
@@ -300,6 +322,11 @@ namespace crucible {
 		while (fmi != fm.end()) {
 			Extent new_extent(*fmi);
 			THROW_CHECK2(runtime_error, ipos, new_extent.m_begin, ipos <= new_extent.m_begin);
+			// Don't map extents past EOF, we can't read them
+			if (new_extent.m_begin >= m_stat.st_size) {
+				last_extent_is_last = true;
+				break;
+			}
 			if (new_extent.m_begin > ipos) {
 				Extent hole_extent;
 				hole_extent.m_begin = ipos;
@@ -327,12 +354,14 @@ namespace crucible {
 				hole_extent.m_flags |= FIEMAP_EXTENT_LAST;
 			}
 			new_vec.push_back(hole_extent);
-			ipos += new_vec.size();
+			ipos += hole_extent.size();
 		}
+		// Extent list must now be non-empty, at least a hole
 		THROW_CHECK1(runtime_error, new_vec.size(), !new_vec.empty());
 
-		// Allow last extent to extend beyond desired range (e.g. at EOF)
-		THROW_CHECK2(runtime_error, ipos, new_vec.rbegin()->m_end, ipos <= new_vec.rbegin()->m_end);
+		// ipos must match end of last extent
+		THROW_CHECK3(runtime_error, ipos, new_vec.rbegin()->m_end, m_stat.st_size, ipos == new_vec.rbegin()->m_end);
+
 		// If we have the last extent in the file, truncate it to the file size.
 		if (ipos >= m_stat.st_size) {
 			THROW_CHECK2(runtime_error, new_vec.rbegin()->m_begin, m_stat.st_size, m_stat.st_size > new_vec.rbegin()->m_begin);
@@ -340,9 +369,10 @@ namespace crucible {
 			new_vec.rbegin()->m_end = m_stat.st_size;
 		}
 
-		// Verify contiguous, ascending order, at least one Extent
+		// Verify at least one Extent
 		THROW_CHECK1(runtime_error, new_vec, !new_vec.empty());
 
+		// Verify contiguous, ascending order, only extent with FIEMAP_EXTENT_LAST flag is the last extent
 		ipos = new_vec.begin()->m_begin;
 		bool last_flag_last = false;
 		for (auto e : new_vec) {
@@ -352,7 +382,6 @@ namespace crucible {
 			ipos += e.size();
 			last_flag_last = e.m_flags & FIEMAP_EXTENT_LAST;
 		}
-		THROW_CHECK1(runtime_error, new_vec, !last_extent_is_last || new_vec.rbegin()->m_end == ipos);
 
 		m_extents = new_vec;
 		m_current = m_extents.begin();
@@ -368,7 +397,7 @@ namespace crucible {
 	void
 	ExtentWalker::seek(off_t pos)
 	{
-		CHATTER_UNWIND("seek " << to_hex(pos));
+		EWTRACE("seek " << to_hex(pos));
 		THROW_CHECK1(out_of_range, pos, pos >= 0);
 		Itr rv = find_in_cache(pos);
 		if (rv != m_extents.end()) {
@@ -377,29 +406,28 @@ namespace crucible {
 		}
 		run_fiemap(pos);
 		m_current = find_in_cache(pos);
+		THROW_CHECK2(runtime_error, *this, to_hex(pos), m_current != m_extents.end());
 	}
 
 	Extent
 	ExtentWalker::current()
 	{
 		THROW_CHECK2(invalid_argument, *this, m_extents.size(), m_current != m_extents.end());
-		CHATTER_UNWIND("current " << *m_current);
 		return *m_current;
 	}
 
-
 	bool
 	ExtentWalker::next()
 	{
-		CHATTER_UNWIND("next");
+		EWTRACE("next");
 		THROW_CHECK1(invalid_argument, (m_current != m_extents.end()), m_current != m_extents.end());
 		if (current().m_end >= m_stat.st_size) {
-			CHATTER_UNWIND("next EOF");
+			EWTRACE("next EOF");
 			return false;
 		}
 		auto next_pos = current().m_end;
 		if (next_pos >= m_stat.st_size) {
-			CHATTER_UNWIND("next next_pos = " << next_pos << " m_stat.st_size = " << m_stat.st_size);
+			EWTRACE("next next_pos = " << next_pos << " m_stat.st_size = " << m_stat.st_size);
 			return false;
 		}
 		seek(next_pos);
@@ -417,16 +445,16 @@ namespace crucible {
 	bool
 	ExtentWalker::prev()
 	{
-		CHATTER_UNWIND("prev");
+		EWTRACE("prev");
 		THROW_CHECK1(invalid_argument, (m_current != m_extents.end()), m_current != m_extents.end());
 		auto prev_iter = m_current;
 		if (prev_iter->m_begin == 0) {
-			CHATTER_UNWIND("prev BOF");
+			EWTRACE("prev BOF");
 			return false;
 		}
 		THROW_CHECK1(invalid_argument, (prev_iter != m_extents.begin()), prev_iter != m_extents.begin());
 		--prev_iter;
-		CHATTER_UNWIND("prev seeking to " << *prev_iter << "->m_begin");
+		EWTRACE("prev seeking to " << *prev_iter << "->m_begin");
 		auto prev_end = current().m_begin;
 		seek(prev_iter->m_begin);
 		THROW_CHECK1(runtime_error, (m_current != m_extents.end()), m_current != m_extents.end());
@@ -485,7 +513,7 @@ namespace crucible {
 		sk.min_type = sk.max_type = BTRFS_EXTENT_DATA_KEY;
 		sk.nr_items = sc_extent_fetch_max;
 
-		CHATTER_UNWIND("sk " << sk << " root_fd " << name_fd(m_root_fd));
+		EWTRACE("sk " << sk << " root_fd " << name_fd(m_root_fd));
 		sk.do_ioctl(m_root_fd);
 
 		Vec rv;
@@ -511,37 +539,38 @@ namespace crucible {
 
 			Extent e;
 			e.m_begin = i.offset;
-			auto compressed = call_btrfs_get(btrfs_stack_file_extent_compression, i.m_data);
+			auto compressed = btrfs_get_member(&btrfs_file_extent_item::compression, i.m_data);
 			// FIEMAP told us about compressed extents and we can too
 			if (compressed) {
 				e.m_flags |= FIEMAP_EXTENT_ENCODED;
 			}
 
-			auto type = call_btrfs_get(btrfs_stack_file_extent_type, i.m_data);
+			auto type = btrfs_get_member(&btrfs_file_extent_item::type, i.m_data);
 			off_t len = -1;
-                        switch (type) {
-                                default:
+			switch (type) {
+				default:
 					cerr << "Unhandled file extent type " << type << " in root " << m_tree_id << " ino " << m_stat.st_ino << endl;
 					break;
-                                case BTRFS_FILE_EXTENT_INLINE:
-					len = ranged_cast<off_t>(call_btrfs_get(btrfs_stack_file_extent_ram_bytes, i.m_data));
+				case BTRFS_FILE_EXTENT_INLINE:
+					len = ranged_cast<off_t>(btrfs_get_member(&btrfs_file_extent_item::ram_bytes, i.m_data));
 					e.m_flags |= FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_NOT_ALIGNED;
 					// Inline extents are never obscured, so don't bother filling in m_physical_len, etc.
-                                        break;
-                                case BTRFS_FILE_EXTENT_PREALLOC:
+					break;
+				case BTRFS_FILE_EXTENT_PREALLOC:
 					e.m_flags |= Extent::PREALLOC;
-                                case BTRFS_FILE_EXTENT_REG: {
-					e.m_physical = call_btrfs_get(btrfs_stack_file_extent_disk_bytenr, i.m_data);
+					// fallthrough
+				case BTRFS_FILE_EXTENT_REG: {
+					e.m_physical = btrfs_get_member(&btrfs_file_extent_item::disk_bytenr, i.m_data);
 
 					// This is the length of the full extent (decompressed)
-                                        off_t ram = ranged_cast<off_t>(call_btrfs_get(btrfs_stack_file_extent_ram_bytes, i.m_data));
+					off_t ram = ranged_cast<off_t>(btrfs_get_member(&btrfs_file_extent_item::ram_bytes, i.m_data));
 
 					// This is the length of the part of the extent appearing in the file (decompressed)
-                                        len = ranged_cast<off_t>(call_btrfs_get(btrfs_stack_file_extent_num_bytes, i.m_data));
+					len = ranged_cast<off_t>(btrfs_get_member(&btrfs_file_extent_item::num_bytes, i.m_data));
 
 					// This is the offset from start of on-disk extent to the part we see in the file (decompressed)
 					// May be negative due to the kind of bug we're stuck with forever, so no cast range check
-					off_t offset = call_btrfs_get(btrfs_stack_file_extent_offset, i.m_data);
+					off_t offset = btrfs_get_member(&btrfs_file_extent_item::offset, i.m_data);
 
 					// If there is a physical address there must be size too
 					if (e.m_physical) {
@@ -594,7 +623,7 @@ namespace crucible {
 					e.m_flags |= FIEMAP_EXTENT_LAST;
 				}
 				// FIXME:  no FIEMAP_EXTENT_SHARED
-				// WONTFIX:  non-trivial to replicate LOGIAL_INO
+				// WONTFIX:  non-trivial to replicate LOGICAL_INO
 				rv.push_back(e);
 			}
 		}
@@ -610,9 +639,8 @@ namespace crucible {
 	ExtentWalker::Vec
 	ExtentWalker::get_extent_map(off_t pos)
 	{
-		Fiemap fm;
-		fm.fm_start = ranged_cast<uint64_t>(pos);
-		fm.fm_length = ranged_cast<uint64_t>(numeric_limits<off_t>::max() - pos);
+		EWLOG("get_extent_map(" << to_hex(pos) << ")");
+		Fiemap fm(ranged_cast<uint64_t>(pos), ranged_cast<uint64_t>(numeric_limits<off_t>::max() - pos));
 		fm.m_max_count = fm.m_min_count = sc_extent_fetch_max;
 		fm.do_ioctl(m_fd);
 		Vec rv;
@@ -623,7 +651,9 @@ namespace crucible {
 			e.m_physical = i.fe_physical;
 			e.m_flags = i.fe_flags;
 			rv.push_back(e);
+			EWLOG("push_back(" << e << ")");
 		}
+		EWLOG("get_extent_map(" << to_hex(pos) << ") returning " << rv.size() << " extents");
 		return rv;
 	}
 

lib/fd.cc

@@ -107,12 +107,6 @@ namespace crucible {
 		}
 	}
 
-	IOHandle::IOHandle() :
-		m_fd(-1)
-	{
-		CHATTER_TRACE("open fd " << m_fd << " in " << this);
-	}
-
 	IOHandle::IOHandle(int fd) :
 		m_fd(fd)
 	{
@@ -120,12 +114,52 @@ namespace crucible {
 	}
 
 	int
-	IOHandle::release_fd()
+	IOHandle::get_fd() const
 	{
-		CHATTER_TRACE("release fd " << m_fd << " in " << this);
-		int rv = m_fd;
-		m_fd = -1;
-		return rv;
+		return m_fd;
+	}
+
+	NamedPtr<IOHandle, int> Fd::s_named_ptr([](int fd) { return make_shared<IOHandle>(fd); });
+
+	Fd::Fd() :
+		m_handle(s_named_ptr(-1))
+	{
+	}
+
+	Fd::Fd(int fd) :
+		m_handle(s_named_ptr(fd < 0 ? -1 : fd))
+	{
+	}
+
+	Fd &
+	Fd::operator=(int const fd)
+	{
+		m_handle = s_named_ptr(fd < 0 ? -1 : fd);
+		return *this;
+	}
+
+	Fd &
+	Fd::operator=(const shared_ptr<IOHandle> &handle)
+	{
+		m_handle = s_named_ptr.insert(handle, handle->get_fd());
+		return *this;
+	}
+
+	Fd::operator int() const
+	{
+		return m_handle->get_fd();
+	}
+
+	bool
+	Fd::operator!() const
+	{
+		return m_handle->get_fd() < 0;
+	}
+
+	shared_ptr<IOHandle>
+	Fd::operator->() const
+	{
+		return m_handle;
 	}
 
 	// XXX: necessary?  useful?
@@ -174,11 +208,13 @@ namespace crucible {
 	static const struct bits_ntoa_table mmap_flags_table[] = {
 		NTOA_TABLE_ENTRY_BITS(MAP_SHARED),
 		NTOA_TABLE_ENTRY_BITS(MAP_PRIVATE),
+#ifdef MAP_32BIT
 		NTOA_TABLE_ENTRY_BITS(MAP_32BIT),
+#endif
 		NTOA_TABLE_ENTRY_BITS(MAP_ANONYMOUS),
 		NTOA_TABLE_ENTRY_BITS(MAP_DENYWRITE),
 		NTOA_TABLE_ENTRY_BITS(MAP_EXECUTABLE),
-#if MAP_FILE
+#ifdef MAP_FILE
 		NTOA_TABLE_ENTRY_BITS(MAP_FILE),
 #endif
 		NTOA_TABLE_ENTRY_BITS(MAP_FIXED),
@@ -230,6 +266,14 @@ namespace crucible {
 		}
 	}
 
+	void
+	ftruncate_or_die(int fd, off_t size)
+	{
+		if (::ftruncate(fd, size)) {
+			THROW_ERRNO("ftruncate: " << name_fd(fd) << " size " << size);
+		}
+	}
+
 	string
 	socket_domain_ntoa(int domain)
 	{
@@ -317,8 +361,11 @@ namespace crucible {
                         THROW_ERROR(invalid_argument, "pwrite: trying to write on a closed file descriptor");
                 }
 		int rv = ::pwrite(fd, buf, size, offset);
-		if (rv != static_cast<int>(size)) {
-			THROW_ERROR(runtime_error, "pwrite: only " << rv << " of " << size << " bytes written at offset " << offset);
+		if (rv < 0) {
+			THROW_ERRNO("pwrite: could not write " << size << " bytes at fd " << name_fd(fd) << " offset " << offset);
+		}
+		if (rv != static_cast<ssize_t>(size)) {
+			THROW_ERROR(runtime_error, "pwrite: only " << rv << " of " << size << " bytes written at fd " << name_fd(fd) << " offset " << offset);
 		}
 	}
 
@@ -348,7 +395,7 @@ namespace crucible {
 				}
 				THROW_ERRNO("read: " << size << " bytes");
 			}
-			if (rv > static_cast<int>(size)) {
+			if (rv > static_cast<ssize_t>(size)) {
 				THROW_ERROR(runtime_error, "read: somehow read more bytes (" << rv << ") than requested (" << size << ")");
 			}
 			if (rv == 0) break;
@@ -397,8 +444,8 @@ namespace crucible {
 					}
 					THROW_ERRNO("pread: " << size << " bytes");
 				}
-				if (rv != static_cast<int>(size)) {
-					THROW_ERROR(runtime_error, "pread: " << size << " bytes at offset " << offset << " returned " << rv);
+				if (rv != static_cast<ssize_t>(size)) {
+					THROW_ERROR(runtime_error, "pread: " << size << " bytes at fd " << name_fd(fd) << " offset " << offset << " returned " << rv);
 				}
 				break;
 			}
@@ -414,21 +461,28 @@ namespace crucible {
 
 	template<>
 	void
-	pread_or_die<vector<char>>(int fd, vector<char> &text, off_t offset)
+	pread_or_die<ByteVector>(int fd, ByteVector &text, off_t offset)
 	{
 		return pread_or_die(fd, text.data(), text.size(), offset);
 	}
 
 	template<>
 	void
-	pread_or_die<vector<uint8_t>>(int fd, vector<uint8_t> &text, off_t offset)
+	pwrite_or_die<ByteVector>(int fd, const ByteVector &text, off_t offset)
 	{
-		return pread_or_die(fd, text.data(), text.size(), offset);
+		return pwrite_or_die(fd, text.data(), text.size(), offset);
 	}
 
-	Stat::Stat()
+	template<>
+	void
+	pwrite_or_die<string>(int fd, const string &text, off_t offset)
+	{
+		return pwrite_or_die(fd, text.data(), text.size(), offset);
+	}
+
+	Stat::Stat() :
+		stat( (stat) { } )
 	{
-		memset_zero<stat>(this);
 	}
 
 	Stat &
@@ -447,18 +501,39 @@ namespace crucible {
 		return *this;
 	}
 
-	Stat::Stat(int fd)
+	Stat::Stat(int fd) :
+		stat( (stat) { } )
 	{
-		memset_zero<stat>(this);
 		fstat(fd);
 	}
 
-	Stat::Stat(const string &filename)
+	Stat::Stat(const string &filename) :
+		stat( (stat) { } )
 	{
-		memset_zero<stat>(this);
 		lstat(filename);
 	}
 
+	int
+	ioctl_iflags_get(int fd)
+	{
+		int attr = 0;
+		DIE_IF_MINUS_ONE(ioctl(fd, FS_IOC_GETFLAGS, &attr));
+		return attr;
+	}
+
+	void
+	ioctl_iflags_set(int fd, int attr)
+	{
+		// This bit of nonsense brought to you by Valgrind.
+		union {
+			int attr;
+			long zero;
+		} u;
+		u.zero = 0;
+		u.attr = attr;
+		DIE_IF_MINUS_ONE(ioctl(fd, FS_IOC_SETFLAGS, &u.attr));
+	}
+
 	string
 	readlink_or_die(const string &path)
 	{
@@ -484,6 +559,24 @@ namespace crucible {
 		THROW_ERROR(runtime_error, "readlink: maximum buffer size exceeded");
 	}
 
+	static string __relative_path;
+
+	string
+	relative_path()
+	{
+		return __relative_path;
+	}
+
+	void
+	set_relative_path(string path)
+	{
+		path = path + "/";
+		for (string::size_type i = path.find("//"); i != string::npos; i = path.find("//")) {
+			path.erase(i, 1);
+		}
+		__relative_path = path;
+	}
+
 	// Turn a FD into a human-recognizable filename OR an error message.
 	string
 	name_fd(int fd)
@@ -491,7 +584,12 @@ namespace crucible {
 		try {
 			ostringstream oss;
 			oss << "/proc/self/fd/" << fd;
-			return readlink_or_die(oss.str());
+			string path = readlink_or_die(oss.str());
+			if (!__relative_path.empty() && 0 == path.find(__relative_path))
+			{
+				path.erase(0, __relative_path.length());
+			}
+			return path;
 		} catch (exception &e) {
 			return string(e.what());
 		}

lib/fs.cc

@@ -2,10 +2,10 @@
 
 #include "crucible/error.h"
 #include "crucible/fd.h"
+#include "crucible/hexdump.h"
 #include "crucible/limits.h"
 #include "crucible/ntoa.h"
 #include "crucible/string.h"
-#include "crucible/uuid.h"
 
 // FS_IOC_FIEMAP
 #include <linux/fs.h>
@@ -33,19 +33,11 @@ namespace crucible {
 #endif
 	}
 
-	BtrfsExtentInfo::BtrfsExtentInfo(int dst_fd, off_t dst_offset)
-	{
-		memset_zero<btrfs_ioctl_same_extent_info>(this);
-		fd = dst_fd;
-		logical_offset = dst_offset;
-	}
-
 	BtrfsExtentSame::BtrfsExtentSame(int src_fd, off_t src_offset, off_t src_length) :
+		m_logical_offset(src_offset),
+		m_length(src_length),
 		m_fd(src_fd)
 	{
-		memset_zero<btrfs_ioctl_same_args>(this);
-		logical_offset = src_offset;
-		length = src_length;
 	}
 
 	BtrfsExtentSame::~BtrfsExtentSame()
@@ -53,9 +45,12 @@ namespace crucible {
 	}
 
 	void
-	BtrfsExtentSame::add(int fd, off_t offset)
+	BtrfsExtentSame::add(int const fd, uint64_t const offset)
 	{
-		m_info.push_back(BtrfsExtentInfo(fd, offset));
+		m_info.push_back( (btrfs_ioctl_same_extent_info) {
+			.fd = fd,
+			.logical_offset = offset,
+		});
 	}
 
 	ostream &
@@ -112,11 +107,8 @@ namespace crucible {
 				os << " '" << fd_name << "'";
 			});
 		}
-		os << ", .logical_offset = " << to_hex(bes.logical_offset);
-		os << ", .length = " << to_hex(bes.length);
-		os << ", .dest_count = " << bes.dest_count;
-		os << ", .reserved1 = " << bes.reserved1;
-		os << ", .reserved2 = " << bes.reserved2;
+		os << ", .logical_offset = " << to_hex(bes.m_logical_offset);
+		os << ", .length = " << to_hex(bes.m_length);
 		os << ", .info[] = {";
 		for (size_t i = 0; i < bes.m_info.size(); ++i) {
 			os << " [" << i << "] = " << &(bes.m_info[i]) << ",";
@@ -127,67 +119,25 @@ namespace crucible {
 	void
 	btrfs_clone_range(int src_fd, off_t src_offset, off_t src_length, int dst_fd, off_t dst_offset)
 	{
-		struct btrfs_ioctl_clone_range_args args;
-		memset_zero(&args);
-		args.src_fd = src_fd;
-		args.src_offset = src_offset;
-		args.src_length = src_length;
-		args.dest_offset = dst_offset;
+		btrfs_ioctl_clone_range_args args ( (btrfs_ioctl_clone_range_args) {
+			.src_fd = src_fd,
+			.src_offset = ranged_cast<uint64_t, off_t>(src_offset),
+			.src_length = ranged_cast<uint64_t, off_t>(src_length),
+			.dest_offset = ranged_cast<uint64_t, off_t>(dst_offset),
+		} );
 		DIE_IF_MINUS_ONE(ioctl(dst_fd, BTRFS_IOC_CLONE_RANGE, &args));
 	}
 
-	// Userspace emulation of extent-same ioctl to work around kernel bugs
-	// (a memory leak, a deadlock, inability to cope with unaligned EOF, and a length limit)
-	// The emulation is incomplete:  no locking, and we always change ctime
-	void
-	BtrfsExtentSameByClone::do_ioctl()
-	{
-		if (length <= 0) {
-			throw out_of_range(string("length = 0 in ") + __PRETTY_FUNCTION__);
-		}
-		vector<char> cmp_buf_common(length);
-		vector<char> cmp_buf_iter(length);
-		pread_or_die(m_fd, cmp_buf_common.data(), length, logical_offset);
-		for (auto i = m_info.begin(); i != m_info.end(); ++i) {
-			i->status = -EIO;
-			i->bytes_deduped = 0;
-
-			// save atime/ctime for later
-			Stat target_stat(i->fd);
-
-			pread_or_die(i->fd, cmp_buf_iter.data(), length, i->logical_offset);
-			if (cmp_buf_common == cmp_buf_iter) {
-
-				// This never happens, so stop checking.
-				// assert(!memcmp(cmp_buf_common.data(), cmp_buf_iter.data(), length));
-
-				btrfs_clone_range(m_fd, logical_offset, length, i->fd, i->logical_offset);
-				i->status = 0;
-				i->bytes_deduped = length;
-
-				// The extent-same ioctl does not change mtime (as of patch v4)
-				struct timespec restore_ts[2] = {
-					target_stat.st_atim,
-					target_stat.st_mtim
-				};
-
-				// Ignore futimens failure as the real extent-same ioctl would never raise it
-				futimens(i->fd, restore_ts);
-
-			} else {
-				assert(memcmp(cmp_buf_common.data(), cmp_buf_iter.data(), length));
-				i->status = BTRFS_SAME_DATA_DIFFERS;
-			}
-		}
-	}
-
 	void
 	BtrfsExtentSame::do_ioctl()
 	{
-		dest_count = m_info.size();
-		vector<char> ioctl_arg = vector_copy_struct<btrfs_ioctl_same_args>(this);
-		ioctl_arg.resize(sizeof(btrfs_ioctl_same_args) + dest_count * sizeof(btrfs_ioctl_same_extent_info), 0);
-		btrfs_ioctl_same_args *ioctl_ptr = reinterpret_cast<btrfs_ioctl_same_args *>(ioctl_arg.data());
+		const size_t buf_size = sizeof(btrfs_ioctl_same_args) + m_info.size() * sizeof(btrfs_ioctl_same_extent_info);
+		ByteVector ioctl_arg( (btrfs_ioctl_same_args) {
+			.logical_offset = m_logical_offset,
+			.length = m_length,
+			.dest_count = ranged_cast<decltype(btrfs_ioctl_same_args::dest_count)>(m_info.size()),
+		}, buf_size);
+		btrfs_ioctl_same_args *const ioctl_ptr = ioctl_arg.get<btrfs_ioctl_same_args>();
 		size_t count = 0;
 		for (auto i = m_info.cbegin(); i != m_info.cend(); ++i) {
 			ioctl_ptr->info[count] = static_cast<const btrfs_ioctl_same_extent_info &>(m_info[count]);
@@ -233,23 +183,22 @@ namespace crucible {
 	}
 
 	BtrfsDataContainer::BtrfsDataContainer(size_t buf_size) :
-		m_data(buf_size, 0)
+		m_data(buf_size)
 	{
 	}
 
 	void *
-	BtrfsDataContainer::prepare()
+	BtrfsDataContainer::prepare(size_t container_size)
 	{
-		btrfs_data_container *p = reinterpret_cast<btrfs_data_container *>(m_data.data());
-		size_t min_size = offsetof(btrfs_data_container, val);
-		size_t container_size = m_data.size();
+		const size_t min_size = offsetof(btrfs_data_container, val);
 		if (container_size < min_size) {
 			THROW_ERROR(out_of_range, "container size " << container_size << " smaller than minimum " << min_size);
 		}
-		p->bytes_left = 0;
-		p->bytes_missing = 0;
-		p->elem_cnt = 0;
-		p->elem_missed = 0;
+		if (m_data.size() < container_size) {
+			m_data = ByteVector(container_size);
+		}
+		const auto p = m_data.get<btrfs_data_container>();
+		*p = (btrfs_data_container) { };
 		return p;
 	}
 
@@ -262,25 +211,29 @@ namespace crucible {
 	decltype(btrfs_data_container::bytes_left)
 	BtrfsDataContainer::get_bytes_left() const
 	{
-		return bytes_left;
+		const auto p = m_data.get<btrfs_data_container>();
+		return p->bytes_left;
 	}
 
 	decltype(btrfs_data_container::bytes_missing)
 	BtrfsDataContainer::get_bytes_missing() const
 	{
-		return bytes_missing;
+		const auto p = m_data.get<btrfs_data_container>();
+		return p->bytes_missing;
 	}
 
 	decltype(btrfs_data_container::elem_cnt)
 	BtrfsDataContainer::get_elem_cnt() const
 	{
-		return elem_cnt;
+		const auto p = m_data.get<btrfs_data_container>();
+		return p->elem_cnt;
 	}
 
 	decltype(btrfs_data_container::elem_missed)
 	BtrfsDataContainer::get_elem_missed() const
 	{
-		return elem_missed;
+		const auto p = m_data.get<btrfs_data_container>();
+		return p->elem_missed;
 	}
 
 	ostream &
@@ -290,7 +243,7 @@ namespace crucible {
 			return os << "BtrfsIoctlLogicalInoArgs NULL";
 		}
 		os << "BtrfsIoctlLogicalInoArgs {";
-		os << " .logical = " << to_hex(p->logical);
+		os << " .m_logical = " << to_hex(p->m_logical);
 		os << " .inodes[] = {\n";
 		unsigned count = 0;
 		for (auto i = p->m_iors.cbegin(); i != p->m_iors.cend(); ++i) {
@@ -301,33 +254,122 @@ namespace crucible {
 	}
 
 	BtrfsIoctlLogicalInoArgs::BtrfsIoctlLogicalInoArgs(uint64_t new_logical, size_t new_size) :
-		m_container(new_size)
+		m_container_size(new_size),
+		m_container(new_size),
+		m_logical(new_logical)
 	{
-		memset_zero<btrfs_ioctl_logical_ino_args>(this);
-		logical = new_logical;
+	}
+
+	size_t
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::size() const
+	{
+		return m_end - m_begin;
+	}
+
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::const_iterator
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::cbegin() const
+	{
+		return m_begin;
+	}
+
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::const_iterator
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::cend() const
+	{
+		return m_end;
+	}
+
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::iterator
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::begin() const
+	{
+		return m_begin;
+	}
+
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::iterator
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::end() const
+	{
+		return m_end;
+	}
+
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::iterator
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::data() const
+	{
+		return m_begin;
+	}
+
+	void
+	BtrfsIoctlLogicalInoArgs::BtrfsInodeOffsetRootSpan::clear()
+	{
+		m_end = m_begin = nullptr;
+	}
+
+	void
+	BtrfsIoctlLogicalInoArgs::set_flags(uint64_t new_flags)
+	{
+		m_flags = new_flags;
+	}
+
+	uint64_t
+	BtrfsIoctlLogicalInoArgs::get_flags() const
+	{
+		// We are still supporting building with old headers that don't have .flags yet
+		return m_flags;
 	}
 
 	bool
 	BtrfsIoctlLogicalInoArgs::do_ioctl_nothrow(int fd)
 	{
-		btrfs_ioctl_logical_ino_args *p = static_cast<btrfs_ioctl_logical_ino_args *>(this);
-		inodes = reinterpret_cast<uint64_t>(m_container.prepare());
-		size = m_container.get_size();
+		btrfs_ioctl_logical_ino_args args = (btrfs_ioctl_logical_ino_args) {
+			.logical = m_logical,
+			.size = m_container_size,
+			.inodes = reinterpret_cast<uint64_t>(m_container.prepare(m_container_size)),
+		};
+		// We are still supporting building with old headers that don't have .flags yet
+		*(&args.reserved[0] + 3) = m_flags;
+
+		btrfs_ioctl_logical_ino_args *const p = &args;
 
 		m_iors.clear();
 
-		if (ioctl(fd, BTRFS_IOC_LOGICAL_INO, p)) {
-			return false;
+		static unsigned long bili_version = 0;
+
+		if (get_flags() == 0) {
+			// Could use either V1 or V2
+			if (bili_version) {
+				// We tested both versions and came to a decision
+				if (ioctl(fd, bili_version, p)) {
+					return false;
+				}
+			}  else {
+				// Try V2
+				if (ioctl(fd, BTRFS_IOC_LOGICAL_INO_V2, p)) {
+					// V2 failed, try again with V1
+					if (ioctl(fd, BTRFS_IOC_LOGICAL_INO, p)) {
+						// both V1 and V2 failed, doesn't tell us which one to choose
+						return false;
+					}
+					// V1 and V2 both tested with same arguments, V1 OK, and V2 failed
+					bili_version = BTRFS_IOC_LOGICAL_INO;
+				} else {
+					// V2 succeeded, don't use V1 any more
+					bili_version = BTRFS_IOC_LOGICAL_INO_V2;
+				}
+			}
+		} else {
+			// Flags/size require a V2 feature, no fallback to V1 possible
+			if (ioctl(fd, BTRFS_IOC_LOGICAL_INO_V2, p)) {
+				return false;
+			}
+			// V2 succeeded so we don't need to probe any more
+			bili_version = BTRFS_IOC_LOGICAL_INO_V2;
 		}
 
-		btrfs_data_container *bdc = reinterpret_cast<btrfs_data_container *>(p->inodes);
-		BtrfsInodeOffsetRoot *input_iter = reinterpret_cast<BtrfsInodeOffsetRoot *>(bdc->val);
-		m_iors.reserve(bdc->elem_cnt);
-
-		for (auto count = bdc->elem_cnt; count > 2; count -= 3) {
-			m_iors.push_back(*input_iter++);
-		}
+		btrfs_data_container *const bdc = reinterpret_cast<btrfs_data_container *>(p->inodes);
+		BtrfsInodeOffsetRoot *const ior_iter = reinterpret_cast<BtrfsInodeOffsetRoot *>(bdc->val);
 
+		// elem_cnt counts uint64_t, but BtrfsInodeOffsetRoot is 3x uint64_t
+		THROW_CHECK1(runtime_error, bdc->elem_cnt, bdc->elem_cnt % 3 == 0);
+		m_iors.m_begin = ior_iter;
+		m_iors.m_end = ior_iter + bdc->elem_cnt / 3;
 		return true;
 	}
 
@@ -350,9 +392,10 @@ namespace crucible {
 	}
 
 	BtrfsIoctlInoPathArgs::BtrfsIoctlInoPathArgs(uint64_t inode, size_t new_size) :
-		m_container(new_size)
+		btrfs_ioctl_ino_path_args( (btrfs_ioctl_ino_path_args) { } ),
+		m_container_size(new_size)
 	{
-		memset_zero<btrfs_ioctl_ino_path_args>(this);
+		assert(inum == 0);
 		inum = inode;
 	}
 
@@ -360,8 +403,9 @@ namespace crucible {
 	BtrfsIoctlInoPathArgs::do_ioctl_nothrow(int fd)
 	{
 		btrfs_ioctl_ino_path_args *p = static_cast<btrfs_ioctl_ino_path_args *>(this);
-		fspath = reinterpret_cast<uint64_t>(m_container.prepare());
-		size = m_container.get_size();
+		BtrfsDataContainer container(m_container_size);
+		fspath = reinterpret_cast<uint64_t>(container.prepare(m_container_size));
+		size = container.get_size();
 
 		m_paths.clear();
 
@@ -369,16 +413,16 @@ namespace crucible {
 			return false;
 		}
 
-		btrfs_data_container *bdc = reinterpret_cast<btrfs_data_container *>(p->fspath);
+		btrfs_data_container *const bdc = reinterpret_cast<btrfs_data_container *>(p->fspath);
 		m_paths.reserve(bdc->elem_cnt);
 
 		const uint64_t *up = reinterpret_cast<const uint64_t *>(bdc->val);
-		const char *cp = reinterpret_cast<const char *>(bdc->val);
+		const char *const cp = reinterpret_cast<const char *>(bdc->val);
 
 		for (auto count = bdc->elem_cnt; count > 0; --count) {
-			const char *path = cp + *up++;
-			if (static_cast<size_t>(path - cp) > m_container.get_size()) {
-				THROW_ERROR(out_of_range, "offset " << (path - cp) << " > size " << m_container.get_size() << " in " << __PRETTY_FUNCTION__);
+			const char *const path = cp + *up++;
+			if (static_cast<size_t>(path - cp) > container.get_size()) {
+				THROW_ERROR(out_of_range, "offset " << (path - cp) << " > size " << container.get_size() << " in " << __PRETTY_FUNCTION__);
 			}
 			m_paths.push_back(string(path));
 		}
@@ -411,9 +455,10 @@ namespace crucible {
 		return os;
 	}
 
-	BtrfsIoctlInoLookupArgs::BtrfsIoctlInoLookupArgs(uint64_t new_objectid)
+	BtrfsIoctlInoLookupArgs::BtrfsIoctlInoLookupArgs(uint64_t new_objectid) :
+		btrfs_ioctl_ino_lookup_args( (btrfs_ioctl_ino_lookup_args) { } )
 	{
-		memset_zero<btrfs_ioctl_ino_lookup_args>(this);
+		assert(objectid == 0);
 		objectid = new_objectid;
 	}
 
@@ -431,9 +476,9 @@ namespace crucible {
 		}
 	}
 
-	BtrfsIoctlDefragRangeArgs::BtrfsIoctlDefragRangeArgs()
+	BtrfsIoctlDefragRangeArgs::BtrfsIoctlDefragRangeArgs() :
+		btrfs_ioctl_defrag_range_args( (btrfs_ioctl_defrag_range_args) { } )
 	{
-		memset_zero<btrfs_ioctl_defrag_range_args>(this);
 	}
 
 	bool
@@ -463,11 +508,13 @@ namespace crucible {
 	}
 
 	string
-	btrfs_ioctl_defrag_range_compress_type_ntoa(uint32_t compress_type)
+	btrfs_compress_type_ntoa(uint8_t compress_type)
 	{
 		static const bits_ntoa_table table[] = {
+			NTOA_TABLE_ENTRY_ENUM(BTRFS_COMPRESS_NONE),
 			NTOA_TABLE_ENTRY_ENUM(BTRFS_COMPRESS_ZLIB),
 			NTOA_TABLE_ENTRY_ENUM(BTRFS_COMPRESS_LZO),
+			NTOA_TABLE_ENTRY_ENUM(BTRFS_COMPRESS_ZSTD),
 			NTOA_TABLE_ENTRY_END()
 		};
 		return bits_ntoa(compress_type, table);
@@ -484,14 +531,14 @@ namespace crucible {
 		os << " .len = " << p->len;
 		os << " .flags = " << btrfs_ioctl_defrag_range_flags_ntoa(p->flags);
 		os << " .extent_thresh = " << p->extent_thresh;
-		os << " .compress_type = " << btrfs_ioctl_defrag_range_compress_type_ntoa(p->compress_type);
+		os << " .compress_type = " << btrfs_compress_type_ntoa(p->compress_type);
 		os << " .unused[4] = { " << p->unused[0] << ", " << p->unused[1] << ", " << p->unused[2] << ", " << p->unused[3] << "} }";
 		return os;
 	}
 
-	FiemapExtent::FiemapExtent()
+	FiemapExtent::FiemapExtent() :
+		fiemap_extent( (fiemap_extent) { } )
 	{
-		memset_zero<fiemap_extent>(this);
 	}
 
 	FiemapExtent::FiemapExtent(const fiemap_extent &that)
@@ -598,13 +645,10 @@ namespace crucible {
 	operator<<(ostream &os, const Fiemap &args)
 	{
 		os << "Fiemap {";
-		os << " .fm_start = " << to_hex(args.fm_start) << ".." << to_hex(args.fm_start + args.fm_length);
-		os << ", .fm_length = " << to_hex(args.fm_length);
-		if (args.fm_flags) os << ", .fm_flags = " << fiemap_flags_ntoa(args.fm_flags);
-		os << ", .fm_mapped_extents = " << args.fm_mapped_extents;
-		os << ", .fm_extent_count = " << args.fm_extent_count;
-		if (args.fm_reserved) os << ", .fm_reserved = " << args.fm_reserved;
-		os << ", .fm_extents[] = {";
+		os << " .m_start = " << to_hex(args.m_start) << ".." << to_hex(args.m_start + args.m_length);
+		os << ", .m_length = " << to_hex(args.m_length);
+		os << ", .m_flags = " << fiemap_flags_ntoa(args.m_flags);
+		os << ", .fm_extents[" << args.m_extents.size() << "] = {";
 		size_t count = 0;
 		for (auto i = args.m_extents.cbegin(); i != args.m_extents.cend(); ++i) {
 			os << "\n\t[" << count++ << "] = " << &(*i) << ",";
@@ -612,41 +656,35 @@ namespace crucible {
 		return os << "\n}";
 	}
 
-	Fiemap::Fiemap(uint64_t start, uint64_t length)
+	Fiemap::Fiemap(uint64_t start, uint64_t length) :
+		m_start(start),
+		m_length(length)
 	{
-		memset_zero<fiemap>(this);
-		fm_start = start;
-		fm_length = length;
-		// FIEMAP is slow and full of lines.
-		// This makes FIEMAP even slower, but reduces the lies a little.
-		fm_flags = FIEMAP_FLAG_SYNC;
 	}
 
 	void
 	Fiemap::do_ioctl(int fd)
 	{
-		CHECK_CONSTRAINT(m_min_count, m_min_count <= m_max_count);
+		THROW_CHECK1(out_of_range, m_min_count, m_min_count <= m_max_count);
+		THROW_CHECK1(out_of_range, m_min_count, m_min_count > 0);
 
-		auto extent_count = m_min_count;
-		vector<char> ioctl_arg = vector_copy_struct<fiemap>(this);
+		const auto extent_count = m_min_count;
+		ByteVector ioctl_arg(sizeof(fiemap) + extent_count * sizeof(fiemap_extent));
 
-		ioctl_arg.resize(sizeof(fiemap) + extent_count * sizeof(fiemap_extent), 0);
+		fiemap *const ioctl_ptr = ioctl_arg.get<fiemap>();
 
-		fiemap *ioctl_ptr = reinterpret_cast<fiemap *>(ioctl_arg.data());
-
-		auto start = fm_start;
-		auto end = fm_start + fm_length;
-
-		auto orig_start = fm_start;
-		auto orig_length = fm_length;
+		auto start = m_start;
+		const auto end = m_start + m_length;
 
 		vector<FiemapExtent> extents;
 
 		while (start < end && extents.size() < m_max_count) {
-			ioctl_ptr->fm_start = start;
-			ioctl_ptr->fm_length = end - start;
-			ioctl_ptr->fm_extent_count = extent_count;
-			ioctl_ptr->fm_mapped_extents = 0;
+			*ioctl_ptr = (fiemap) {
+				.fm_start = start,
+				.fm_length = end - start,
+				.fm_flags = m_flags,
+				.fm_extent_count = extent_count,
+			};
 
 			// cerr << "Before (fd = " << fd << ") : " << ioctl_ptr << endl;
 			DIE_IF_MINUS_ONE(ioctl(fd, FS_IOC_FIEMAP, ioctl_ptr));
@@ -672,68 +710,89 @@ namespace crucible {
 			}
 		}
 
-		fiemap *this_ptr = static_cast<fiemap *>(this);
-		*this_ptr = *ioctl_ptr;
-		fm_start = orig_start;
-		fm_length = orig_length;
-		fm_extent_count = extents.size();
 		m_extents = extents;
 	}
 
 	BtrfsIoctlSearchKey::BtrfsIoctlSearchKey(size_t buf_size) :
+		btrfs_ioctl_search_key( (btrfs_ioctl_search_key) {
+			.max_objectid = numeric_limits<decltype(max_objectid)>::max(),
+			.max_offset = numeric_limits<decltype(max_offset)>::max(),
+			.max_transid = numeric_limits<decltype(max_transid)>::max(),
+			.max_type = numeric_limits<decltype(max_type)>::max(),
+			.nr_items = 1,
+		}),
 		m_buf_size(buf_size)
 	{
-		memset_zero<btrfs_ioctl_search_key>(this);
-		max_objectid = numeric_limits<decltype(max_objectid)>::max();
-		max_offset = numeric_limits<decltype(max_offset)>::max();
-		max_transid = numeric_limits<decltype(max_transid)>::max();
-		max_type = numeric_limits<decltype(max_type)>::max();
-		nr_items = numeric_limits<decltype(nr_items)>::max();
 	}
 
-	BtrfsIoctlSearchHeader::BtrfsIoctlSearchHeader()
+	BtrfsIoctlSearchHeader::BtrfsIoctlSearchHeader() :
+		btrfs_ioctl_search_header( (btrfs_ioctl_search_header) { } )
 	{
-		memset_zero<btrfs_ioctl_search_header>(this);
 	}
 
 	size_t
-	BtrfsIoctlSearchHeader::set_data(const vector<char> &v, size_t offset)
+	BtrfsIoctlSearchHeader::set_data(const ByteVector &v, size_t offset)
 	{
 		THROW_CHECK2(invalid_argument, offset, v.size(), offset + sizeof(btrfs_ioctl_search_header) <= v.size());
-		memcpy(this, &v[offset], sizeof(btrfs_ioctl_search_header));
+		memcpy(static_cast<btrfs_ioctl_search_header *>(this), &v[offset], sizeof(btrfs_ioctl_search_header));
 		offset += sizeof(btrfs_ioctl_search_header);
 		THROW_CHECK2(invalid_argument, offset + len, v.size(), offset + len <= v.size());
-		m_data = vector<char>(&v[offset], &v[offset + len]);
+		m_data = ByteVector(v, offset, len);
 		return offset + len;
 	}
 
 	bool
 	BtrfsIoctlSearchKey::do_ioctl_nothrow(int fd)
 	{
-		vector<char> ioctl_arg = vector_copy_struct<btrfs_ioctl_search_key>(this);
-		ioctl_arg.resize(sizeof(btrfs_ioctl_search_args_v2) + m_buf_size, 0);
-		btrfs_ioctl_search_args_v2 *ioctl_ptr = reinterpret_cast<btrfs_ioctl_search_args_v2 *>(ioctl_arg.data());
-
-		ioctl_ptr->buf_size = m_buf_size;
-
-		// Don't bother supporting V1.  Kernels that old have other problems.
-		int rv = ioctl(fd, BTRFS_IOC_TREE_SEARCH_V2, ioctl_ptr);
-		if (rv != 0) {
-			return false;
-		}
-
-		static_cast<btrfs_ioctl_search_key&>(*this) = ioctl_ptr->key;
+		// It would be really nice if the kernel tells us whether our
+		// buffer overflowed or how big the overflowing object
+		// was; instead, we have to guess.
 
 		m_result.clear();
-		m_result.reserve(nr_items);
+		// Make sure there is space for at least the search key and one (empty) header
+		size_t buf_size = max(m_buf_size, sizeof(btrfs_ioctl_search_args_v2) + sizeof(btrfs_ioctl_search_header));
+		ByteVector ioctl_arg;
+		btrfs_ioctl_search_args_v2 *ioctl_ptr;
+		do {
+			// ioctl buffer size does not include search key header or buffer size
+			ioctl_arg = ByteVector(buf_size + sizeof(btrfs_ioctl_search_args_v2));
+			ioctl_ptr = ioctl_arg.get<btrfs_ioctl_search_args_v2>();
+			ioctl_ptr->key = static_cast<const btrfs_ioctl_search_key&>(*this);
+			ioctl_ptr->buf_size = buf_size;
+			// Don't bother supporting V1.  Kernels that old have other problems.
+			int rv = ioctl(fd, BTRFS_IOC_TREE_SEARCH_V2, ioctl_arg.data());
+			if (rv != 0 && errno != EOVERFLOW) {
+				return false;
+			}
+			if (rv == 0 && nr_items <= ioctl_ptr->key.nr_items) {
+				// got all the items we wanted, thanks
+				m_buf_size = max(m_buf_size, buf_size);
+				break;
+			}
+			// Didn't get all the items we wanted.  Increase the buf size and try again.
+			// These sizes are very common on default-formatted btrfs, so use these
+			// instead of naive doubling.
+			if (buf_size < 4096) {
+				buf_size = 4096;
+			} else if (buf_size < 16384) {
+				buf_size = 16384;
+			} else if (buf_size < 65536) {
+				buf_size = 65536;
+			} else {
+				buf_size *= 2;
+			}
+			// don't automatically raise the buf size higher than 64K, the largest possible btrfs item
+		} while (buf_size < 65536);
+
+		// ioctl changes nr_items, this has to be copied back
+		static_cast<btrfs_ioctl_search_key&>(*this) = ioctl_ptr->key;
 
 		size_t offset = pointer_distance(ioctl_ptr->buf, ioctl_ptr);
 		for (decltype(nr_items) i = 0; i < nr_items; ++i) {
 			BtrfsIoctlSearchHeader item;
 			offset = item.set_data(ioctl_arg, offset);
-			m_result.push_back(item);
+			m_result.insert(item);
 		}
-
 		return true;
 	}
 
@@ -741,7 +800,7 @@ namespace crucible {
 	BtrfsIoctlSearchKey::do_ioctl(int fd)
 	{
 		if (!do_ioctl_nothrow(fd)) {
-			THROW_ERRNO("BTRFS_IOC_TREE_SEARCH_V2: " << name_fd(fd));
+			THROW_ERRNO("BTRFS_IOC_TREE_SEARCH_V2: " << name_fd(fd) << ": " << *this);
 		}
 	}
 
@@ -752,31 +811,47 @@ namespace crucible {
 		min_type = ref.type;
 		min_offset = ref.offset + 1;
 		if (min_offset < ref.offset) {
-			// We wrapped, try the next objectid
-			++min_objectid;
+			// We wrapped, try the next type
+			++min_type;
+			assert(min_offset == 0);
+			if (min_type < ref.type) {
+				assert(min_type == 0);
+				// We wrapped, try the next objectid
+				++min_objectid;
+				// no advancement possible at end
+				THROW_CHECK1(runtime_error, min_type, min_type == 0);
+			}
 		}
 	}
 
-	ostream &hexdump(ostream &os, const vector<char> &v)
+	void
+	BtrfsIoctlSearchKey::next_min(const BtrfsIoctlSearchHeader &ref, const uint8_t type)
 	{
-		os << "vector<char> { size = " << v.size() << ", data:\n";
-		for (size_t i = 0; i < v.size(); i += 8) {
-			string hex, ascii;
-			for (size_t j = i; j < i + 8; ++j) {
-				if (j < v.size()) {
-					unsigned char c = v[j];
-					char buf[8];
-					sprintf(buf, "%02x ", c);
-					hex += buf;
-					ascii += (c < 32 || c > 126) ? '.' : c;
-				} else {
-					hex += "   ";
-					ascii += ' ';
-				}
+		if (ref.type < type) {
+			// forward to type in same object with zero offset
+			min_objectid = ref.objectid;
+			min_type = type;
+			min_offset = 0;
+		} else if (ref.type > type) {
+			// skip directly to start of next objectid with target type
+			min_objectid = ref.objectid + 1;
+			// no advancement possible at end
+			THROW_CHECK2(out_of_range, min_objectid, ref.objectid, min_objectid > ref.objectid);
+			min_type = type;
+			min_offset = 0;
+		} else {
+			// advance within this type
+			min_objectid = ref.objectid;
+			min_type = ref.type;
+			min_offset = ref.offset + 1;
+			if (min_offset < ref.offset) {
+				// We wrapped, try the next objectid, same type
+				++min_objectid;
+				THROW_CHECK2(out_of_range, min_objectid, ref.objectid, min_objectid > ref.objectid);
+				min_type = type;
+				assert(min_offset == 0);
 			}
-			os << astringprintf("\t%08x %s %s\n", i, hex.c_str(), ascii.c_str());
 		}
-		return os << "}";
 	}
 
 	string
@@ -834,7 +909,7 @@ namespace crucible {
 	}
 
 	string
-	btrfs_search_objectid_ntoa(unsigned objectid)
+	btrfs_search_objectid_ntoa(uint64_t objectid)
 	{
 		static const bits_ntoa_table table[] = {
 			NTOA_TABLE_ENTRY_ENUM(BTRFS_ROOT_TREE_OBJECTID),
@@ -906,7 +981,7 @@ namespace crucible {
 	ostream &
 	operator<<(ostream &os, const BtrfsIoctlSearchHeader &hdr)
 	{
-		os << "BtrfsIoctlSearchHeader { " 
+		os << "BtrfsIoctlSearchHeader { "
 			<< static_cast<const btrfs_ioctl_search_header &>(hdr)
 			<< ", data = ";
 		hexdump(os, hdr.m_data);
@@ -916,7 +991,7 @@ namespace crucible {
 	ostream &
 	operator<<(ostream &os, const BtrfsIoctlSearchKey &key)
 	{
-		os << "BtrfsIoctlSearchKey { " 
+		os << "BtrfsIoctlSearchKey { "
 			<< static_cast<const btrfs_ioctl_search_key &>(key)
 			<< ", buf_size = " << key.m_buf_size
 			<< ", buf[" << key.m_result.size() << "] = {";
@@ -961,7 +1036,7 @@ namespace crucible {
 				}
 
 				if (i.objectid == root_id && i.type == BTRFS_ROOT_ITEM_KEY) {
-					rv = max(rv, uint64_t(call_btrfs_get(btrfs_root_generation, i.m_data)));
+					rv = max(rv, uint64_t(btrfs_get_member(&btrfs_root_item::generation, i.m_data)));
 				}
 			}
 			if (sk.min_offset < numeric_limits<decltype(sk.min_offset)>::max()) {
@@ -973,9 +1048,9 @@ namespace crucible {
 		return rv;
 	}
 
-	Statvfs::Statvfs()
+	Statvfs::Statvfs() :
+		statvfs( (statvfs) { } )
 	{
-		memset_zero<statvfs>(this);
 	}
 
 	Statvfs::Statvfs(int fd) :
@@ -1014,7 +1089,6 @@ namespace crucible {
 		os << "BtrfsIoctlFsInfoArgs {"
 			<< " max_id = " << a.max_id << ","
 			<< " num_devices = " << a.num_devices << ","
-			<< " fsid = " << a.uuid() << ","
 #if 0
 			<< " nodesize = " << a.nodesize << ","
 			<< " sectorsize = " << a.sectorsize << ","
@@ -1027,24 +1101,41 @@ namespace crucible {
 		return os << " }";
 	};
 
-	BtrfsIoctlFsInfoArgs::BtrfsIoctlFsInfoArgs()
+	BtrfsIoctlFsInfoArgs::BtrfsIoctlFsInfoArgs() :
+		btrfs_ioctl_fs_info_args_v3( (btrfs_ioctl_fs_info_args_v3) {
+			.flags = 0
+				| BTRFS_FS_INFO_FLAG_CSUM_INFO
+				| BTRFS_FS_INFO_FLAG_GENERATION
+			,
+		})
 	{
-		memset_zero<btrfs_ioctl_fs_info_args>(this);
 	}
 
 	void
 	BtrfsIoctlFsInfoArgs::do_ioctl(int fd)
 	{
-		btrfs_ioctl_fs_info_args *p = static_cast<btrfs_ioctl_fs_info_args *>(this);
+		btrfs_ioctl_fs_info_args_v3 *p = static_cast<btrfs_ioctl_fs_info_args_v3 *>(this);
 		if (ioctl(fd, BTRFS_IOC_FS_INFO, p)) {
 			THROW_ERRNO("BTRFS_IOC_FS_INFO: fd " << fd);
 		}
 	}
 
-	string
-	BtrfsIoctlFsInfoArgs::uuid() const
+	uint16_t
+	BtrfsIoctlFsInfoArgs::csum_type() const
 	{
-		return uuid_unparse(fsid);
+		return this->btrfs_ioctl_fs_info_args_v3::csum_type;
+	}
+
+	uint16_t
+	BtrfsIoctlFsInfoArgs::csum_size() const
+	{
+		return this->btrfs_ioctl_fs_info_args_v3::csum_size;
+	}
+
+	uint64_t
+	BtrfsIoctlFsInfoArgs::generation() const
+	{
+		return this->btrfs_ioctl_fs_info_args_v3::generation;
 	}
 
 };

lib/interp.cc

@@ -1,96 +0,0 @@
-#include "crucible/interp.h"
-
-#include "crucible/chatter.h"
-
-namespace crucible {
-	using namespace std;
-
-	int
-	Proc::exec(const ArgList &args)
-	{
-		return m_cmd(args);
-	}
-
-	Proc::Proc(const function<int(const ArgList &)> &f) :
-		m_cmd(f)
-	{
-	}
-
-	Command::~Command()
-	{
-	}
-
-	ArgList::ArgList(const char **argv)
-	{
-		while (argv && *argv) {
-			push_back(*argv++);
-		}
-	}
-
-	ArgList::ArgList(const vector<string> &&that) :
-		vector<string>(that)
-	{
-	}
-
-	Interp::~Interp()
-	{
-	}
-
-	Interp::Interp(const map<string, shared_ptr<Command> > &cmdlist) :
-		m_commands(cmdlist)
-	{
-	}
-
-	void
-	Interp::add_command(const string &name, const shared_ptr<Command> &command)
-	{
-		m_commands[name] = command;
-	}
-
-	int
-	Interp::exec(const ArgList &args)
-	{
-		auto next_arg = args.begin();
-		++next_arg;
-		return m_commands.at(args[0])->exec(vector<string>(next_arg, args.end()));
-	}
-
-	ArgParser::~ArgParser()
-	{
-	}
-
-	ArgParser::ArgParser()
-	{
-	}
-
-	void
-	ArgParser::add_opt(string opt, ArgActor actor)
-	{
-		m_string_opts[opt] = actor;
-	}
-
-	void
-	ArgParser::parse_backend(void *t, const ArgList &args)
-	{
-		bool quote_args = false;
-		for (string arg : args) {
-			if (quote_args) {
-				cerr << "arg: '" << arg << "'" << endl;
-				continue;
-			}
-			if (arg == "--") {
-				quote_args = true;
-				continue;
-			}
-			if (arg.compare(0, 2, "--") == 0) {
-				auto found = m_string_opts.find(arg.substr(2, string::npos));
-				if (found != m_string_opts.end()) {
-					found->second.predicate(t, "foo");
-				}
-				(void)t;
-			}
-		}
-	}
-
-
-};

lib/multilock.cc

@@ -0,0 +1,72 @@
+#include "crucible/multilock.h"
+
+#include "crucible/error.h"
+
+namespace crucible {
+	using namespace std;
+
+	MultiLocker::LockHandle::LockHandle(const string &type, MultiLocker &parent) :
+		m_type(type),
+		m_parent(parent)
+	{
+	}
+
+	void
+	MultiLocker::LockHandle::set_locked(const bool state)
+	{
+		m_locked = state;
+	}
+
+	MultiLocker::LockHandle::~LockHandle()
+	{
+		if (m_locked) {
+			m_parent.put_lock(m_type);
+			m_locked = false;
+		}
+	}
+
+	bool
+	MultiLocker::is_lock_available(const string &type)
+	{
+		for (const auto &i : m_counters) {
+			if (i.second != 0 && i.first != type) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	void
+	MultiLocker::put_lock(const string &type)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		auto &counter = m_counters[type];
+		THROW_CHECK2(runtime_error, type, counter, counter > 0);
+		--counter;
+		if (counter == 0) {
+			m_cv.notify_all();
+		}
+	}
+
+	shared_ptr<MultiLocker::LockHandle>
+	MultiLocker::get_lock_private(const string &type)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		m_counters.insert(make_pair(type, size_t(0)));
+		while (!is_lock_available(type)) {
+			m_cv.wait(lock);
+		}
+		const auto rv = make_shared<LockHandle>(type, *this);
+		++m_counters[type];
+		rv->set_locked(true);
+		return rv;
+	}
+
+	shared_ptr<MultiLocker::LockHandle>
+	MultiLocker::get_lock(const string &type)
+	{
+		static MultiLocker s_process_instance;
+		return s_process_instance.get_lock_private(type);
+	}
+
+}

lib/ntoa.cc

@@ -1,18 +1,17 @@
 #include "crucible/ntoa.h"
 
-#include <cassert>
-#include <sstream>
-#include <string>
+#include "crucible/error.h"
+#include "crucible/string.h"
 
 namespace crucible {
 	using namespace std;
 
-	string bits_ntoa(unsigned long n, const bits_ntoa_table *table)
+	string bits_ntoa(unsigned long long n, const bits_ntoa_table *table)
 	{
 		string out;
 		while (n && table->a) {
 			// No bits in n outside of mask
-			assert( ((~table->mask) & table->n) == 0);
+			THROW_CHECK2(invalid_argument, table->mask, table->n, ((~table->mask) & table->n) == 0);
 			if ( (n & table->mask) == table->n) {
 				if (!out.empty()) {
 					out += "|";
@@ -23,12 +22,10 @@ namespace crucible {
 			++table;
 		}
 		if (n) {
-			ostringstream oss;
-			oss << "0x" << hex << n;
 			if (!out.empty()) {
 				out += "|";
 			}
-			out += oss.str();
+			out += to_hex(n);
 		}
 		if (out.empty()) {
 			out = "0";

lib/process.cc

@@ -2,7 +2,9 @@
 
 #include "crucible/chatter.h"
 #include "crucible/error.h"
+#include "crucible/ntoa.h"
 
+#include <cstdlib>
 #include <utility>
 
 // for gettid()
@@ -109,13 +111,108 @@ namespace crucible {
 		}
 	}
 
-	template<>
-	struct ResourceHandle<Process::id, Process>;
-
 	pid_t
 	gettid()
 	{
 		return syscall(SYS_gettid);
 	}
 
+	double
+	getloadavg1()
+	{
+		double loadavg[1];
+		const int rv = ::getloadavg(loadavg, 1);
+		if (rv != 1) {
+			THROW_ERRNO("getloadavg(..., 1)");
+		}
+		return loadavg[0];
+	}
+
+	double
+	getloadavg5()
+	{
+		double loadavg[2];
+		const int rv = ::getloadavg(loadavg, 2);
+		if (rv != 2) {
+			THROW_ERRNO("getloadavg(..., 2)");
+		}
+		return loadavg[1];
+	}
+
+	double
+	getloadavg15()
+	{
+		double loadavg[3];
+		const int rv = ::getloadavg(loadavg, 3);
+		if (rv != 3) {
+			THROW_ERRNO("getloadavg(..., 3)");
+		}
+		return loadavg[2];
+	}
+
+	static const struct bits_ntoa_table signals_table[] = {
+
+		// POSIX.1-1990
+		NTOA_TABLE_ENTRY_ENUM(SIGHUP),
+		NTOA_TABLE_ENTRY_ENUM(SIGINT),
+		NTOA_TABLE_ENTRY_ENUM(SIGQUIT),
+		NTOA_TABLE_ENTRY_ENUM(SIGILL),
+		NTOA_TABLE_ENTRY_ENUM(SIGABRT),
+		NTOA_TABLE_ENTRY_ENUM(SIGFPE),
+		NTOA_TABLE_ENTRY_ENUM(SIGKILL),
+		NTOA_TABLE_ENTRY_ENUM(SIGSEGV),
+		NTOA_TABLE_ENTRY_ENUM(SIGPIPE),
+		NTOA_TABLE_ENTRY_ENUM(SIGALRM),
+		NTOA_TABLE_ENTRY_ENUM(SIGTERM),
+		NTOA_TABLE_ENTRY_ENUM(SIGUSR1),
+		NTOA_TABLE_ENTRY_ENUM(SIGUSR2),
+		NTOA_TABLE_ENTRY_ENUM(SIGCHLD),
+		NTOA_TABLE_ENTRY_ENUM(SIGCONT),
+		NTOA_TABLE_ENTRY_ENUM(SIGSTOP),
+		NTOA_TABLE_ENTRY_ENUM(SIGTSTP),
+		NTOA_TABLE_ENTRY_ENUM(SIGTTIN),
+		NTOA_TABLE_ENTRY_ENUM(SIGTTOU),
+
+		// SUSv2 and POSIX.1-2001
+		NTOA_TABLE_ENTRY_ENUM(SIGBUS),
+		NTOA_TABLE_ENTRY_ENUM(SIGPOLL),
+		NTOA_TABLE_ENTRY_ENUM(SIGPROF),
+		NTOA_TABLE_ENTRY_ENUM(SIGSYS),
+		NTOA_TABLE_ENTRY_ENUM(SIGTRAP),
+		NTOA_TABLE_ENTRY_ENUM(SIGURG),
+		NTOA_TABLE_ENTRY_ENUM(SIGVTALRM),
+		NTOA_TABLE_ENTRY_ENUM(SIGXCPU),
+		NTOA_TABLE_ENTRY_ENUM(SIGXFSZ),
+
+		// Other
+		NTOA_TABLE_ENTRY_ENUM(SIGIOT),
+#ifdef SIGEMT
+		NTOA_TABLE_ENTRY_ENUM(SIGEMT),
+#endif
+		NTOA_TABLE_ENTRY_ENUM(SIGSTKFLT),
+		NTOA_TABLE_ENTRY_ENUM(SIGIO),
+#ifdef SIGCLD
+		NTOA_TABLE_ENTRY_ENUM(SIGCLD),
+#endif
+		NTOA_TABLE_ENTRY_ENUM(SIGPWR),
+#ifdef SIGINFO
+		NTOA_TABLE_ENTRY_ENUM(SIGINFO),
+#endif
+#ifdef SIGLOST
+		NTOA_TABLE_ENTRY_ENUM(SIGLOST),
+#endif
+		NTOA_TABLE_ENTRY_ENUM(SIGWINCH),
+#ifdef SIGUNUSED
+		NTOA_TABLE_ENTRY_ENUM(SIGUNUSED),
+#endif
+
+		NTOA_TABLE_ENTRY_END(),
+	};
+
+	string
+	signal_ntoa(int sig)
+	{
+		return bits_ntoa(sig, signals_table);
+	}
+
 }

lib/string.cc

@@ -16,7 +16,7 @@ namespace crucible {
 	uint64_t
 	from_hex(const string &s)
 	{
-		return stoull(s, 0, 0);
+		return stoull(s, nullptr, 0);
 	}
 
 	vector<string>

lib/task.cc

@@ -0,0 +1,923 @@
+#include "crucible/task.h"
+
+#include "crucible/error.h"
+#include "crucible/process.h"
+#include "crucible/time.h"
+
+#include <atomic>
+#include <condition_variable>
+#include <list>
+#include <map>
+#include <mutex>
+#include <set>
+#include <thread>
+
+#include <cassert>
+#include <cmath>
+
+namespace crucible {
+	using namespace std;
+
+	static const size_t thread_name_length = 15; // TASK_COMM_LEN on Linux
+
+	void
+	pthread_setname(const string &name)
+	{
+		auto name_copy = name.substr(0, thread_name_length);
+		// Don't care if a debugging facility fails
+		pthread_setname_np(pthread_self(), name_copy.c_str());
+	}
+
+	string
+	pthread_getname()
+	{
+		char buf[thread_name_length + 1] = { 0 };
+		// We'll get an empty name if this fails...
+		pthread_getname_np(pthread_self(), buf, sizeof(buf));
+		// ...or at least null-terminated garbage
+		buf[thread_name_length] = '\0';
+		return buf;
+	}
+
+	class TaskState;
+	using TaskStatePtr = shared_ptr<TaskState>;
+	using TaskStateWeak = weak_ptr<TaskState>;
+
+	class TaskConsumer;
+	using TaskConsumerPtr = shared_ptr<TaskConsumer>;
+	using TaskConsumerWeak = weak_ptr<TaskConsumer>;
+
+	using TaskQueue = list<TaskStatePtr>;
+
+	static thread_local TaskStatePtr tl_current_task;
+
+	/// because we don't want to bump -std=c++-17 just to get scoped_lock.
+	/// Also we don't want to self-deadlock if both mutexes are the same mutex.
+	class PairLock {
+		unique_lock<mutex>	m_lock1, m_lock2;
+	public:
+		PairLock(mutex &m1, mutex &m2) :
+			m_lock1(m1, defer_lock),
+			m_lock2(m2, defer_lock)
+		{
+			if (&m1 == &m2) {
+				m_lock1.lock();
+			} else {
+				lock(m_lock1, m_lock2);
+			}
+		}
+	};
+
+	class TaskState : public enable_shared_from_this<TaskState> {
+		mutex					m_mutex;
+		const function<void()> 			m_exec_fn;
+		const string				m_title;
+
+		/// Tasks to be executed after the current task is executed
+		list<TaskStatePtr>			m_post_exec_queue;
+
+		/// Set by run() and append().  Cleared by exec().
+		bool					m_run_now = false;
+
+		/// Set when task starts execution by exec().
+		/// Cleared when exec() ends.
+		bool					m_is_running = false;
+
+		/// Sequential identifier for next task
+		static atomic<TaskId>			s_next_id;
+
+		/// Sequential identifier for next task
+		static atomic<size_t>			s_instance_count;
+
+		/// Identifier for this task
+		TaskId					m_id;
+
+		/// Backend for append()
+		void append_nolock(const TaskStatePtr &task);
+
+		/// Clear the post-execution queue.  Recursively destroys post-exec
+		/// queues of all tasks in post-exec queue.  Useful only when
+		/// cancelling the entire task queue.
+		void clear();
+
+	friend class TaskMasterState;
+	friend class TaskConsumer;
+
+		/// Clear any TaskQueue, not just this one.
+		static void clear_queue(TaskQueue &tq);
+
+		/// Rescue any TaskQueue, not just this one.
+		static void rescue_queue(TaskQueue &tq);
+
+		TaskState &operator=(const TaskState &) = delete;
+		TaskState(const TaskState &) = delete;
+		TaskState(TaskState &&) = delete;
+
+	public:
+		~TaskState();
+		TaskState(string title, function<void()> exec_fn);
+
+		/// Run the task at most one more time.  If task has
+		/// already started running, a new instance is scheduled.
+		/// If an instance is already scheduled by run() or
+		/// append(), does nothing.  Otherwise, schedules a new
+		/// instance at the end of TaskMaster's global queue.
+		void run();
+
+		/// Execute task immediately in current thread if it is not already
+		/// executing in another thread; otherwise, append the current task
+		/// to itself to be executed immediately in the other thread.
+		void exec();
+
+		/// Return title of task.
+		string title() const;
+
+		/// Return ID of task.
+		TaskId id() const;
+
+		/// Queue task to execute after current task finishes executing
+		/// or is destroyed.
+		void append(const TaskStatePtr &task);
+
+		/// How masy Tasks are there?  Good for catching leaks
+		static size_t instance_count();
+	};
+
+	atomic<TaskId> TaskState::s_next_id;
+	atomic<size_t> TaskState::s_instance_count;
+
+	class TaskMasterState : public enable_shared_from_this<TaskMasterState> {
+		mutex 					m_mutex;
+		condition_variable 			m_condvar;
+		TaskQueue				m_queue;
+		size_t					m_thread_max;
+		size_t					m_thread_min = 0;
+		set<TaskConsumerPtr>			m_threads;
+		shared_ptr<thread>			m_load_tracking_thread;
+		double					m_load_target = 0;
+		double					m_prev_loadavg;
+		size_t					m_configured_thread_max;
+		double					m_thread_target;
+		bool					m_cancelled = false;
+		bool					m_paused = false;
+		TaskMaster::LoadStats			m_load_stats;
+
+	friend class TaskConsumer;
+	friend class TaskMaster;
+
+		void start_threads_nolock();
+		void start_stop_threads();
+		void set_thread_count(size_t thread_max);
+		void set_thread_min_count(size_t thread_min);
+		void adjust_thread_count();
+		size_t calculate_thread_count_nolock();
+		void set_loadavg_target(double target);
+		void loadavg_thread_fn();
+		void cancel();
+		void pause(bool paused = true);
+
+		TaskMasterState &operator=(const TaskMasterState &) = delete;
+		TaskMasterState(const TaskMasterState &) = delete;
+
+	public:
+		~TaskMasterState();
+		TaskMasterState(size_t thread_max = thread::hardware_concurrency());
+
+		static void push_back(const TaskStatePtr &task);
+		static void push_front(TaskQueue &queue);
+		size_t get_queue_count();
+		size_t get_thread_count();
+		static TaskMaster::LoadStats get_current_load();
+	};
+
+	class TaskConsumer : public enable_shared_from_this<TaskConsumer> {
+		shared_ptr<TaskMasterState>	m_master;
+		TaskStatePtr			m_current_task;
+
+	friend class TaskState;
+		TaskQueue			m_local_queue;
+
+		void consumer_thread();
+		shared_ptr<TaskState> current_task_locked();
+	friend class TaskMaster;
+	friend class TaskMasterState;
+	public:
+		TaskConsumer(const shared_ptr<TaskMasterState> &tms);
+		shared_ptr<TaskState> current_task();
+	private:
+		// Make sure this gets constructed _last_
+		shared_ptr<thread>		m_thread;
+	};
+
+	static thread_local TaskConsumerPtr tl_current_consumer;
+
+	static auto s_tms = make_shared<TaskMasterState>();
+
+	void
+	TaskState::rescue_queue(TaskQueue &queue)
+	{
+		if (queue.empty()) {
+			return;
+		}
+		const auto tlcc = tl_current_consumer;
+		if (tlcc) {
+			// We are executing under a TaskConsumer, splice our post-exec queue at front.
+			// No locks needed because we are using only thread-local objects.
+			tlcc->m_local_queue.splice(tlcc->m_local_queue.begin(), queue);
+		} else {
+			// We are not executing under a TaskConsumer.
+			// If there is only one task, then just insert it at the front of the queue.
+			if (queue.size() == 1) {
+				TaskMasterState::push_front(queue);
+			} else {
+				// If there are multiple tasks, create a new task to wrap our post-exec queue,
+				// then push it to the front of the global queue using normal locking methods.
+				TaskStatePtr rescue_task(make_shared<TaskState>("rescue_task", [](){}));
+				swap(rescue_task->m_post_exec_queue, queue);
+				TaskQueue tq_one { rescue_task };
+				TaskMasterState::push_front(tq_one);
+			}
+		}
+		assert(queue.empty());
+	}
+
+	TaskState::~TaskState()
+	{
+		--s_instance_count;
+		unique_lock<mutex> lock(m_mutex);
+		// If any dependent Tasks were appended since the last exec, run them now
+		TaskState::rescue_queue(m_post_exec_queue);
+	}
+
+	TaskState::TaskState(string title, function<void()> exec_fn) :
+		m_exec_fn(exec_fn),
+		m_title(title),
+		m_id(++s_next_id)
+	{
+		THROW_CHECK0(invalid_argument, !m_title.empty());
+		++s_instance_count;
+	}
+
+	size_t
+	TaskState::instance_count()
+	{
+		return s_instance_count;
+	}
+
+	size_t
+	Task::instance_count()
+	{
+		return TaskState::instance_count();
+	}
+
+	void
+	TaskState::clear()
+	{
+		TaskQueue post_exec_queue;
+		unique_lock<mutex> lock(m_mutex);
+		swap(post_exec_queue, m_post_exec_queue);
+		lock.unlock();
+		clear_queue(post_exec_queue);
+	}
+
+	void
+	TaskState::clear_queue(TaskQueue &tq)
+	{
+		for (auto &i : tq) {
+			i->clear();
+		}
+		tq.clear();
+	}
+
+	void
+	TaskState::append_nolock(const TaskStatePtr &task)
+	{
+		THROW_CHECK0(invalid_argument, task);
+		m_post_exec_queue.push_back(task);
+	}
+
+	void
+	TaskState::append(const TaskStatePtr &task)
+	{
+		THROW_CHECK0(invalid_argument, task);
+		PairLock lock(m_mutex, task->m_mutex);
+		if (!task->m_run_now) {
+			task->m_run_now = true;
+			append_nolock(task);
+		}
+	}
+
+	void
+	TaskState::exec()
+	{
+		THROW_CHECK0(invalid_argument, m_exec_fn);
+		THROW_CHECK0(invalid_argument, !m_title.empty());
+
+		unique_lock<mutex> lock(m_mutex);
+		if (m_is_running) {
+			append_nolock(shared_from_this());
+			return;
+		} else {
+			m_run_now = false;
+			m_is_running = true;
+		}
+
+		TaskStatePtr this_task = shared_from_this();
+		swap(this_task, tl_current_task);
+		lock.unlock();
+
+		const auto old_thread_name = pthread_getname();
+		pthread_setname(m_title);
+
+		catch_all([&]() {
+			m_exec_fn();
+		});
+
+		pthread_setname(old_thread_name);
+
+		lock.lock();
+		swap(this_task, tl_current_task);
+		m_is_running = false;
+
+		// Splice task post_exec queue at front of local queue
+		TaskState::rescue_queue(m_post_exec_queue);
+	}
+
+	string
+	TaskState::title() const
+	{
+		THROW_CHECK0(runtime_error, !m_title.empty());
+		return m_title;
+	}
+
+	TaskId
+	TaskState::id() const
+	{
+		return m_id;
+	}
+
+	void
+	TaskState::run()
+	{
+		unique_lock<mutex> lock(m_mutex);
+		if (m_run_now) {
+			return;
+		}
+		m_run_now = true;
+		TaskMasterState::push_back(shared_from_this());
+	}
+
+	TaskMasterState::TaskMasterState(size_t thread_max) :
+		m_thread_max(thread_max),
+		m_configured_thread_max(thread_max),
+		m_thread_target(thread_max),
+		m_load_stats(TaskMaster::LoadStats { 0 })
+	{
+	}
+
+	void
+	TaskMasterState::start_threads_nolock()
+	{
+		while (m_threads.size() < m_thread_max && !m_paused) {
+			m_threads.insert(make_shared<TaskConsumer>(shared_from_this()));
+		}
+	}
+
+	void
+	TaskMasterState::start_stop_threads()
+	{
+		unique_lock<mutex> lock(m_mutex);
+		while (m_threads.size() != m_thread_max) {
+			if (m_threads.size() < m_thread_max) {
+				m_threads.insert(make_shared<TaskConsumer>(shared_from_this()));
+			} else if (m_threads.size() > m_thread_max) {
+				m_condvar.wait(lock);
+			}
+		}
+	}
+
+	void
+	TaskMasterState::push_back(const TaskStatePtr &task)
+	{
+		THROW_CHECK0(runtime_error, task);
+		unique_lock<mutex> lock(s_tms->m_mutex);
+		if (s_tms->m_cancelled) {
+			task->clear();
+			return;
+		}
+		s_tms->m_queue.push_back(task);
+		s_tms->m_condvar.notify_all();
+		s_tms->start_threads_nolock();
+	}
+
+	void
+	TaskMasterState::push_front(TaskQueue &queue)
+	{
+		if (queue.empty()) {
+			return;
+		}
+		unique_lock<mutex> lock(s_tms->m_mutex);
+		if (s_tms->m_cancelled) {
+			TaskState::clear_queue(queue);
+			return;
+		}
+		s_tms->m_queue.splice(s_tms->m_queue.begin(), queue);
+		s_tms->m_condvar.notify_all();
+		s_tms->start_threads_nolock();
+	}
+
+	TaskMasterState::~TaskMasterState()
+	{
+		set_thread_count(0);
+	}
+
+	size_t
+	TaskMaster::get_queue_count()
+	{
+		unique_lock<mutex> lock(s_tms->m_mutex);
+		return s_tms->m_queue.size();
+	}
+
+	size_t
+	TaskMaster::get_thread_count()
+	{
+		unique_lock<mutex> lock(s_tms->m_mutex);
+		return s_tms->m_threads.size();
+	}
+
+	TaskMaster::LoadStats
+	TaskMaster::get_current_load()
+	{
+		unique_lock<mutex> lock(s_tms->m_mutex);
+		return s_tms->m_load_stats;
+	}
+
+	ostream &
+	TaskMaster::print_queue(ostream &os)
+	{
+		unique_lock<mutex> lock(s_tms->m_mutex);
+		os << "Queue (size " << s_tms->m_queue.size() << "):" << endl;
+		size_t counter = 0;
+		for (auto i : s_tms->m_queue) {
+			os << "Queue #" << ++counter << " Task ID " << i->id() << " " << i->title() << endl;
+		}
+		return os << "Queue End" << endl;
+	}
+
+	ostream &
+	TaskMaster::print_workers(ostream &os)
+	{
+		unique_lock<mutex> lock(s_tms->m_mutex);
+		os << "Workers (size " << s_tms->m_threads.size() << "):" << endl;
+		size_t counter = 0;
+		for (auto i : s_tms->m_threads) {
+			os << "Worker #" << ++counter << " ";
+			auto task = i->current_task_locked();
+			if (task) {
+				os << "Task ID " << task->id() << " " << task->title();
+			} else {
+				os << "(idle)";
+			}
+			os << endl;
+		}
+		return os << "Workers End" << endl;
+	}
+
+	size_t
+	TaskMasterState::calculate_thread_count_nolock()
+	{
+		if (m_paused) {
+			// No threads running while paused or cancelled
+			return 0;
+		}
+
+		if (m_load_target == 0) {
+			// No limits, no stats, use configured thread count
+			return m_configured_thread_max;
+		}
+
+		if (m_configured_thread_max == 0) {
+			// Not a lot of choice here, and zeros break the algorithm
+			return 0;
+		}
+
+		const double loadavg = getloadavg1();
+
+		static const double load_exp = exp(-5.0 / 60.0);
+
+		// Averages are fun, but want to know the load from the last 5 seconds.
+		// Invert the load average function:
+		// LA = LA * load_exp + N * (1 - load_exp)
+		// LA2 - LA1 = LA1 * load_exp + N * (1 - load_exp) - LA1
+		// LA2 - LA1 + LA1 = LA1 * load_exp + N * (1 - load_exp)
+		// LA2 - LA1 + LA1 - LA1 * load_exp = N * (1 - load_exp)
+		// LA2 - LA1 * load_exp = N * (1 - load_exp)
+		// LA2 / (1 - load_exp) - (LA1 * load_exp / 1 - load_exp) = N
+		// (LA2 - LA1 * load_exp) / (1 - load_exp) = N
+		// except for rounding error which might make this just a bit below zero.
+		const double current_load = max(0.0, (loadavg - m_prev_loadavg * load_exp) / (1 - load_exp));
+
+		m_prev_loadavg = loadavg;
+
+		const double load_deficit = m_load_target - loadavg;
+		if (load_deficit > 0) {
+			// Load is too low, solve by adding another worker
+			m_thread_target += load_deficit / 3;
+		} else if (load_deficit < 0) {
+			// Load is too high, solve by removing all known excess tasks
+			m_thread_target += load_deficit;
+		}
+
+		m_load_stats = TaskMaster::LoadStats {
+			.current_load = current_load,
+			.thread_target = m_thread_target,
+			.loadavg = loadavg,
+		};
+
+		// Cannot exceed configured maximum thread count or less than zero
+		m_thread_target = min(max(0.0, m_thread_target), double(m_configured_thread_max));
+
+		// Convert to integer but keep within range
+		const size_t rv = max(m_thread_min, min(size_t(ceil(m_thread_target)), m_configured_thread_max));
+
+		return rv;
+	}
+
+	void
+	TaskMasterState::adjust_thread_count()
+	{
+		unique_lock<mutex> lock(m_mutex);
+		size_t new_thread_max = calculate_thread_count_nolock();
+		size_t old_thread_max = m_thread_max;
+		m_thread_max = new_thread_max;
+
+		// If we are reducing the number of threads we have to wake them up so they can exit their loops
+		// If we are increasing the number of threads we have to notify start_stop_threads it can stop waiting for threads to stop
+		if (new_thread_max != old_thread_max) {
+			m_condvar.notify_all();
+			start_threads_nolock();
+		}
+	}
+
+	void
+	TaskMasterState::set_thread_count(size_t thread_max)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		m_configured_thread_max = thread_max;
+		lock.unlock();
+		adjust_thread_count();
+		start_stop_threads();
+	}
+
+	void
+	TaskMaster::set_thread_count(size_t thread_max)
+	{
+		s_tms->set_thread_count(thread_max);
+	}
+
+	void
+	TaskMasterState::cancel()
+	{
+		unique_lock<mutex> lock(m_mutex);
+		m_paused = true;
+		m_cancelled = true;
+		decltype(m_queue) empty_queue;
+		m_queue.swap(empty_queue);
+		m_condvar.notify_all();
+		lock.unlock();
+		TaskState::clear_queue(empty_queue);
+	}
+
+	void
+	TaskMaster::cancel()
+	{
+		s_tms->cancel();
+	}
+
+	void
+	TaskMasterState::pause(const bool paused)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		m_paused = paused;
+		m_condvar.notify_all();
+		lock.unlock();
+	}
+
+	void
+	TaskMaster::pause(const bool paused)
+	{
+		s_tms->pause(paused);
+	}
+
+	void
+	TaskMasterState::set_thread_min_count(size_t thread_min)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		m_thread_min = thread_min;
+		lock.unlock();
+		adjust_thread_count();
+		start_stop_threads();
+	}
+
+	void
+	TaskMaster::set_thread_min_count(size_t thread_min)
+	{
+		s_tms->set_thread_min_count(thread_min);
+	}
+
+	void
+	TaskMasterState::loadavg_thread_fn()
+	{
+		pthread_setname("load_tracker");
+		while (!m_cancelled) {
+			adjust_thread_count();
+			nanosleep(5.0);
+		}
+	}
+
+	void
+	TaskMasterState::set_loadavg_target(double target)
+	{
+		THROW_CHECK1(out_of_range, target, target >= 0);
+
+		unique_lock<mutex> lock(m_mutex);
+		if (m_cancelled) {
+			return;
+		}
+		m_load_target = target;
+		m_prev_loadavg = getloadavg1();
+
+		if (target && !m_load_tracking_thread) {
+			m_load_tracking_thread = make_shared<thread>([=] () { loadavg_thread_fn(); });
+			m_load_tracking_thread->detach();
+		}
+	}
+
+	void
+	TaskMaster::set_loadavg_target(double target)
+	{
+		s_tms->set_loadavg_target(target);
+	}
+
+	void
+	TaskMaster::set_thread_count()
+	{
+		set_thread_count(thread::hardware_concurrency());
+	}
+
+	Task::Task(shared_ptr<TaskState> pts) :
+		m_task_state(pts)
+	{
+	}
+
+	Task::Task(string title, function<void()> exec_fn) :
+		m_task_state(make_shared<TaskState>(title, exec_fn))
+	{
+	}
+
+	void
+	Task::run() const
+	{
+		THROW_CHECK0(runtime_error, m_task_state);
+		m_task_state->run();
+	}
+
+	void
+	Task::append(const Task &that) const
+	{
+		THROW_CHECK0(runtime_error, m_task_state);
+		THROW_CHECK0(runtime_error, that);
+		m_task_state->append(that.m_task_state);
+	}
+
+	Task
+	Task::current_task()
+	{
+		return Task(tl_current_task);
+	}
+
+	string
+	Task::title() const
+	{
+		THROW_CHECK0(runtime_error, m_task_state);
+		return m_task_state->title();
+	}
+
+	ostream &
+	operator<<(ostream &os, const Task &task)
+	{
+		return os << task.title();
+	};
+
+	TaskId
+	Task::id() const
+	{
+		THROW_CHECK0(runtime_error, m_task_state);
+		return m_task_state->id();
+	}
+
+	bool
+	Task::operator<(const Task &that) const
+	{
+		return id() < that.id();
+	}
+
+	Task::operator bool() const
+	{
+		return !!m_task_state;
+	}
+
+	shared_ptr<TaskState>
+	TaskConsumer::current_task_locked()
+	{
+		return m_current_task;
+	}
+
+	shared_ptr<TaskState>
+	TaskConsumer::current_task()
+	{
+		unique_lock<mutex> lock(m_master->m_mutex);
+		return current_task_locked();
+	}
+
+	void
+	TaskConsumer::consumer_thread()
+	{
+		// Keep a copy because we will be destroying *this later
+		const auto master_copy = m_master;
+
+		// Constructor is running with master locked.
+		// Wait until that is done before trying to do anything.
+		unique_lock<mutex> lock(master_copy->m_mutex);
+
+		// Detach thread so destructor doesn't call terminate
+		m_thread->detach();
+
+		// Set thread name so it isn't empty or the name of some other thread
+		pthread_setname("task_consumer");
+
+		// It is now safe to access our own shared_ptr
+		TaskConsumerPtr this_consumer = shared_from_this();
+		swap(this_consumer, tl_current_consumer);
+
+		while (!master_copy->m_paused) {
+			if (master_copy->m_thread_max < master_copy->m_threads.size()) {
+				// We are one of too many threads, exit now
+				break;
+			}
+
+			if (!m_local_queue.empty()) {
+				m_current_task = *m_local_queue.begin();
+				m_local_queue.pop_front();
+			} else if (!master_copy->m_queue.empty()) {
+				m_current_task = *master_copy->m_queue.begin();
+				master_copy->m_queue.pop_front();
+			} else {
+				master_copy->m_condvar.wait(lock);
+				continue;
+			}
+
+			// Execute task without lock
+			lock.unlock();
+			catch_all([&]() {
+				m_current_task->exec();
+			});
+
+			// Update m_current_task with lock
+			TaskStatePtr hold_task;
+			lock.lock();
+			swap(hold_task, m_current_task);
+
+			// Destroy hold_task without lock
+			lock.unlock();
+			hold_task.reset();
+
+			// Invariant: lock held
+			lock.lock();
+		}
+
+		// There is no longer a current consumer, but hold our own shared
+		// state so it's still there in the destructor
+		swap(this_consumer, tl_current_consumer);
+		assert(!tl_current_consumer);
+
+		// Release lock to rescue queue (may attempt to queue a new task at TaskMaster).
+		// rescue_queue normally sends tasks to the local queue of the current TaskConsumer thread,
+		// but we just disconnected ourselves from that.
+		lock.unlock();
+		TaskState::rescue_queue(m_local_queue);
+
+		// Hold lock so we can erase ourselves
+		lock.lock();
+
+		// Fun fact:  shared_from_this() isn't usable until the constructor returns...
+		master_copy->m_threads.erase(shared_from_this());
+		master_copy->m_condvar.notify_all();
+	}
+
+	TaskConsumer::TaskConsumer(const shared_ptr<TaskMasterState> &tms) :
+		m_master(tms)
+	{
+		m_thread = make_shared<thread>([=](){ consumer_thread(); });
+	}
+
+	class BarrierState {
+		mutex		m_mutex;
+		set<Task>	m_tasks;
+
+		void release();
+	public:
+		~BarrierState();
+		void insert_task(Task t);
+	};
+
+	void
+	BarrierState::release()
+	{
+		set<Task> tasks_local;
+		unique_lock<mutex> lock(m_mutex);
+		swap(tasks_local, m_tasks);
+		lock.unlock();
+		for (const auto &i : tasks_local) {
+			i.run();
+		}
+	}
+
+	BarrierState::~BarrierState()
+	{
+		release();
+	}
+
+	void
+	BarrierState::insert_task(Task t)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		m_tasks.insert(t);
+	}
+
+	Barrier::Barrier() :
+		m_barrier_state(make_shared<BarrierState>())
+	{
+	}
+
+	void
+	Barrier::insert_task(Task t)
+	{
+		m_barrier_state->insert_task(t);
+	}
+
+	void
+	Barrier::release()
+	{
+		m_barrier_state.reset();
+	}
+
+	ExclusionLock::ExclusionLock(shared_ptr<Task> owner) :
+		m_owner(owner)
+	{
+	}
+
+	void
+	ExclusionLock::release()
+	{
+		m_owner.reset();
+	}
+
+	void
+	Exclusion::insert_task(const Task &task)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		const auto sp = m_owner.lock();
+		lock.unlock();
+		if (sp) {
+			// If Exclusion is locked then queue task for release;
+			sp->append(task);
+		} else {
+			// otherwise, run the inserted task immediately
+			task.run();
+		}
+	}
+
+	ExclusionLock
+	Exclusion::try_lock(const Task &task)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		const auto sp = m_owner.lock();
+		if (sp) {
+			if (task) {
+				sp->append(task);
+			}
+			return ExclusionLock();
+		} else {
+			const auto rv = make_shared<Task>(task);
+			m_owner = rv;
+			return ExclusionLock(rv);
+		}
+	}
+
+	ExclusionLock::operator bool() const
+	{
+		return !!m_owner;
+	}
+
+}

lib/time.cc

@@ -1,11 +1,13 @@
 #include "crucible/time.h"
 
 #include "crucible/error.h"
+#include "crucible/process.h"
 
 #include <algorithm>
+#include <thread>
+
 #include <cmath>
 #include <ctime>
-#include <thread>
 
 namespace crucible {
 
@@ -59,16 +61,10 @@ namespace crucible {
 		m_start = chrono::high_resolution_clock::now();
 	}
 
-	void
-	Timer::set(const chrono::high_resolution_clock::time_point &start)
+	chrono::high_resolution_clock::time_point
+	Timer::get() const
 	{
-		m_start = start;
-	}
-
-	void
-	Timer::set(double delta)
-	{
-		m_start += chrono::duration_cast<chrono::high_resolution_clock::duration>(chrono::duration<double>(delta));
+		return m_start;
 	}
 
 	double
@@ -120,23 +116,26 @@ namespace crucible {
 		}
 	}
 
+	double
+	RateLimiter::sleep_time(double cost)
+	{
+		borrow(cost);
+		unique_lock<mutex> lock(m_mutex);
+		update_tokens();
+		if (m_tokens >= 0) {
+			return 0;
+		}
+		return -m_tokens / m_rate;
+	}
+
 	void
 	RateLimiter::sleep_for(double cost)
 	{
-		borrow(cost);
-		while (1) {
-			unique_lock<mutex> lock(m_mutex);
-			update_tokens();
-			if (m_tokens >= 0) {
-				return;
-			}
-			double sleep_time(-m_tokens / m_rate);
-			lock.unlock();
-			if (sleep_time > 0.0) {
-				nanosleep(sleep_time);
-			} else {
-				return;
-			}
+		double time_to_sleep = sleep_time(cost);
+		if (time_to_sleep > 0.0) {
+			nanosleep(time_to_sleep);
+		} else {
+			return;
 		}
 	}
 
@@ -155,4 +154,189 @@ namespace crucible {
 		m_tokens -= cost;
 	}
 
+	RateEstimator::RateEstimator(double min_delay, double max_delay) :
+		m_min_delay(min_delay),
+		m_max_delay(max_delay)
+	{
+		THROW_CHECK1(invalid_argument, min_delay, min_delay > 0);
+		THROW_CHECK1(invalid_argument, max_delay, max_delay > 0);
+		THROW_CHECK2(invalid_argument, min_delay, max_delay, max_delay > min_delay);
+	}
+
+	void
+	RateEstimator::update_unlocked(uint64_t new_count)
+	{
+		// Gradually reduce the effect of previous updates
+		if (m_last_decay.age() > 1) {
+			m_num *= m_decay;
+			m_den *= m_decay;
+			m_last_decay.reset();
+		}
+		// Add units over time to running totals
+		auto increment = new_count - min(new_count, m_last_count);
+		auto delta = max(0.0, m_last_update.lap());
+		m_num += increment;
+		m_den += delta;
+		m_last_count = new_count;
+		// If count increased, wake up any waiters
+		if (delta > 0) {
+			m_condvar.notify_all();
+		}
+	}
+
+	void
+	RateEstimator::update(uint64_t new_count)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return update_unlocked(new_count);
+	}
+
+	void
+	RateEstimator::update_monotonic(uint64_t new_count)
+	{
+		unique_lock<mutex> lock(m_mutex);
+		if (m_last_count == numeric_limits<uint64_t>::max() || new_count > m_last_count) {
+			return update_unlocked(new_count);
+		} else {
+			return update_unlocked(m_last_count);
+		}
+	}
+
+	uint64_t
+	RateEstimator::count() const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return m_last_count;
+	}
+
+	pair<double, double>
+	RateEstimator::ratio_unlocked() const
+	{
+		auto num = max(m_num, 1.0);
+		// auto den = max(m_den, 1.0);
+		// Rate estimation slows down if there are no new units to count
+		auto den = max(m_den + m_last_update.age(), 1.0);
+		auto sec_per_count = den / num;
+		if (sec_per_count < m_min_delay) {
+			return make_pair(1.0, m_min_delay);
+		}
+		if (sec_per_count > m_max_delay) {
+			return make_pair(1.0, m_max_delay);
+		}
+		return make_pair(num, den);
+	}
+
+	pair<double, double>
+	RateEstimator::ratio() const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return ratio_unlocked();
+	}
+
+	pair<double, double>
+	RateEstimator::raw() const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return make_pair(m_num, m_den);
+	}
+
+	double
+	RateEstimator::rate_unlocked() const
+	{
+		auto r = ratio_unlocked();
+		return r.first / r.second;
+	}
+
+	double
+	RateEstimator::rate() const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return rate_unlocked();
+	}
+
+	ostream &
+	operator<<(ostream &os, const RateEstimator &re)
+	{
+		os << "RateEstimator { ";
+		auto ratio = re.ratio();
+		auto raw = re.raw();
+		os << "count = " << re.count() << ", raw = " << raw.first << " / " << raw.second << ", ratio = " << ratio.first << " / " << ratio.second << ", rate = " << re.rate() << ", duration(1) = " << re.duration(1).count() << ", seconds_for(1) = " << re.seconds_for(1) << " }";
+		return os;
+	}
+
+	chrono::duration<double>
+	RateEstimator::duration_unlocked(uint64_t relative_count) const
+	{
+		auto dur = relative_count / rate_unlocked();
+		dur = min(m_max_delay, dur);
+		dur = max(m_min_delay, dur);
+		return chrono::duration<double>(dur);
+	}
+
+	chrono::duration<double>
+	RateEstimator::duration(uint64_t relative_count) const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return duration_unlocked(relative_count);
+	}
+
+	chrono::high_resolution_clock::time_point
+	RateEstimator::time_point_unlocked(uint64_t absolute_count) const
+	{
+		auto relative_count = absolute_count - min(m_last_count, absolute_count);
+		auto relative_duration = duration_unlocked(relative_count);
+		return m_last_update.get() + chrono::duration_cast<chrono::high_resolution_clock::duration>(relative_duration);
+		// return chrono::high_resolution_clock::now() + chrono::duration_cast<chrono::high_resolution_clock::duration>(relative_duration);
+	}
+
+	chrono::high_resolution_clock::time_point
+	RateEstimator::time_point(uint64_t absolute_count) const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		return time_point_unlocked(absolute_count);
+	}
+
+	void
+	RateEstimator::wait_until(uint64_t new_count_absolute) const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		auto saved_count = m_last_count;
+		while (saved_count <= m_last_count && m_last_count < new_count_absolute) {
+			// Stop waiting if clock runs backwards
+			saved_count = m_last_count;
+			m_condvar.wait(lock);
+		}
+	}
+
+	void
+	RateEstimator::wait_for(uint64_t new_count_relative) const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		auto saved_count = m_last_count;
+		auto new_count_absolute = m_last_count + new_count_relative;
+		while (saved_count <= m_last_count && m_last_count < new_count_absolute) {
+			// Stop waiting if clock runs backwards
+			saved_count = m_last_count;
+			m_condvar.wait(lock);
+		}
+	}
+
+	double
+	RateEstimator::seconds_for(uint64_t new_count_relative) const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		auto ts = time_point_unlocked(new_count_relative + m_last_count);
+		auto delta_dur = ts - chrono::high_resolution_clock::now();
+		return max(min(chrono::duration<double>(delta_dur).count(), m_max_delay), m_min_delay);
+	}
+
+	double
+	RateEstimator::seconds_until(uint64_t new_count_absolute) const
+	{
+		unique_lock<mutex> lock(m_mutex);
+		auto ts = time_point_unlocked(new_count_absolute);
+		auto delta_dur = ts - chrono::high_resolution_clock::now();
+		return max(min(chrono::duration<double>(delta_dur).count(), m_max_delay), m_min_delay);
+	}
+
 }

lib/uname.cc

@@ -0,0 +1,11 @@
+#include "crucible/error.h"
+#include "crucible/uname.h"
+
+namespace crucible {
+	using namespace std;
+
+	Uname::Uname()
+	{
+		DIE_IF_NON_ZERO(uname(static_cast<utsname*>(this)));
+	}
+}

lib/uuid.cc

@@ -1,16 +0,0 @@
-#include "crucible/uuid.h"
-
-namespace crucible {
-	using namespace std;
-
-	const size_t uuid_unparsed_size = 37; // "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\0"
-
-	string
-	uuid_unparse(const unsigned char in[16])
-	{
-		char out[uuid_unparsed_size];
-		::uuid_unparse(in, out);
-		return string(out);
-	}
-
-}

makeflags

@@ -1,4 +1,13 @@
-CCFLAGS  = -Wall -Wextra -Werror -O3 -I../include -ggdb -fpic
-# CCFLAGS  = -Wall -Wextra -Werror -O0 -I../include -ggdb -fpic
-CFLAGS   = $(CCFLAGS) -std=c99
-CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast
+# Default:
+CCFLAGS = -Wall -Wextra -Werror -O3
+
+# Optimized:
+# CCFLAGS = -Wall -Wextra -Werror -O3 -march=native
+
+# Debug:
+# CCFLAGS = -Wall -Wextra -Werror -O0 -ggdb
+
+CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64
+
+BEES_CFLAGS   = $(CCFLAGS) -std=c99 $(CFLAGS)
+BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast -Wno-missing-field-initializers $(CXXFLAGS)

scripts/beesd.conf.sample

@@ -0,0 +1,34 @@
+## Config for Bees: /etc/bees/beesd.conf.sample
+## https://github.com/Zygo/bees
+## It's a default values, change it, if needed
+
+# How to use?
+# Copy this file to a new file name and adjust the UUID below
+
+# Which FS will be used
+UUID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+## System Vars
+# Change carefully
+# WORK_DIR=/run/bees/
+# MNT_DIR="$WORK_DIR/mnt/$UUID"
+# BEESHOME="$MNT_DIR/.beeshome"
+# BEESSTATUS="$WORK_DIR/$UUID.status"
+
+## Options to apply, see `beesd --help` for details
+# OPTIONS="--strip-paths --no-timestamps"
+
+## Bees DB size
+# Hash Table Sizing
+# sHash table entries are 16 bytes each
+# (64-bit hash, 52-bit block number, and some metadata bits)
+# Each entry represents a minimum of 4K on disk.
+# unique data size    hash table size    average dedupe block size
+#     1TB                 4GB                  4K
+#     1TB                 1GB                 16K
+#     1TB               256MB                 64K
+#     1TB                16MB               1024K
+#    64TB                 1GB               1024K
+#
+# Size MUST be multiple of 128KB
+# DB_SIZE=$((1024*1024*1024)) # 1G in bytes

scripts/beesd.in

@@ -0,0 +1,140 @@
+#!/bin/bash
+
+## Helpful functions
+INFO(){ echo "INFO:" "$@"; }
+ERRO(){ echo "ERROR:" "$@"; exit 1; }
+YN(){ [[ "$1" =~ (1|Y|y) ]]; }
+
+## Global vars
+export BEESHOME BEESSTATUS
+export WORK_DIR CONFIG_DIR
+export CONFIG_FILE
+export UUID AL16M AL128K
+
+readonly AL128K="$((128*1024))"
+readonly AL16M="$((16*1024*1024))"
+readonly CONFIG_DIR=@ETC_PREFIX@/bees/
+
+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees)
+
+command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent"
+
+uuid_valid(){
+    if uuidparse -n -o VARIANT $1 | grep -i -q invalid; then
+        false
+    fi
+}
+
+help(){
+    echo "Usage: beesd [options] <btrfs_uuid>"
+    echo "- - -"
+    exec "$bees_bin" --help
+}
+
+for i in $("$bees_bin" --help 2>&1 | grep -E " --" | sed -e "s/^[^-]*-/-/" -e "s/,[^-]*--/ --/" -e "s/ [^-]*$//")
+do
+   TMP_ARGS="$TMP_ARGS $i"
+done
+IFS=" " read -r -a SUPPORTED_ARGS <<< $TMP_ARGS
+NOT_SUPPORTED_ARGS=()
+ARGUMENTS=()
+
+for arg in "${@}"; do
+    supp=false
+    for supp_arg in "${SUPPORTED_ARGS[@]}"; do
+        if [[ "$arg" == ${supp_arg}* ]]; then
+            supp=true
+            break
+        fi
+    done
+    if $supp; then
+        ARGUMENTS+=($arg)
+    else
+        NOT_SUPPORTED_ARGS+=($arg)
+    fi
+done
+
+for arg in "${ARGUMENTS[@]}"; do
+    case $arg in
+        -h) help;;
+        --help) help;;
+    esac
+done
+
+for arg in "${NOT_SUPPORTED_ARGS[@]}"; do
+    if uuid_valid $arg; then
+        [ ! -z "$UUID" ] && help
+        UUID=$arg
+    fi
+done
+
+[ -z "$UUID" ] && help
+
+
+FILE_CONFIG="$(grep -E -l '^[^#]*UUID\s*=\s*"?'"$UUID" "$CONFIG_DIR"/*.conf | head -1)"
+[ ! -f "$FILE_CONFIG" ] && ERRO "No config for $UUID"
+INFO "Find $UUID in $FILE_CONFIG, use as conf"
+source "$FILE_CONFIG"
+
+
+## Pre checks
+{
+    [ ! -d "$CONFIG_DIR" ] && ERRO "Missing: $CONFIG_DIR"
+    [ "$UID" == "0" ] || ERRO "Must be run as root"
+}
+
+
+WORK_DIR="${WORK_DIR:-/run/bees/}"
+MNT_DIR="${MNT_DIR:-$WORK_DIR/mnt/$UUID}"
+BEESHOME="${BEESHOME:-$MNT_DIR/.beeshome}"
+BEESSTATUS="${BEESSTATUS:-$WORK_DIR/$UUID.status}"
+DB_SIZE="${DB_SIZE:-$((8192*AL128K))}"
+
+INFO "Check: Disk exists"
+if [ ! -b "/dev/disk/by-uuid/$UUID" ]; then
+    ERRO "Missing disk: /dev/disk/by-uuid/$UUID"
+fi
+
+is_btrfs(){ [ "$(blkid -s TYPE -o value "$1")" == "btrfs" ]; }
+
+INFO "Check: Disk with btrfs"
+if ! is_btrfs "/dev/disk/by-uuid/$UUID"; then
+    ERRO "Disk not contain btrfs: /dev/disk/by-uuid/$UUID"
+fi
+
+INFO "WORK DIR: $WORK_DIR"
+mkdir -p "$WORK_DIR" || exit 1
+
+INFO "MOUNT DIR: $MNT_DIR"
+mkdir -p "$MNT_DIR" || exit 1
+
+mount --make-private -osubvolid=5 /dev/disk/by-uuid/$UUID "$MNT_DIR" || exit 1
+
+if [ ! -d "$BEESHOME" ]; then
+    INFO "Create subvol $BEESHOME for store bees data"
+    btrfs sub cre "$BEESHOME"
+else
+    btrfs sub show "$BEESHOME" &> /dev/null || ERRO "$BEESHOME MUST BE A SUBVOL!"
+fi
+
+# Check DB size
+{
+    DB_PATH="$BEESHOME/beeshash.dat"
+    touch "$DB_PATH"
+    OLD_SIZE="$(du -b "$DB_PATH" | sed 's/\t/ /g' | cut -d' ' -f1)"
+    NEW_SIZE="$DB_SIZE"
+    if (( "$NEW_SIZE"%AL128K > 0 )); then
+        ERRO "DB_SIZE Must be multiple of 128K"
+    fi
+    if (( "$OLD_SIZE" != "$NEW_SIZE" )); then
+        INFO "Resize db: $OLD_SIZE -> $NEW_SIZE"
+        rm -f "$BEESHOME/beescrawl.dat"
+        truncate -s $NEW_SIZE $DB_PATH
+    fi
+    chmod 700 "$DB_PATH"
+}
+
+MNT_DIR="$(realpath $MNT_DIR)"
+
+cd "$MNT_DIR"
+exec "$bees_bin" "${ARGUMENTS[@]}" $OPTIONS "$MNT_DIR"

scripts/beesd@.service.in

@@ -0,0 +1,59 @@
+[Unit]
+Description=Bees (%i)
+Documentation=https://github.com/Zygo/bees
+After=sysinit.target
+
+[Service]
+Type=simple
+ExecStart=@PREFIX@/sbin/beesd --no-timestamps %i
+CPUAccounting=true
+CPUSchedulingPolicy=batch
+CPUWeight=12
+IOSchedulingClass=idle
+IOSchedulingPriority=7
+IOWeight=10
+KillMode=control-group
+KillSignal=SIGTERM
+MemoryAccounting=true
+Nice=19
+Restart=on-abnormal
+RuntimeDirectory=bees
+StartupCPUWeight=25
+StartupIOWeight=25
+
+# Hide other users' process in /proc/
+ProtectProc=invisible
+
+# Mount / as read-only
+ProtectSystem=strict
+
+# Forbidden access to /home, /root and /run/user
+ProtectHome=true
+
+# Mount tmpfs on /tmp/ and /var/tmp/.
+# Cannot mount at /run/ or /var/run/ for they are used by systemd.
+PrivateTmp=true
+
+# Disable network access
+PrivateNetwork=true
+
+# Use private IPC namespace, utc namespace
+PrivateIPC=true
+ProtectHostname=true
+
+# Disable write access to kernel variables throug /proc
+ProtectKernelTunables=true
+
+# Disable access to control groups
+ProtectControlGroups=true
+
+# Set capabilities of the new program
+# The first three are required for accessing any file on the mounted filesystem.
+# The last one is required for mounting the filesystem.
+AmbientCapabilities=CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SYS_ADMIN
+
+# With NoNewPrivileges, running sudo cannot gain any new privilege
+NoNewPrivileges=true
+
+[Install]
+WantedBy=basic.target

src/.gitignore

@@ -0,0 +1,3 @@
+*.new.c
+bees-usage.c
+bees-version.[ch]

src/Makefile

@@ -1,27 +1,12 @@
-PROGRAMS = \
-	../bin/bees \
-	../bin/fiemap \
-	../bin/fiewalk \
+BEES = ../bin/bees
 
-all: $(PROGRAMS) depends.mk
+all: $(BEES)
 
 include ../makeflags
+-include ../localconf
 
 LIBS = -lcrucible -lpthread
-LDFLAGS = -L../lib -Wl,-rpath=$(shell realpath ../lib)
-
-depends.mk: Makefile *.cc
-	for x in *.cc; do $(CXX) $(CXXFLAGS) -M "$$x"; done > depends.mk.new
-	mv -fv depends.mk.new depends.mk
-
--include depends.mk
-
-%.o: %.cc %.h
-	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
-../bin/%: %.o
-	@echo Implicit bin rule "$<" '->' "$@"
-	$(CXX) $(CXXFLAGS) -o "$@" "$<" $(LDFLAGS) $(LIBS)
+BEES_LDFLAGS = -L../lib $(LDFLAGS)
 
 BEES_OBJS = \
 	bees.o \
@@ -30,10 +15,32 @@ BEES_OBJS = \
 	bees-resolve.o \
 	bees-roots.o \
 	bees-thread.o \
+	bees-trace.o \
 	bees-types.o \
 
-../bin/bees: $(BEES_OBJS)
-	$(CXX) $(CXXFLAGS) -o "$@" $(BEES_OBJS) $(LDFLAGS) $(LIBS)
+ALL_OBJS = $(BEES_OBJS) $(PROGRAM_OBJS)
+
+bees-version.c: bees.h $(BEES_OBJS:.o=.cc) Makefile ../lib/libcrucible.a
+	echo "const char *BEES_VERSION = \"$(BEES_VERSION)\";" > bees-version.c.new
+	if ! [ -e "$@" ] || ! cmp -s "$@.new" "$@"; then mv -fv $@.new $@; fi
+
+bees-usage.c: bees-usage.txt Makefile
+	(echo 'const char *BEES_USAGE = '; sed -r 's/^(.*)$$/"\1\\n"/' < bees-usage.txt; echo ';') > bees-usage.new.c
+	mv -f bees-usage.new.c bees-usage.c
+
+%.dep: %.cc Makefile
+	$(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
+
+include $(ALL_OBJS:%.o=%.dep)
+
+%.o: %.c ../makeflags
+	$(CC) $(BEES_CFLAGS) -o $@ -c $<
+
+%.o: %.cc ../makeflags
+	$(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
+
+$(BEES): $(BEES_OBJS) bees-version.o bees-usage.o ../lib/libcrucible.a
+	$(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
-	-rm -fv *.o
+	rm -fv *.o bees-version.c

src/bees-hash.cc

@@ -1,21 +1,21 @@
 #include "bees.h"
 
+#include "crucible/city.h"
 #include "crucible/crc64.h"
 #include "crucible/string.h"
+#include "crucible/uname.h"
 
 #include <algorithm>
-#include <random>
 
 #include <sys/mman.h>
 
 using namespace crucible;
 using namespace std;
 
-static inline
-bool
-using_any_madvise()
+BeesHash::BeesHash(const uint8_t *ptr, size_t len) :
+	// m_hash(CityHash64(reinterpret_cast<const char *>(ptr), len))
+	m_hash(Digest::CRC::crc64(ptr, len))
 {
-	return true;
 }
 
 ostream &
@@ -31,16 +31,18 @@ operator<<(ostream &os, const BeesHashTable::Cell &bhte)
 		  << BeesAddress(bhte.e_addr) << " }";
 }
 
+#if 0
+static
 void
-dump_bucket(BeesHashTable::Cell *p, BeesHashTable::Cell *q)
+dump_bucket_locked(BeesHashTable::Cell *p, BeesHashTable::Cell *q)
 {
-	// Must be called while holding m_bucket_mutex
 	for (auto i = p; i < q; ++i) {
 		BEESLOG("Entry " << i - p << " " << *i);
 	}
 }
+#endif
 
-const bool VERIFY_CLEARS_BUGS = false;
+static const bool VERIFY_CLEARS_BUGS = false;
 
 bool
 verify_cell_range(BeesHashTable::Cell *p, BeesHashTable::Cell *q, bool clear_bugs = VERIFY_CLEARS_BUGS)
@@ -51,7 +53,7 @@ verify_cell_range(BeesHashTable::Cell *p, BeesHashTable::Cell *q, bool clear_bug
 	for (BeesHashTable::Cell *cell = p; cell < q; ++cell) {
 		if (cell->e_addr && cell->e_addr < 0x1000) {
 			BEESCOUNT(bug_hash_magic_addr);
-			BEESINFO("Bad hash table address hash " << to_hex(cell->e_hash) << " addr " << to_hex(cell->e_addr));
+			BEESLOGDEBUG("Bad hash table address hash " << to_hex(cell->e_hash) << " addr " << to_hex(cell->e_addr));
 			if (clear_bugs) {
 				cell->e_addr = 0;
 				cell->e_hash = 0;
@@ -60,8 +62,8 @@ verify_cell_range(BeesHashTable::Cell *p, BeesHashTable::Cell *q, bool clear_bug
 		}
 		if (cell->e_addr && !seen_it.insert(*cell).second) {
 			BEESCOUNT(bug_hash_duplicate_cell);
-			// BEESLOG("Duplicate hash table entry:\nthis = " << *cell << "\nold = " << *seen_it.find(*cell));
-			BEESINFO("Duplicate hash table entry: " << *cell);
+			// BEESLOGDEBUG("Duplicate hash table entry:\nthis = " << *cell << "\nold = " << *seen_it.find(*cell));
+			BEESLOGDEBUG("Duplicate hash table entry: " << *cell);
 			if (clear_bugs) {
 				cell->e_addr = 0;
 				cell->e_hash = 0;
@@ -98,69 +100,132 @@ BeesHashTable::get_extent_range(HashType hash)
 	return make_pair(bp, ep);
 }
 
-void
-BeesHashTable::flush_dirty_extents()
+bool
+BeesHashTable::flush_dirty_extent(uint64_t extent_index)
 {
-	if (using_shared_map()) return;
+	BEESNOTE("flushing extent #" << extent_index << " of " << m_extents << " extents");
 
+	auto lock = lock_extent_by_index(extent_index);
+	bool wrote_extent = false;
+
+	catch_all([&]() {
+		uint8_t *const dirty_extent      = m_extent_ptr[extent_index].p_byte;
+		uint8_t *const dirty_extent_end  = m_extent_ptr[extent_index + 1].p_byte;
+		const size_t dirty_extent_offset = dirty_extent - m_byte_ptr;
+		THROW_CHECK1(out_of_range, dirty_extent,     dirty_extent     >= m_byte_ptr);
+		THROW_CHECK1(out_of_range, dirty_extent_end, dirty_extent_end <= m_byte_ptr_end);
+		THROW_CHECK2(out_of_range, dirty_extent_end, dirty_extent, dirty_extent_end - dirty_extent == BLOCK_SIZE_HASHTAB_EXTENT);
+		BEESTOOLONG("pwrite(fd " << m_fd << " '" << name_fd(m_fd)<< "', length " << to_hex(dirty_extent_end - dirty_extent) << ", offset " << to_hex(dirty_extent - m_byte_ptr) << ")");
+		// Copy the extent because we might be stuck writing for a while
+		ByteVector extent_copy(dirty_extent, dirty_extent_end);
+
+		// Release the lock
+		lock.unlock();
+
+		// Write the extent (or not)
+		pwrite_or_die(m_fd, extent_copy, dirty_extent_offset);
+		BEESCOUNT(hash_extent_out);
+
+		// Nope, this causes a _dramatic_ loss of performance.
+		// const size_t dirty_extent_size   = dirty_extent_end - dirty_extent;
+		// bees_unreadahead(m_fd, dirty_extent_offset, dirty_extent_size);
+
+		// Mark extent clean if write was successful
+		lock.lock();
+		m_extent_metadata.at(extent_index).m_dirty = false;
+
+		wrote_extent = true;
+	});
+
+	return wrote_extent;
+}
+
+size_t
+BeesHashTable::flush_dirty_extents(bool slowly)
+{
 	THROW_CHECK1(runtime_error, m_buckets, m_buckets > 0);
 
-	unique_lock<mutex> lock(m_extent_mutex);
-	auto dirty_extent_copy = m_buckets_dirty;
-	m_buckets_dirty.clear();
-	if (dirty_extent_copy.empty()) {
-		BEESNOTE("idle");
-		m_condvar.wait(lock);
-		return; // please call later, i.e. immediately
-	}
-	lock.unlock();
+	uint64_t wrote_extents = 0;
+	for (size_t extent_index = 0; extent_index < m_extents; ++extent_index) {
+		// Skip the clean ones
+		auto lock = lock_extent_by_index(extent_index);
+		if (!m_extent_metadata.at(extent_index).m_dirty) {
+			continue;
+		}
+		lock.unlock();
 
-	size_t extent_counter = 0;
-	for (auto extent_number : dirty_extent_copy) {
-		++extent_counter;
-		BEESNOTE("flush extent #" << extent_number << " (" << extent_counter << " of " << dirty_extent_copy.size() << ")");
-		catch_all([&]() {
-			uint8_t *dirty_extent     = m_extent_ptr[extent_number].p_byte;
-			uint8_t *dirty_extent_end = m_extent_ptr[extent_number + 1].p_byte;
-			THROW_CHECK1(out_of_range, dirty_extent,     dirty_extent     >= m_byte_ptr);
-			THROW_CHECK1(out_of_range, dirty_extent_end, dirty_extent_end <= m_byte_ptr_end);
-			if (using_shared_map()) {
-				BEESTOOLONG("flush extent " << extent_number);
-				copy(dirty_extent, dirty_extent_end, dirty_extent);
-			} else {
-				BEESTOOLONG("pwrite(fd " << m_fd << " '" << name_fd(m_fd)<< "', length " << to_hex(dirty_extent_end - dirty_extent) << ", offset " << to_hex(dirty_extent - m_byte_ptr) << ")");
-				// Page locks slow us down more than copying the data does
-				vector<uint8_t> extent_copy(dirty_extent, dirty_extent_end);
-				pwrite_or_die(m_fd, extent_copy, dirty_extent - m_byte_ptr);
-				BEESCOUNT(hash_extent_out);
+		if (flush_dirty_extent(extent_index)) {
+			++wrote_extents;
+			if (slowly) {
+				if (m_stop_requested) {
+					slowly = false;
+					continue;
+				}
+				BEESNOTE("flush rate limited after extent #" << extent_index << " of " << m_extents << " extents");
+				chrono::duration<double> sleep_time(m_flush_rate_limit.sleep_time(BLOCK_SIZE_HASHTAB_EXTENT));
+				unique_lock<mutex> lock(m_stop_mutex);
+				m_stop_condvar.wait_for(lock, sleep_time);
 			}
-		});
-		BEESNOTE("flush rate limited at extent #" << extent_number << " (" << extent_counter << " of " << dirty_extent_copy.size() << ")");
-		m_flush_rate_limit.sleep_for(BLOCK_SIZE_HASHTAB_EXTENT);
+		}
 	}
+	BEESLOGINFO("Flushed " << wrote_extents << " of " << m_extents << " hash table extents");
+	return wrote_extents;
 }
 
 void
-BeesHashTable::set_extent_dirty(HashType hash)
+BeesHashTable::set_extent_dirty_locked(uint64_t extent_index)
 {
-	if (using_shared_map()) return;
-	THROW_CHECK1(runtime_error, m_buckets, m_buckets > 0);
-	auto pr = get_extent_range(hash);
-	uint64_t extent_number = reinterpret_cast<Extent *>(pr.first) - m_extent_ptr;
-	THROW_CHECK1(runtime_error, extent_number, extent_number < m_extents);
-	unique_lock<mutex> lock(m_extent_mutex);
-	m_buckets_dirty.insert(extent_number);
-	m_condvar.notify_one();
+	// Must already be locked
+	m_extent_metadata.at(extent_index).m_dirty = true;
+
+	// Signal writeback thread
+	unique_lock<mutex> dirty_lock(m_dirty_mutex);
+	m_dirty = true;
+	m_dirty_condvar.notify_one();
 }
 
 void
 BeesHashTable::writeback_loop()
 {
-	if (!using_shared_map()) {
-		while (1) {
-			flush_dirty_extents();
+	while (!m_stop_requested) {
+		auto wrote_extents = flush_dirty_extents(true);
+
+		BEESNOTE("idle after writing " << wrote_extents << " of " << m_extents << " extents");
+
+		unique_lock<mutex> lock(m_dirty_mutex);
+		if (m_stop_requested) {
+			break;
+		}
+		if (m_dirty) {
+			m_dirty = false;
+		} else {
+			m_dirty_condvar.wait(lock);
 		}
 	}
+
+	// The normal loop exits at the end of one iteration when stop requested,
+	// but stop request will be in the middle of the loop, and some extents
+	// will still be dirty.  Run the flush loop again to get those.
+	BEESNOTE("flushing hash table, round 2");
+	BEESLOGDEBUG("Flushing hash table");
+	flush_dirty_extents(false);
+
+	// If there were any Tasks still running, they may have updated
+	// some hash table pages during the second flush.  These updates
+	// will be lost.  The Tasks will be repeated on the next run because
+	// they were not completed prior to the stop request, and the
+	// Crawl progress was already flushed out before the Hash table
+	// started writing, so nothing is really lost here.
+
+	catch_all([&]() {
+		// trigger writeback on our way out
+#if 0
+		// seems to trigger huge latency spikes
+		BEESTOOLONG("unreadahead hash table size " <<
+		pretty(m_size)); bees_unreadahead(m_fd, 0, m_size);
+#endif
+	});
+	BEESLOGDEBUG("Exited hash table writeback_loop");
 }
 
 static
@@ -177,14 +242,9 @@ percent(size_t num, size_t den)
 void
 BeesHashTable::prefetch_loop()
 {
-	// Always do the mlock, whether shared or not
-	THROW_CHECK1(runtime_error, m_size, m_size > 0);
-	catch_all([&]() {
-		BEESNOTE("mlock " << pretty(m_size));
-		DIE_IF_NON_ZERO(mlock(m_byte_ptr, m_size));
-	});
-
-	while (1) {
+	Uname uname;
+	bool not_locked = true;
+	while (!m_stop_requested) {
 		size_t width = 64;
 		vector<size_t> occupancy(width, 0);
 		size_t occupied_count = 0;
@@ -194,14 +254,15 @@ BeesHashTable::prefetch_loop()
 		size_t toxic_count = 0;
 		size_t unaligned_eof_count = 0;
 
-		for (uint64_t ext = 0; ext < m_extents; ++ext) {
-			BEESNOTE("prefetching hash table extent " << ext << " of " << m_extent_ptr_end - m_extent_ptr);
+		m_prefetch_running = true;
+		for (uint64_t ext = 0; ext < m_extents && !m_stop_requested; ++ext) {
+			BEESNOTE("prefetching hash table extent #" << ext << " of " << m_extents);
 			catch_all([&]() {
-				fetch_missing_extent(ext * c_buckets_per_extent);
+				fetch_missing_extent_by_index(ext);
 
-				BEESNOTE("analyzing hash table extent " << ext << " of " << m_extent_ptr_end - m_extent_ptr);
+				BEESNOTE("analyzing hash table extent #" << ext << " of " << m_extents);
 				bool duplicate_bugs_found = false;
-				unique_lock<mutex> lock(m_bucket_mutex);
+				auto lock = lock_extent_by_index(ext);
 				for (Bucket *bucket = m_extent_ptr[ext].p_buckets; bucket < m_extent_ptr[ext + 1].p_buckets; ++bucket) {
 					if (verify_cell_range(bucket[0].p_cells, bucket[1].p_cells)) {
 						duplicate_bugs_found = true;
@@ -230,12 +291,12 @@ BeesHashTable::prefetch_loop()
 					// Count these instead of calculating the number so we get better stats in case of exceptions
 					occupied_count += this_bucket_occupied_count;
 				}
-				lock.unlock();
 				if (duplicate_bugs_found) {
-					set_extent_dirty(ext);
+					set_extent_dirty_locked(ext);
 				}
 			});
 		}
+		m_prefetch_running = false;
 
 		BEESNOTE("calculating hash table statistics");
 
@@ -268,20 +329,19 @@ BeesHashTable::prefetch_loop()
 			out << "\n";
 		}
 
-		size_t uncompressed_count = occupied_count - compressed_count;
-		size_t legacy_count = compressed_count - compressed_offset_count;
+		size_t uncompressed_count = occupied_count - compressed_offset_count;
 
 		ostringstream graph_blob;
 
 		graph_blob << "Now:     " << format_time(time(NULL)) << "\n";
 		graph_blob << "Uptime:  " << m_ctx->total_timer().age() << " seconds\n";
+		graph_blob << "Version: " << BEES_VERSION << "\n";
+		graph_blob << "Kernel:  " << uname.sysname << " " << uname.release << " " << uname.machine << " " << uname.version << "\n";
 
-		graph_blob 
-			<< "\nHash table page occupancy histogram (" << occupied_count << "/" << total_count << " cells occupied, " << (occupied_count * 100 / total_count) << "%)\n" 
+		graph_blob
+			<< "\nHash table page occupancy histogram (" << occupied_count << "/" << total_count << " cells occupied, " << (occupied_count * 100 / total_count) << "%)\n"
 			<< out.str() << "0%      |      25%      |      50%      |      75%      |   100% page fill\n"
-			<< "compressed " << compressed_count << " (" << percent(compressed_count, occupied_count) << ")"
-			<< " new-style " << compressed_offset_count << " (" << percent(compressed_offset_count, occupied_count) << ")"
-			<< " old-style " << legacy_count << " (" << percent(legacy_count, occupied_count) << ")\n"
+			<< "compressed " << compressed_count << " (" << percent(compressed_count, occupied_count) << ")\n"
 			<< "uncompressed " << uncompressed_count << " (" << percent(uncompressed_count, occupied_count) << ")"
 			<< " unaligned_eof " << unaligned_eof_count << " (" << percent(unaligned_eof_count, occupied_count) << ")"
 			<< " toxic " << toxic_count << " (" << percent(toxic_count, occupied_count) << ")";
@@ -296,91 +356,118 @@ BeesHashTable::prefetch_loop()
 		auto avg_rates = thisStats / m_ctx->total_timer().age();
 		graph_blob << "\t" << avg_rates << "\n";
 
-		BEESLOG(graph_blob.str());
+		BEESLOGINFO(graph_blob.str());
 		catch_all([&]() {
 			m_stats_file.write(graph_blob.str());
 		});
 
+		if (not_locked && !m_stop_requested) {
+			// Always do the mlock, whether shared or not
+			THROW_CHECK1(runtime_error, m_size, m_size > 0);
+			BEESLOGINFO("mlock(" << pretty(m_size) << ")...");
+			Timer lock_time;
+			catch_all([&]() {
+				BEESNOTE("mlock " << pretty(m_size));
+				DIE_IF_NON_ZERO(mlock(m_byte_ptr, m_size));
+			});
+			BEESLOGINFO("mlock(" << pretty(m_size) << ") done in " << lock_time << " sec");
+			not_locked = false;
+		}
+
 		BEESNOTE("idle " << BEES_HASH_TABLE_ANALYZE_INTERVAL << "s");
-		nanosleep(BEES_HASH_TABLE_ANALYZE_INTERVAL);
+		unique_lock<mutex> lock(m_stop_mutex);
+		if (m_stop_requested) {
+			BEESLOGDEBUG("Stop requested in hash table prefetch");
+			return;
+		}
+		m_stop_condvar.wait_for(lock, chrono::duration<double>(BEES_HASH_TABLE_ANALYZE_INTERVAL));
 	}
 }
 
+size_t
+BeesHashTable::hash_to_extent_index(HashType hash)
+{
+	auto pr = get_extent_range(hash);
+	uint64_t extent_index = reinterpret_cast<const Extent *>(pr.first) - m_extent_ptr;
+	THROW_CHECK2(runtime_error, extent_index, m_extents, extent_index < m_extents);
+	return extent_index;
+}
+
+BeesHashTable::ExtentMetaData::ExtentMetaData() :
+	m_mutex_ptr(make_shared<mutex>())
+{
+}
+
+unique_lock<mutex>
+BeesHashTable::lock_extent_by_index(uint64_t extent_index)
+{
+	THROW_CHECK2(out_of_range, extent_index, m_extents, extent_index < m_extents);
+	return unique_lock<mutex>(*m_extent_metadata.at(extent_index).m_mutex_ptr);
+}
+
+unique_lock<mutex>
+BeesHashTable::lock_extent_by_hash(HashType hash)
+{
+	BEESTOOLONG("fetch_missing_extent for hash " << to_hex(hash));
+	return lock_extent_by_index(hash_to_extent_index(hash));
+}
+
 void
-BeesHashTable::fetch_missing_extent(HashType hash)
+BeesHashTable::fetch_missing_extent_by_index(uint64_t extent_index)
 {
-	BEESTOOLONG("fetch_missing_extent for hash " << to_hex(hash));
-	if (using_shared_map()) return;
-	THROW_CHECK1(runtime_error, m_buckets, m_buckets > 0);
-	auto pr = get_extent_range(hash);
-	uint64_t extent_number = reinterpret_cast<Extent *>(pr.first) - m_extent_ptr;
-	THROW_CHECK1(runtime_error, extent_number, extent_number < m_extents);
-
-	unique_lock<mutex> lock(m_extent_mutex);
-	if (!m_buckets_missing.count(extent_number)) {
+	BEESNOTE("checking hash extent #" << extent_index << " of " << m_extents << " extents");
+	auto lock = lock_extent_by_index(extent_index);
+	if (!m_extent_metadata.at(extent_index).m_missing) {
 		return;
 	}
 
-	size_t missing_buckets = m_buckets_missing.size();
-	lock.unlock();
-
-	BEESNOTE("fetch waiting for hash extent #" << extent_number << ", " << missing_buckets << " left to fetch");
-
-	// Acquire blocking lock on this extent only
-	LockSet<uint64_t>::Lock extent_lock(m_extent_lock_set, extent_number);
-
-	// Check missing again because someone else might have fetched this
-	// extent for us while we didn't hold any locks
-	lock.lock();
-	if (!m_buckets_missing.count(extent_number)) {
-		BEESCOUNT(hash_extent_in_twice);
-		return;
-	}
-	lock.unlock();
-
 	// OK we have to read this extent
-	BEESNOTE("fetching hash extent #" << extent_number << ", " << missing_buckets << " left to fetch");
+	BEESNOTE("fetching hash extent #" << extent_index << " of " << m_extents << " extents");
+	BEESTRACE("Fetching hash extent #" << extent_index << " of " << m_extents << " extents");
+	BEESTOOLONG("Fetching hash extent #" << extent_index << " of " << m_extents << " extents");
 
-	BEESTRACE("Fetching missing hash extent " << extent_number);
-	uint8_t *dirty_extent     = m_extent_ptr[extent_number].p_byte;
-	uint8_t *dirty_extent_end = m_extent_ptr[extent_number + 1].p_byte;
+	uint8_t *const dirty_extent      = m_extent_ptr[extent_index].p_byte;
+	uint8_t *const dirty_extent_end  = m_extent_ptr[extent_index + 1].p_byte;
+	const size_t dirty_extent_size   = dirty_extent_end - dirty_extent;
+	const size_t dirty_extent_offset = dirty_extent - m_byte_ptr;
 
-	{
+	// If the read fails don't retry, just go with whatever data we have
+	m_extent_metadata.at(extent_index).m_missing = false;
+
+	catch_all([&]() {
 		BEESTOOLONG("pread(fd " << m_fd << " '" << name_fd(m_fd)<< "', length " << to_hex(dirty_extent_end - dirty_extent) << ", offset " << to_hex(dirty_extent - m_byte_ptr) << ")");
-		pread_or_die(m_fd, dirty_extent, dirty_extent_end - dirty_extent, dirty_extent - m_byte_ptr);
-	}
+		pread_or_die(m_fd, dirty_extent, dirty_extent_size, dirty_extent_offset);
 
-	BEESCOUNT(hash_extent_in);
-	// We don't block when fetching an extent but we do slow down the
-	// prefetch thread.
-	m_prefetch_rate_limit.borrow(BLOCK_SIZE_HASHTAB_EXTENT);
-	lock.lock();
-	m_buckets_missing.erase(extent_number);
+		// Only count extents successfully read
+		BEESCOUNT(hash_extent_in);
+
+		// Won't need that again
+		bees_unreadahead(m_fd, dirty_extent_offset, dirty_extent_size);
+
+		// If we are in prefetch, give the kernel a hint about the next extent
+		if (m_prefetch_running) {
+			// XXX: don't call this if bees_readahead is implemented by pread()
+			bees_readahead(m_fd, dirty_extent_offset + dirty_extent_size, dirty_extent_size);
+		}
+	});
 }
 
-bool
-BeesHashTable::is_toxic_hash(BeesHashTable::HashType hash) const
+void
+BeesHashTable::fetch_missing_extent_by_hash(HashType hash)
 {
-	return m_toxic_hashes.find(hash) != m_toxic_hashes.end();
+	uint64_t extent_index = hash_to_extent_index(hash);
+	BEESNOTE("waiting to fetch hash extent #" << extent_index << " of " << m_extents << " extents");
+
+	fetch_missing_extent_by_index(extent_index);
 }
 
 vector<BeesHashTable::Cell>
 BeesHashTable::find_cell(HashType hash)
 {
-	// This saves a lot of time prefilling the hash table, and there's no risk of eviction
-	if (is_toxic_hash(hash)) {
-		BEESCOUNT(hash_toxic);
-		BeesAddress toxic_addr(0x1000);
-		toxic_addr.set_toxic();
-		Cell toxic_cell(hash, toxic_addr);
-		vector<Cell> rv;
-		rv.push_back(toxic_cell);
-		return rv;
-	}
-	fetch_missing_extent(hash);
+	fetch_missing_extent_by_hash(hash);
 	BEESTOOLONG("find_cell hash " << BeesHash(hash));
 	vector<Cell> rv;
-	unique_lock<mutex> lock(m_bucket_mutex);
+	auto lock = lock_extent_by_hash(hash);
 	auto er = get_cell_range(hash);
 	// FIXME:  Weed out zero addresses in the table due to earlier bugs
 	copy_if(er.first, er.second, back_inserter(rv), [=](const Cell &ip) { return ip.e_hash == hash && ip.e_addr >= 0x1000; });
@@ -388,46 +475,45 @@ BeesHashTable::find_cell(HashType hash)
 	return rv;
 }
 
-// Move an entry to the end of the list.  Used after an attempt to resolve
-// an address in the hash table fails.  Probably more correctly called
-// push_back_hash_addr, except it never inserts.  Shared hash tables
-// never erase anything, since there is no way to tell if an entry is
-// out of date or just belonging to the wrong filesystem.
+/// Remove a hash from the table, leaving an empty space on the list
+/// where the hash used to be.  Used when an invalid address is found
+/// because lookups on invalid addresses really hurt.
 void
 BeesHashTable::erase_hash_addr(HashType hash, AddrType addr)
 {
-	// if (m_shared) return;
-	fetch_missing_extent(hash);
+	fetch_missing_extent_by_hash(hash);
 	BEESTOOLONG("erase hash " << to_hex(hash) << " addr " << addr);
-	unique_lock<mutex> lock(m_bucket_mutex);
+	auto lock = lock_extent_by_hash(hash);
 	auto er = get_cell_range(hash);
 	Cell mv(hash, addr);
 	Cell *ip = find(er.first, er.second, mv);
 	bool found = (ip < er.second);
 	if (found) {
-		// Lookups on invalid addresses really hurt us.  Kill it with fire!
 		*ip = Cell(0, 0);
-		set_extent_dirty(hash);
+		set_extent_dirty_locked(hash_to_extent_index(hash));
 		BEESCOUNT(hash_erase);
 #if 0
 		if (verify_cell_range(er.first, er.second)) {
-			BEESINFO("while erasing hash " << hash << " addr " << addr);
+			BEESLOGDEBUG("while erasing hash " << hash << " addr " << addr);
 		}
 #endif
+	} else {
+		BEESCOUNT(hash_erase_miss);
 	}
 }
 
-// If entry is already present in list, move it to the front of the
-// list without dropping any entries, and return true.  If entry is not
-// present in list, insert it at the front of the list, possibly dropping
-// the last entry in the list, and return false.  Used to move duplicate
-// hash blocks to the front of the list.
+/// Insert a hash entry at the head of the list.  If entry is already
+/// present in list, move it to the front of the list without dropping
+/// any entries, and return true.  If entry is not present in list,
+/// insert it at the front of the list, possibly dropping the last entry
+/// in the list, and return false.  Used to move duplicate hash blocks
+/// to the front of the list.
 bool
 BeesHashTable::push_front_hash_addr(HashType hash, AddrType addr)
 {
-	fetch_missing_extent(hash);
+	fetch_missing_extent_by_hash(hash);
 	BEESTOOLONG("push_front_hash_addr hash " << BeesHash(hash) <<" addr " << BeesAddress(addr));
-	unique_lock<mutex> lock(m_bucket_mutex);
+	auto lock = lock_extent_by_hash(hash);
 	auto er = get_cell_range(hash);
 	Cell mv(hash, addr);
 	Cell *ip = find(er.first, er.second, mv);
@@ -445,7 +531,7 @@ BeesHashTable::push_front_hash_addr(HashType hash, AddrType addr)
 		auto dp = ip;
 		--sp;
 		// If we are deleting the last entry then don't copy it
-		if (ip == er.second) {
+		if (dp == er.second) {
 			--sp;
 			--dp;
 			BEESCOUNT(hash_evict);
@@ -457,39 +543,44 @@ BeesHashTable::push_front_hash_addr(HashType hash, AddrType addr)
 	// There is now a space at the front, insert there if different
 	if (er.first[0] != mv) {
 		er.first[0] = mv;
-		set_extent_dirty(hash);
+		set_extent_dirty_locked(hash_to_extent_index(hash));
 		BEESCOUNT(hash_front);
+	} else {
+		BEESCOUNT(hash_front_already);
 	}
 #if 0
 	if (verify_cell_range(er.first, er.second)) {
-		BEESINFO("while push_fronting hash " << hash << " addr " << addr);
+		BEESLOGDEBUG("while push_fronting hash " << hash << " addr " << addr);
 	}
 #endif
 	return found;
 }
 
-// If entry is already present in list, returns true and does not
-// modify list.  If entry is not present in list, returns false and
-// inserts at a random position in the list, possibly evicting the entry
-// at the end of the list.  Used to insert new unique (not-yet-duplicate)
-// blocks in random order.
+thread_local uniform_int_distribution<size_t> BeesHashTable::tl_distribution(0, c_cells_per_bucket - 1);
+
+/// Insert a hash entry at some unspecified point in the list.
+/// If entry is already present in list, returns true and does not
+/// modify list.  If entry is not present in list, returns false and
+/// inserts at a random position in the list, possibly evicting the entry
+/// at the end of the list.  Used to insert new unique (not-yet-duplicate)
+/// blocks in random order.
 bool
 BeesHashTable::push_random_hash_addr(HashType hash, AddrType addr)
 {
-	fetch_missing_extent(hash);
+	fetch_missing_extent_by_hash(hash);
 	BEESTOOLONG("push_random_hash_addr hash " << BeesHash(hash) << " addr " << BeesAddress(addr));
-	unique_lock<mutex> lock(m_bucket_mutex);
+	auto lock = lock_extent_by_hash(hash);
 	auto er = get_cell_range(hash);
 	Cell mv(hash, addr);
 	Cell *ip = find(er.first, er.second, mv);
 	bool found = (ip < er.second);
 
-	thread_local default_random_engine generator;
-	thread_local uniform_int_distribution<int> distribution(0, c_cells_per_bucket - 1);
-	auto pos = distribution(generator);
+	const auto pos = tl_distribution(bees_generator);
 
 	int case_cond = 0;
+#if 0
 	vector<Cell> saved(er.first, er.second);
+#endif
 
 	if (found) {
 		// If hash already exists after pos, swap with pos
@@ -535,20 +626,25 @@ BeesHashTable::push_random_hash_addr(HashType hash, AddrType addr)
 	}
 
 	// Evict something and insert at pos
-	move_backward(er.first + pos, er.second - 1, er.second);
+	// move_backward(er.first + pos, er.second - 1, er.second);
+	ip = er.second - 1;
+	while (ip > er.first + pos) {
+		auto dp = ip;
+		*dp = *--ip;
+	}
 	er.first[pos] = mv;
 	BEESCOUNT(hash_evict);
 	case_cond = 5;
 ret_dirty:
 	BEESCOUNT(hash_insert);
-	set_extent_dirty(hash);
+	set_extent_dirty_locked(hash_to_extent_index(hash));
 ret:
 #if 0
 	if (verify_cell_range(er.first, er.second, false)) {
 		BEESLOG("while push_randoming (case " << case_cond << ") pos " << pos
 			<< " ip " << (ip - er.first) << " " << mv);
-		// dump_bucket(saved.data(), saved.data() + saved.size());
-		// dump_bucket(er.first, er.second);
+		// dump_bucket_locked(saved.data(), saved.data() + saved.size());
+		// dump_bucket_locked(er.first, er.second);
 	}
 #else
 	(void)case_cond;
@@ -563,9 +659,9 @@ BeesHashTable::try_mmap_flags(int flags)
 		THROW_CHECK1(out_of_range, m_size, m_size > 0);
 		Timer map_time;
 		catch_all([&]() {
-			BEESLOG("mapping hash table size " << m_size << " with flags " << mmap_flags_ntoa(flags));
+			BEESLOGINFO("mapping hash table size " << m_size << " with flags " << mmap_flags_ntoa(flags));
 			void *ptr = mmap_or_die(nullptr, m_size, PROT_READ | PROT_WRITE, flags, flags & MAP_ANONYMOUS ? -1 : int(m_fd), 0);
-			BEESLOG("mmap done in " << map_time << " sec");
+			BEESLOGINFO("mmap done in " << map_time << " sec");
 			m_cell_ptr = static_cast<Cell *>(ptr);
 			void *ptr_end = static_cast<uint8_t *>(ptr) + m_size;
 			m_cell_ptr_end = static_cast<Cell *>(ptr_end);
@@ -574,12 +670,39 @@ BeesHashTable::try_mmap_flags(int flags)
 }
 
 void
-BeesHashTable::set_shared(bool shared)
+BeesHashTable::open_file()
 {
-	m_shared = shared;
+	// OK open hash table
+	BEESNOTE("opening hash table '" << m_filename << "' target size " << m_size << " (" << pretty(m_size) << ")");
+
+	// Try to open existing hash table
+	Fd new_fd = openat(m_ctx->home_fd(), m_filename.c_str(), FLAGS_OPEN_FILE_RW, 0700);
+
+	// If that doesn't work, try to make a new one
+	if (!new_fd) {
+		string tmp_filename = m_filename + ".tmp";
+		BEESNOTE("creating new hash table '" << tmp_filename << "'");
+		BEESLOGINFO("Creating new hash table '" << tmp_filename << "'");
+		unlinkat(m_ctx->home_fd(), tmp_filename.c_str(), 0);
+		new_fd = openat_or_die(m_ctx->home_fd(), tmp_filename, FLAGS_CREATE_FILE, 0700);
+		BEESNOTE("truncating new hash table '" << tmp_filename << "' size " << m_size << " (" << pretty(m_size) << ")");
+		BEESLOGINFO("Truncating new hash table '" << tmp_filename << "' size " << m_size << " (" << pretty(m_size) << ")");
+		ftruncate_or_die(new_fd, m_size);
+		BEESNOTE("truncating new hash table '" << tmp_filename << "' -> '" << m_filename << "'");
+		BEESLOGINFO("Truncating new hash table '" << tmp_filename << "' -> '" << m_filename << "'");
+		renameat_or_die(m_ctx->home_fd(), tmp_filename, m_ctx->home_fd(), m_filename);
+	}
+
+	Stat st(new_fd);
+	off_t new_size = st.st_size;
+
+	THROW_CHECK1(invalid_argument, new_size, new_size > 0);
+	THROW_CHECK1(invalid_argument, new_size, (new_size % BLOCK_SIZE_HASHTAB_EXTENT) == 0);
+	m_size = new_size;
+	m_fd = new_fd;
 }
 
-BeesHashTable::BeesHashTable(shared_ptr<BeesContext> ctx, string filename) :
+BeesHashTable::BeesHashTable(shared_ptr<BeesContext> ctx, string filename, off_t size) :
 	m_ctx(ctx),
 	m_size(0),
 	m_void_ptr(nullptr),
@@ -587,66 +710,69 @@ BeesHashTable::BeesHashTable(shared_ptr<BeesContext> ctx, string filename) :
 	m_buckets(0),
 	m_cells(0),
 	m_writeback_thread("hash_writeback"),
-	m_prefetch_thread("hash_prefetch " + m_ctx->root_path()),
+	m_prefetch_thread("hash_prefetch"),
 	m_flush_rate_limit(BEES_FLUSH_RATE),
-	m_prefetch_rate_limit(BEES_FLUSH_RATE),
 	m_stats_file(m_ctx->home_fd(), "beesstats.txt")
 {
-	BEESNOTE("opening hash table " << filename);
-
-	m_fd = openat_or_die(m_ctx->home_fd(), filename, FLAGS_OPEN_FILE_RW, 0700);
-	Stat st(m_fd);
-	m_size = st.st_size;
-
-	BEESTRACE("hash table size " << m_size);
-	BEESTRACE("hash table bucket size " << BLOCK_SIZE_HASHTAB_BUCKET);
-	BEESTRACE("hash table extent size " << BLOCK_SIZE_HASHTAB_EXTENT);
-
+	// Sanity checks to protect the implementation from its weaknesses
 	THROW_CHECK2(invalid_argument, BLOCK_SIZE_HASHTAB_BUCKET, BLOCK_SIZE_HASHTAB_EXTENT, (BLOCK_SIZE_HASHTAB_EXTENT % BLOCK_SIZE_HASHTAB_BUCKET) == 0);
 
-	// Does the union work?
-	THROW_CHECK2(runtime_error, m_void_ptr, m_cell_ptr, m_void_ptr == m_cell_ptr);
-	THROW_CHECK2(runtime_error, m_void_ptr, m_byte_ptr, m_void_ptr == m_byte_ptr);
-	THROW_CHECK2(runtime_error, m_void_ptr, m_bucket_ptr, m_void_ptr == m_bucket_ptr);
-	THROW_CHECK2(runtime_error, m_void_ptr, m_extent_ptr, m_void_ptr == m_extent_ptr);
-
 	// There's more than one union
 	THROW_CHECK2(runtime_error, sizeof(Bucket), BLOCK_SIZE_HASHTAB_BUCKET, BLOCK_SIZE_HASHTAB_BUCKET == sizeof(Bucket));
 	THROW_CHECK2(runtime_error, sizeof(Bucket::p_byte), BLOCK_SIZE_HASHTAB_BUCKET, BLOCK_SIZE_HASHTAB_BUCKET == sizeof(Bucket::p_byte));
 	THROW_CHECK2(runtime_error, sizeof(Extent), BLOCK_SIZE_HASHTAB_EXTENT, BLOCK_SIZE_HASHTAB_EXTENT == sizeof(Extent));
 	THROW_CHECK2(runtime_error, sizeof(Extent::p_byte), BLOCK_SIZE_HASHTAB_EXTENT, BLOCK_SIZE_HASHTAB_EXTENT == sizeof(Extent::p_byte));
 
-	BEESLOG("opened hash table filename '" << filename << "' length " << m_size);
+	m_filename = filename;
+	m_size = size;
+	open_file();
+
+	// Now we know size we can compute stuff
+
+	BEESTRACE("hash table size " << m_size);
+	BEESTRACE("hash table bucket size " << BLOCK_SIZE_HASHTAB_BUCKET);
+	BEESTRACE("hash table extent size " << BLOCK_SIZE_HASHTAB_EXTENT);
+
+	BEESLOGINFO("opened hash table filename '" << filename << "' length " << m_size);
 	m_buckets = m_size / BLOCK_SIZE_HASHTAB_BUCKET;
 	m_cells = m_buckets * c_cells_per_bucket;
 	m_extents = (m_size + BLOCK_SIZE_HASHTAB_EXTENT - 1) / BLOCK_SIZE_HASHTAB_EXTENT;
-	BEESLOG("\tcells " << m_cells << ", buckets " << m_buckets << ", extents " << m_extents);
+	BEESLOGINFO("\tcells " << m_cells << ", buckets " << m_buckets << ", extents " << m_extents);
 
-	BEESLOG("\tflush rate limit " << BEES_FLUSH_RATE);
+	BEESLOGINFO("\tflush rate limit " << BEES_FLUSH_RATE);
 
-	if (using_shared_map()) {
-		try_mmap_flags(MAP_SHARED);
-	} else {
-		try_mmap_flags(MAP_PRIVATE | MAP_ANONYMOUS);
-	}
+	// Try to mmap that much memory
+	try_mmap_flags(MAP_PRIVATE | MAP_ANONYMOUS);
 
 	if (!m_cell_ptr) {
-		THROW_ERROR(runtime_error, "unable to mmap " << filename);
+		THROW_ERRNO("unable to mmap " << filename);
 	}
 
-	if (!using_shared_map()) {
-		// madvise fails if MAP_SHARED
-		if (using_any_madvise()) {
-			// DONTFORK because we sometimes do fork,
-			// but the child doesn't touch any of the many, many pages
-			BEESTOOLONG("madvise(MADV_HUGEPAGE | MADV_DONTFORK)");
-			DIE_IF_NON_ZERO(madvise(m_byte_ptr, m_size, MADV_HUGEPAGE | MADV_DONTFORK));
-		}
-		for (uint64_t i = 0; i < m_size / sizeof(Extent); ++i) {
-			m_buckets_missing.insert(i);
+	// Do unions work the way we think (and rely on)?
+	THROW_CHECK2(runtime_error, m_void_ptr, m_cell_ptr, m_void_ptr == m_cell_ptr);
+	THROW_CHECK2(runtime_error, m_void_ptr, m_byte_ptr, m_void_ptr == m_byte_ptr);
+	THROW_CHECK2(runtime_error, m_void_ptr, m_bucket_ptr, m_void_ptr == m_bucket_ptr);
+	THROW_CHECK2(runtime_error, m_void_ptr, m_extent_ptr, m_void_ptr == m_extent_ptr);
+
+	// Give all the madvise hints that the kernel understands
+	const struct madv_flag {
+		const char *name;
+		int value;
+	} madv_flags[] = {
+		{ .name = "MADV_HUGEPAGE", .value = MADV_HUGEPAGE },
+		{ .name = "MADV_DONTFORK", .value = MADV_DONTFORK },
+		{ .name = "MADV_DONTDUMP", .value = MADV_DONTDUMP },
+		{ .name = "", .value = 0 },
+	};
+	for (auto fp = madv_flags; fp->value; ++fp) {
+		BEESTOOLONG("madvise(" << fp->name << ")");
+		if (madvise(m_byte_ptr, m_size, fp->value)) {
+			BEESLOGWARN("madvise(..., " << fp->name << "): " << strerror(errno) << " (ignored)");
 		}
 	}
 
+	m_extent_metadata.resize(m_extents);
+
 	m_writeback_thread.exec([&]() {
 		writeback_loop();
         });
@@ -657,26 +783,56 @@ BeesHashTable::BeesHashTable(shared_ptr<BeesContext> ctx, string filename) :
 
 	// Blacklist might fail if the hash table is not stored on a btrfs
 	catch_all([&]() {
-		m_ctx->blacklist_add(BeesFileId(m_fd));
+		m_ctx->blacklist_insert(BeesFileId(m_fd));
 	});
-
-	// Skip zero because we already weed that out before it gets near a hash function
-	for (unsigned i = 1; i < 256; ++i) {
-		vector<uint8_t> v(BLOCK_SIZE_SUMS, i);
-		HashType hash = Digest::CRC::crc64(v.data(), v.size());
-		m_toxic_hashes.insert(hash);
-	}
 }
 
 BeesHashTable::~BeesHashTable()
 {
+	BEESLOGDEBUG("Destroy BeesHashTable");
 	if (m_cell_ptr && m_size) {
-		flush_dirty_extents();
+		// Dirty extents should have been flushed before now,
+		// e.g. in stop().  If that didn't happen, don't fall
+		// into the same trap (and maybe throw an exception) here.
+		// flush_dirty_extents(false);
 		catch_all([&]() {
+			// drop the memory mapping
+			BEESTOOLONG("unmap handle table size " << pretty(m_size));
 			DIE_IF_NON_ZERO(munmap(m_cell_ptr, m_size));
-			m_cell_ptr = nullptr;
-			m_size = 0;
 		});
+		m_cell_ptr = nullptr;
+		m_size = 0;
 	}
+	BEESLOGDEBUG("BeesHashTable destroyed");
 }
 
+void
+BeesHashTable::stop_request()
+{
+	BEESNOTE("stopping BeesHashTable threads");
+	BEESLOGDEBUG("Stopping BeesHashTable threads");
+
+	unique_lock<mutex> lock(m_stop_mutex);
+	m_stop_requested = true;
+	m_stop_condvar.notify_all();
+	lock.unlock();
+
+	// Wake up hash writeback too
+	unique_lock<mutex> dirty_lock(m_dirty_mutex);
+	m_dirty_condvar.notify_all();
+	dirty_lock.unlock();
+}
+
+void
+BeesHashTable::stop_wait()
+{
+	BEESNOTE("waiting for hash_prefetch thread");
+	BEESLOGDEBUG("Waiting for hash_prefetch thread");
+	m_prefetch_thread.join();
+
+	BEESNOTE("waiting for hash_writeback thread");
+	BEESLOGDEBUG("Waiting for hash_writeback thread");
+	m_writeback_thread.join();
+
+	BEESLOGDEBUG("BeesHashTable stopped");
+}

src/bees-resolve.cc

@@ -98,90 +98,79 @@ BeesResolver::adjust_offset(const BeesFileRange &haystack, const BeesBlockData &
 		return BeesBlockData();
 	}
 
-	off_t lower_offset = haystack.begin();
-	off_t upper_offset = haystack.end();
+	off_t haystack_offset = haystack.begin();
 	bool is_compressed_offset = false;
 	bool is_exact = false;
-	bool is_legacy = false;
 	if (m_addr.is_compressed()) {
 		BtrfsExtentWalker ew(haystack.fd(), haystack.begin(), m_ctx->root_fd());
-		BEESTRACE("haystack extent data " << ew); 
+		BEESTRACE("haystack extent data " << ew);
 		Extent e = ew.current();
-		if (m_addr.has_compressed_offset()) {
-			off_t coff = m_addr.get_compressed_offset();
-			if (e.offset() > coff) {
-				// this extent begins after the target block
-				BEESCOUNT(adjust_offset_low);
-				return BeesBlockData();
-			}
-			coff -= e.offset();
-			if (e.size() <= coff) {
-				// this extent ends before the target block
-				BEESCOUNT(adjust_offset_high);
-				return BeesBlockData();
-			}
-			lower_offset = e.begin() + coff;
-			upper_offset = lower_offset + BLOCK_SIZE_CLONE;
-			BEESCOUNT(adjust_offset_hit);
-			is_compressed_offset = true;
-		} else {
-			lower_offset = e.begin();
-			upper_offset = e.end();
-			BEESCOUNT(adjust_legacy);
-			is_legacy = true;
+		THROW_CHECK1(runtime_error, m_addr, m_addr.has_compressed_offset());
+		off_t coff = m_addr.get_compressed_offset();
+		if (e.offset() > coff) {
+			// this extent begins after the target block
+			BEESCOUNT(adjust_offset_low);
+			return BeesBlockData();
 		}
+		coff -= e.offset();
+		if (e.size() <= coff) {
+			// this extent ends before the target block
+			BEESCOUNT(adjust_offset_high);
+			return BeesBlockData();
+		}
+		haystack_offset = e.begin() + coff;
+		BEESCOUNT(adjust_offset_hit);
+		is_compressed_offset = true;
 	} else {
 		BEESCOUNT(adjust_exact);
 		is_exact = true;
 	}
 
-	BEESTRACE("Checking haystack " << haystack << " offsets " << to_hex(lower_offset) << ".." << to_hex(upper_offset));
+	BEESTRACE("Checking haystack " << haystack << " offset " << to_hex(haystack_offset));
 
 	// Check all the blocks in the list
-	for (off_t haystack_offset = lower_offset; haystack_offset < upper_offset; haystack_offset += BLOCK_SIZE_CLONE) {
-		THROW_CHECK1(out_of_range, haystack_offset, (haystack_offset & BLOCK_MASK_CLONE) == 0);
+	THROW_CHECK1(out_of_range, haystack_offset, (haystack_offset & BLOCK_MASK_CLONE) == 0);
 
-		// Straw cannot extend beyond end of haystack
-		if (haystack_offset + needle.size() > haystack_size) {
-			BEESCOUNT(adjust_needle_too_long);
-			break;
-		}
-
-		// Read the haystack
-		BEESTRACE("straw " << name_fd(haystack.fd()) << ", offset " << to_hex(haystack_offset) << ", length " << needle.size());
-		BeesBlockData straw(haystack.fd(), haystack_offset, needle.size());
-
-		BEESTRACE("straw = " << straw);
-
-		// Stop if we find a match
-		if (straw.is_data_equal(needle)) {
-			BEESCOUNT(adjust_hit);
-			m_found_data = true;
-			m_found_hash = true;
-			if (is_compressed_offset) BEESCOUNT(adjust_compressed_offset_correct);
-			if (is_legacy) BEESCOUNT(adjust_legacy_correct);
-			if (is_exact) BEESCOUNT(adjust_exact_correct);
-			return straw;
-		}
-
-		if (straw.hash() != needle.hash()) {
-			// Not the same hash or data, try next block
-			BEESCOUNT(adjust_miss);
-			continue;
-		}
-
-		// Found the hash but not the data.  Yay!
-		m_found_hash = true;
-		BEESLOG("HASH COLLISION\n"
-			<< "\tneedle " << needle << "\n"
-			<< "\tstraw " << straw);
-		BEESCOUNT(hash_collision);
+	// Straw cannot extend beyond end of haystack
+	if (haystack_offset + needle.size() > haystack_size) {
+		BEESCOUNT(adjust_needle_too_long);
+		return BeesBlockData();
 	}
 
+	// Read the haystack
+	BEESTRACE("straw " << name_fd(haystack.fd()) << ", offset " << to_hex(haystack_offset) << ", length " << needle.size());
+	BeesBlockData straw(haystack.fd(), haystack_offset, needle.size());
+
+	BEESTRACE("straw = " << straw);
+
+	// Stop if we find a match
+	if (straw.is_data_equal(needle)) {
+		BEESCOUNT(adjust_hit);
+		m_found_data = true;
+		m_found_hash = true;
+		if (is_compressed_offset) BEESCOUNT(adjust_compressed_offset_correct);
+		if (is_exact) BEESCOUNT(adjust_exact_correct);
+		return straw;
+	}
+
+	if (straw.hash() != needle.hash()) {
+		// Not the same hash or data, try next block
+		BEESCOUNT(adjust_miss);
+		return BeesBlockData();
+	}
+
+	// Found the hash but not the data.  Yay!
+	m_found_hash = true;
+#if 0
+	BEESLOGINFO("HASH COLLISION\n"
+		<< "\tneedle " << needle << "\n"
+		<< "\tstraw " << straw);
+#endif
+	BEESCOUNT(hash_collision);
+
 	// Ran out of offsets to try
 	BEESCOUNT(adjust_no_match);
 	if (is_compressed_offset) BEESCOUNT(adjust_compressed_offset_wrong);
-	if (is_legacy) BEESCOUNT(adjust_legacy_wrong);
 	if (is_exact) BEESCOUNT(adjust_exact_wrong);
 	m_wrong_data = true;
 	return BeesBlockData();
@@ -196,8 +185,8 @@ BeesResolver::chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &
 
 	Fd file_fd = m_ctx->roots()->open_root_ino(bior.m_root, bior.m_inum);
 	if (!file_fd) {
-		// Delete snapshots generate craptons of these
-		// BEESINFO("No FD in chase_extent_ref " << bior);
+		// Deleted snapshots generate craptons of these
+		// BEESLOGDEBUG("No FD in chase_extent_ref " << bior);
 		BEESCOUNT(chase_no_fd);
 		return BeesFileRange();
 	}
@@ -211,7 +200,7 @@ BeesResolver::chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &
 
 	// ...or are we?
 	if (file_addr.is_magic()) {
-		BEESINFO("file_addr is magic: file_addr = " << file_addr << " bior = " << bior << " needle_bbd = " << needle_bbd);
+		BEESLOGDEBUG("file_addr is magic: file_addr = " << file_addr << " bior = " << bior << " needle_bbd = " << needle_bbd);
 		BEESCOUNT(chase_wrong_magic);
 		return BeesFileRange();
 	}
@@ -220,7 +209,7 @@ BeesResolver::chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &
 	// Did we get the physical block we asked for?  The magic bits have to match too,
 	// but the compressed offset bits do not.
 	if (file_addr.get_physical_or_zero() != m_addr.get_physical_or_zero()) {
-		// BEESINFO("found addr " << file_addr << " at " << name_fd(file_fd) << " offset " << to_hex(bior.m_offset) << " but looking for " << m_addr);
+		// BEESLOGDEBUG("found addr " << file_addr << " at " << name_fd(file_fd) << " offset " << to_hex(bior.m_offset) << " but looking for " << m_addr);
 		// FIEMAP/resolve are working, but the data is old.
 		BEESCOUNT(chase_wrong_addr);
 		return BeesFileRange();
@@ -240,10 +229,12 @@ BeesResolver::chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &
 	// Search near the resolved address for a matching data block.
 	// ...even if it's not compressed, we should do this sanity
 	// check before considering the block as a duplicate candidate.
+	// FIXME:  this is mostly obsolete now and we shouldn't do it here.
+	// Don't bother fixing it because it will all go away with (extent, offset) reads.
 	auto new_bbd = adjust_offset(haystack_bbd, needle_bbd);
 	if (new_bbd.empty()) {
 		// matching offset search failed
-		BEESCOUNT(chase_wrong_data);
+		BEESCOUNT(chase_no_data);
 		return BeesFileRange();
 	}
 	if (new_bbd.begin() == haystack_bbd.begin()) {
@@ -368,7 +359,8 @@ BeesResolver::for_each_extent_ref(BeesBlockData bbd, function<bool(const BeesFil
 		}
 
 		// Look at the old data
-		catch_all([&]() {
+		// FIXME:  propagate exceptions for now.  Proper fix requires a rewrite.
+		// catch_all([&]() {
 			BEESTRACE("chase_extent_ref ino " << ino_off_root << " bbd " << bbd);
 			auto new_range = chase_extent_ref(ino_off_root, bbd);
 			// XXX: should we catch visitor's exceptions here?
@@ -378,9 +370,12 @@ BeesResolver::for_each_extent_ref(BeesBlockData bbd, function<bool(const BeesFil
 				// We have reliable block addresses now, so we guarantee we can hit the desired block.
 				// Failure in chase_extent_ref means we are done, and don't need to look up all the
 				// other references.
-				stop_now = true;
+				// Or...not?  If we have a compressed extent, some refs will not match
+				// if there is are two references to the same extent with a reference
+				// to a different extent between them.
+				// stop_now = true;
 			}
-		});
+		// });
 
 		if (stop_now) {
 			break;
@@ -390,14 +385,15 @@ BeesResolver::for_each_extent_ref(BeesBlockData bbd, function<bool(const BeesFil
 }
 
 BeesFileRange
-BeesResolver::replace_dst(const BeesFileRange &dst_bfr)
+BeesResolver::replace_dst(const BeesFileRange &dst_bfr_in)
 {
-	BEESTRACE("replace_dst dst_bfr " << dst_bfr);
+	BEESTRACE("replace_dst dst_bfr " << dst_bfr_in);
 	BEESCOUNT(replacedst_try);
 
 	// Open dst, reuse it for all src
-	BEESNOTE("Opening dst bfr " << dst_bfr);
-	BEESTRACE("Opening dst bfr " << dst_bfr);
+	BEESNOTE("Opening dst bfr " << dst_bfr_in);
+	BEESTRACE("Opening dst bfr " << dst_bfr_in);
+	auto dst_bfr = dst_bfr_in;
 	dst_bfr.fd(m_ctx);
 
 	BeesFileRange overlap_bfr;
@@ -405,10 +401,11 @@ BeesResolver::replace_dst(const BeesFileRange &dst_bfr)
 
 	BeesBlockData bbd(dst_bfr);
 
-	for_each_extent_ref(bbd, [&](const BeesFileRange &src_bfr) -> bool {
+	for_each_extent_ref(bbd, [&](const BeesFileRange &src_bfr_in) -> bool {
 		// Open src
-		BEESNOTE("Opening src bfr " << src_bfr);
-		BEESTRACE("Opening src bfr " << src_bfr);
+		BEESNOTE("Opening src bfr " << src_bfr_in);
+		BEESTRACE("Opening src bfr " << src_bfr_in);
+		auto src_bfr = src_bfr_in;
 		src_bfr.fd(m_ctx);
 
 		if (dst_bfr.overlaps(src_bfr)) {
@@ -421,7 +418,9 @@ BeesResolver::replace_dst(const BeesFileRange &dst_bfr)
 		BeesBlockData src_bbd(src_bfr.fd(), src_bfr.begin(), min(BLOCK_SIZE_SUMS, src_bfr.size()));
 		if (bbd.addr().get_physical_or_zero() == src_bbd.addr().get_physical_or_zero()) {
 			BEESCOUNT(replacedst_same);
-			return false; // i.e. continue
+			// stop looping here, all the other srcs will probably fail this test too
+			BeesTracer::set_silent();
+			throw runtime_error("FIXME: too many duplicate candidates, bailing out here");
 		}
 
 		// Make pair(src, dst)
@@ -443,7 +442,7 @@ BeesResolver::replace_dst(const BeesFileRange &dst_bfr)
 			BEESCOUNT(replacedst_dedup_hit);
 			m_found_dup = true;
 			overlap_bfr = brp.second;
-			// FIXME:  find best range first, then dedup that
+			// FIXME:  find best range first, then dedupe that
 			return true; // i.e. break
 		} else {
 			BEESCOUNT(replacedst_dedup_miss);
@@ -477,11 +476,6 @@ BeesResolver::find_all_matches(BeesBlockData &bbd)
 bool
 BeesResolver::operator<(const BeesResolver &that) const
 {
-	if (that.m_bior_count < m_bior_count) {
-		return true;
-	} else if (m_bior_count < that.m_bior_count) {
-		return false;
-	}
-	return m_addr < that.m_addr;
+	// Lowest count, highest address
+	return tie(that.m_bior_count, m_addr) < tie(m_bior_count, that.m_addr);
 }
-

src/bees-thread.cc

@@ -13,19 +13,16 @@ void
 BeesThread::exec(function<void()> func)
 {
 	m_timer.reset();
-	BEESLOG("BeesThread exec " << m_name);
+	BEESLOGDEBUG("BeesThread exec " << m_name);
 	m_thread_ptr = make_shared<thread>([=]() {
-		BEESLOG("Starting thread " << m_name);
 		BeesNote::set_name(m_name);
+		BEESLOGDEBUG("Starting thread " << m_name);
 		BEESNOTE("thread function");
 		Timer thread_time;
-		catch_all([&]() {
-			DIE_IF_MINUS_ERRNO(pthread_setname_np(pthread_self(), m_name.c_str()));
-		});
 		catch_all([&]() {
 			func();
 		});
-		BEESLOG("Exiting thread " << m_name << ", " << thread_time << " sec");
+		BEESLOGDEBUG("Exiting thread " << m_name << ", " << thread_time << " sec");
 	});
 }
 
@@ -33,7 +30,7 @@ BeesThread::BeesThread(string name, function<void()> func) :
 	m_name(name)
 {
 	THROW_CHECK1(invalid_argument, name, !name.empty());
-	BEESLOG("BeesThread construct " << m_name);
+	BEESLOGDEBUG("BeesThread construct " << m_name);
 	exec(func);
 }
 
@@ -41,20 +38,20 @@ void
 BeesThread::join()
 {
 	if (!m_thread_ptr) {
-		BEESLOG("Thread " << m_name << " no thread ptr");
+		BEESLOGDEBUG("Thread " << m_name << " no thread ptr");
 		return;
 	}
 
-	BEESLOG("BeesThread::join " << m_name);
+	BEESLOGDEBUG("BeesThread::join " << m_name);
 	if (m_thread_ptr->joinable()) {
-		BEESLOG("Joining thread " << m_name);
+		BEESLOGDEBUG("Joining thread " << m_name);
 		Timer thread_time;
 		m_thread_ptr->join();
-		BEESLOG("Waited for " << m_name << ", " << thread_time << " sec");
+		BEESLOGDEBUG("Waited for " << m_name << ", " << thread_time << " sec");
 	} else if (!m_name.empty()) {
-		BEESLOG("BeesThread " << m_name << " not joinable");
+		BEESLOGDEBUG("BeesThread " << m_name << " not joinable");
 	} else {
-		BEESLOG("BeesThread else " << m_name);
+		BEESLOGDEBUG("BeesThread else " << m_name);
 	}
 }
 
@@ -67,25 +64,20 @@ BeesThread::set_name(const string &name)
 BeesThread::~BeesThread()
 {
 	if (!m_thread_ptr) {
-		BEESLOG("Thread " << m_name << " no thread ptr");
+		BEESLOGDEBUG("Thread " << m_name << " no thread ptr");
 		return;
 	}
 
-	BEESLOG("BeesThread destructor " << m_name);
+	BEESLOGDEBUG("BeesThread destructor " << m_name);
 	if (m_thread_ptr->joinable()) {
-		BEESLOG("Cancelling thread " << m_name);
-		int rv = pthread_cancel(m_thread_ptr->native_handle());
-		if (rv) {
-			BEESLOG("pthread_cancel returned " << strerror(-rv));
-		}
-		BEESLOG("Waiting for thread " << m_name);
+		BEESLOGDEBUG("Waiting for thread " << m_name);
 		Timer thread_time;
 		m_thread_ptr->join();
-		BEESLOG("Waited for " << m_name << ", " << thread_time << " sec");
+		BEESLOGDEBUG("Waited for " << m_name << ", " << thread_time << " sec");
 	} else if (!m_name.empty()) {
-		BEESLOG("Thread " << m_name << " not joinable");
+		BEESLOGDEBUG("Thread " << m_name << " not joinable");
 	} else {
-		BEESLOG("Thread destroy else " << m_name);
+		BEESLOGDEBUG("Thread destroy else " << m_name);
 	}
 }
 

src/bees-trace.cc

@@ -0,0 +1,161 @@
+#include "bees.h"
+
+// tracing ----------------------------------------
+
+int bees_log_level = 8;
+
+thread_local BeesTracer *BeesTracer::tl_next_tracer = nullptr;
+thread_local bool BeesTracer::tl_first = true;
+thread_local bool BeesTracer::tl_silent = false;
+
+#if __cplusplus >= 201703
+static
+bool
+exception_check()
+{
+	return uncaught_exceptions();
+}
+#else
+static
+bool
+exception_check()
+{
+	return uncaught_exception();
+}
+#endif
+
+BeesTracer::~BeesTracer()
+{
+	if (!tl_silent && exception_check()) {
+		if (tl_first) {
+			BEESLOGNOTICE("--- BEGIN TRACE --- exception ---");
+			tl_first = false;
+		}
+		try {
+			m_func();
+		} catch (exception &e) {
+			BEESLOGNOTICE("Nested exception: " << e.what());
+		} catch (...) {
+			BEESLOGNOTICE("Nested exception ...");
+		}
+		if (!m_next_tracer) {
+			BEESLOGNOTICE("---  END  TRACE --- exception ---");
+		}
+	}
+	tl_next_tracer = m_next_tracer;
+	if (!m_next_tracer) {
+		tl_silent = false;
+		tl_first = true;
+	}
+}
+
+BeesTracer::BeesTracer(function<void()> f, bool silent) :
+	m_func(f)
+{
+	m_next_tracer = tl_next_tracer;
+	tl_next_tracer = this;
+	tl_silent = silent;
+}
+
+void
+BeesTracer::trace_now()
+{
+	BeesTracer *tp = tl_next_tracer;
+	BEESLOGNOTICE("--- BEGIN TRACE ---");
+	while (tp) {
+		tp->m_func();
+		tp = tp->m_next_tracer;
+	}
+	BEESLOGNOTICE("---  END  TRACE ---");
+}
+
+bool
+BeesTracer::get_silent()
+{
+	return tl_silent;
+}
+
+void
+BeesTracer::set_silent()
+{
+	tl_silent = true;
+}
+
+thread_local BeesNote *BeesNote::tl_next = nullptr;
+mutex BeesNote::s_mutex;
+map<pid_t, BeesNote*> BeesNote::s_status;
+thread_local string BeesNote::tl_name;
+
+BeesNote::~BeesNote()
+{
+	tl_next = m_prev;
+	unique_lock<mutex> lock(s_mutex);
+	if (tl_next) {
+		s_status[crucible::gettid()] = tl_next;
+	} else {
+		s_status.erase(crucible::gettid());
+	}
+}
+
+BeesNote::BeesNote(function<void(ostream &os)> f) :
+	m_func(f)
+{
+	m_name = get_name();
+	m_prev = tl_next;
+	tl_next = this;
+	unique_lock<mutex> lock(s_mutex);
+	s_status[crucible::gettid()] = tl_next;
+}
+
+void
+BeesNote::set_name(const string &name)
+{
+	tl_name = name;
+	pthread_setname(name);
+}
+
+string
+BeesNote::get_name()
+{
+	// Use explicit name if given
+	if (!tl_name.empty()) {
+		return tl_name;
+	}
+
+	// Try a Task name.  If there is one, return it, but do not
+	// remember it.  Each output message may be a different Task.
+	// The current task is thread_local so we don't need to worry
+	// about it being destroyed under us.
+	auto current_task = Task::current_task();
+	if (current_task) {
+		return current_task.title();
+	}
+
+	// OK try the pthread name next.
+
+	// thread_getname_np returns process name
+	// ...by default?  ...for the main thread?
+	// ...except during exception handling?
+	// ...randomly?
+	return pthread_getname();
+}
+
+BeesNote::ThreadStatusMap
+BeesNote::get_status()
+{
+	unique_lock<mutex> lock(s_mutex);
+	ThreadStatusMap rv;
+	for (auto t : s_status) {
+		ostringstream oss;
+		if (!t.second->m_name.empty()) {
+			oss << t.second->m_name << ": ";
+		}
+		if (t.second->m_timer.age() > BEES_TOO_LONG) {
+			oss << "[" << t.second->m_timer << "s] ";
+		}
+		t.second->m_func(oss);
+		rv[t.first] = oss.str();
+	}
+	return rv;
+}
+

src/bees-types.cc

@@ -1,6 +1,5 @@
 #include "bees.h"
 
-#include "crucible/crc64.h"
 #include "crucible/limits.h"
 #include "crucible/ntoa.h"
 #include "crucible/string.h"
@@ -71,7 +70,18 @@ operator<<(ostream &os, const BeesFileRange &bfr)
 	if (bfr.end() == numeric_limits<off_t>::max()) {
 		os << "- [" << to_hex(bfr.begin()) << "..eof]";
 	} else {
-		os << pretty(bfr.size()) << " [" << to_hex(bfr.begin()) << ".." << to_hex(bfr.end()) << "]";
+		os << pretty(bfr.size()) << " ";
+		if (bfr.begin() != 0) {
+			os << "[" << to_hex(bfr.begin());
+		} else {
+			os << "(";
+		}
+		os << ".." << to_hex(bfr.end());
+		if (!!bfr.m_fd && bfr.end() >= bfr.file_size()) {
+			os << ")";
+		} else {
+			os << "]";
+		}
 	}
 	if (bfr.m_fid) {
 		os << " fid = " << bfr.m_fid;
@@ -92,8 +102,6 @@ operator<<(ostream &os, const BeesRangePair &brp)
 		<< "\ndst = " << brp.second.fd() << " " << name_fd(brp.second.fd());
 }
 
-mutex BeesFileRange::s_mutex;
-
 bool
 BeesFileRange::operator<(const BeesFileRange &that) const
 {
@@ -145,14 +153,14 @@ off_t
 BeesFileRange::file_size() const
 {
 	if (m_file_size <= 0) {
-		// Use method fd() not member m_fd() so we hold lock
 		Stat st(fd());
 		m_file_size = st.st_size;
 		// These checks could trigger on valid input, but that would mean we have
 		// lost a race (e.g. a file was truncated while we were building a
 		// matching range pair with it).  In such cases we should probably stop
 		// whatever we were doing and backtrack to some higher level anyway.
-		THROW_CHECK1(invalid_argument, m_file_size, m_file_size > 0);
+		// Well, OK, but we call this function from exception handlers...
+		THROW_CHECK1(invalid_argument, m_file_size, m_file_size >= 0);
 		// THROW_CHECK2(invalid_argument, m_file_size, m_end, m_end <= m_file_size || m_end == numeric_limits<off_t>::max());
 	}
 	return m_file_size;
@@ -178,31 +186,21 @@ BeesFileRange::grow_begin(off_t delta)
 BeesFileRange::BeesFileRange(const BeesBlockData &bbd) :
 	m_fd(bbd.fd()),
 	m_begin(bbd.begin()),
-	m_end(bbd.end()),
-	m_file_size(-1)
+	m_end(bbd.end())
 {
 }
 
 BeesFileRange::BeesFileRange(Fd fd, off_t begin, off_t end) :
 	m_fd(fd),
 	m_begin(begin),
-	m_end(end),
-	m_file_size(-1)
+	m_end(end)
 {
 }
 
 BeesFileRange::BeesFileRange(const BeesFileId &fid, off_t begin, off_t end) :
 	m_fid(fid),
 	m_begin(begin),
-	m_end(end),
-	m_file_size(-1)
-{
-}
-
-BeesFileRange::BeesFileRange() :
-	m_begin(0),
-	m_end(0),
-	m_file_size(-1)
+	m_end(end)
 {
 }
 
@@ -240,42 +238,6 @@ BeesFileRange::overlaps(const BeesFileRange &that) const
 	return false;
 }
 
-bool
-BeesFileRange::coalesce(const BeesFileRange &that)
-{
-	// Let's define coalesce-with-null as identity,
-	// and coalesce-null-with-null as coalesced
-	if (!*this) {
-		operator=(that);
-		return true;
-	}
-	if (!that) {
-		return true;
-	}
-
-	// Can't coalesce different files
-	if (!is_same_file(that)) return false;
-
-	pair<uint64_t, uint64_t> a(m_begin, m_end);
-	pair<uint64_t, uint64_t> b(that.m_begin, that.m_end);
-
-	// range a starts lower than or equal b
-	if (b.first < a.first) {
-		swap(a, b);
-	}
-
-	// if b starts within a, they overlap
-	// (and the intersecting region is b.first..min(a.second, b.second))
-	// (and the union region is a.first..max(a.second, b.second))
-	if (b.first >= a.first && b.first < a.second) {
-		m_begin = a.first;
-		m_end = max(a.second, b.second);
-		return true;
-	}
-
-	return false;
-}
-
 BeesFileRange::operator BeesBlockData() const
 {
 	BEESTRACE("operator BeesBlockData " << *this);
@@ -285,22 +247,18 @@ BeesFileRange::operator BeesBlockData() const
 Fd
 BeesFileRange::fd() const
 {
-	unique_lock<mutex> lock(s_mutex);
 	return m_fd;
 }
 
 Fd
-BeesFileRange::fd(const shared_ptr<BeesContext> &ctx) const
+BeesFileRange::fd(const shared_ptr<BeesContext> &ctx)
 {
-	unique_lock<mutex> lock(s_mutex);
 	// If we don't have a fid we can't do much here
 	if (m_fid) {
 		if (!m_fd) {
 			// If we don't have a fd, open by fid
 			if (m_fid && ctx) {
-				lock.unlock();
 				Fd new_fd = ctx->roots()->open_root_ino(m_fid);
-				lock.lock();
 				m_fd = new_fd;
 			}
 		} else {
@@ -374,6 +332,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 	BEESTOOLONG("grow constrained = " << constrained << " *this = " << *this);
 	BEESTRACE("grow constrained = " << constrained << " *this = " << *this);
 	bool rv = false;
+	Timer grow_backward_timer;
 
 	THROW_CHECK1(invalid_argument, first.begin(), (first.begin() & BLOCK_MASK_CLONE) == 0);
 	THROW_CHECK1(invalid_argument, second.begin(), (second.begin() & BLOCK_MASK_CLONE) == 0);
@@ -390,8 +349,8 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 	BEESTRACE("e_second " << e_second);
 
 	// Preread entire extent
-	posix_fadvise(second.fd(), e_second.begin(), e_second.size(), POSIX_FADV_WILLNEED);
-	posix_fadvise(first.fd(), e_second.begin() + first.begin() - second.begin(), e_second.size(), POSIX_FADV_WILLNEED);
+	bees_readahead(second.fd(), e_second.begin(), e_second.size());
+	bees_readahead(first.fd(), e_second.begin() + first.begin() - second.begin(), e_second.size());
 
 	auto hash_table = ctx->hash_table();
 
@@ -410,7 +369,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 				BEESCOUNT(pairbackward_hole);
 				break;
 			}
-			posix_fadvise(second.fd(), e_second.begin(), e_second.size(), POSIX_FADV_WILLNEED);
+			bees_readahead(second.fd(), e_second.begin(), e_second.size());
 #else
 			// This tends to repeatedly process extents that were recently processed.
 			// We tend to catch duplicate blocks early since we scan them forwards.
@@ -434,7 +393,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 		if (!first_addr.is_magic()) {
 			auto first_resolved = ctx->resolve_addr(first_addr);
 			if (first_resolved.is_toxic()) {
-				BEESLOG("WORKAROUND: not growing matching pair backward because src addr is toxic:\n" << *this);
+				BEESLOGWARN("WORKAROUND: not growing matching pair backward because src addr is toxic:\n" << *this);
 				BEESCOUNT(pairbackward_toxic_addr);
 				break;
 			}
@@ -490,7 +449,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 			}
 		}
 		if (found_toxic) {
-			BEESLOG("WORKAROUND: found toxic hash in " << first_bbd << " while extending backward:\n" << *this);
+			BEESLOGWARN("WORKAROUND: found toxic hash in " << first_bbd << " while extending backward:\n" << *this);
 			BEESCOUNT(pairbackward_toxic_hash);
 			break;
 		}
@@ -502,9 +461,11 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 		BEESCOUNT(pairbackward_hit);
 	}
 	BEESCOUNT(pairbackward_stop);
+	BEESCOUNTADD(pairbackward_ms, grow_backward_timer.age() * 1000);
 
 	// Look forward
 	BEESTRACE("grow_forward " << *this);
+	Timer grow_forward_timer;
 	while (first.size() < BLOCK_SIZE_MAX_EXTENT) {
 		if (second.end() >= e_second.end()) {
 			if (constrained) {
@@ -517,7 +478,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 				BEESCOUNT(pairforward_hole);
 				break;
 			}
-			posix_fadvise(second.fd(), e_second.begin(), e_second.size(), POSIX_FADV_WILLNEED);
+			bees_readahead(second.fd(), e_second.begin(), e_second.size());
 		}
 		BEESCOUNT(pairforward_try);
 
@@ -535,7 +496,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 		if (!first_addr.is_magic()) {
 			auto first_resolved = ctx->resolve_addr(first_addr);
 			if (first_resolved.is_toxic()) {
-				BEESLOG("WORKAROUND: not growing matching pair forward because src is toxic:\n" << *this);
+				BEESLOGWARN("WORKAROUND: not growing matching pair forward because src is toxic:\n" << *this);
 				BEESCOUNT(pairforward_toxic);
 				break;
 			}
@@ -599,7 +560,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 			}
 		}
 		if (found_toxic) {
-			BEESLOG("WORKAROUND: found toxic hash in " << first_bbd << " while extending forward:\n" << *this);
+			BEESLOGWARN("WORKAROUND: found toxic hash in " << first_bbd << " while extending forward:\n" << *this);
 			BEESCOUNT(pairforward_toxic_hash);
 			break;
 		}
@@ -618,6 +579,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 	}
 
 	BEESCOUNT(pairforward_stop);
+	BEESCOUNTADD(pairforward_ms, grow_forward_timer.age() * 1000);
 	return rv;
 }
 
@@ -878,6 +840,9 @@ operator<<(ostream &os, const BeesBlockData &bbd)
 		os << ", hash = " << bbd.m_hash;
 	}
 	if (!bbd.m_data.empty()) {
+// Turn this on to debug BeesBlockData, but leave it off otherwise.
+// It's a massive data leak that is only interesting to developers.
+#if 0
 		os << ", data[" << bbd.m_data.size() << "] = '";
 
 		size_t max_print = 12;
@@ -894,6 +859,9 @@ operator<<(ostream &os, const BeesBlockData &bbd)
 			}
 		}
 		os << "...'";
+#else
+		os << ", data[" << bbd.m_data.size() << "]";
+#endif
 	}
 	return os << " }";
 }
@@ -936,12 +904,13 @@ BeesBlockData::data() const
 {
 	if (m_data.empty()) {
 		THROW_CHECK1(invalid_argument, size(), size() > 0);
+		BEESNOTE("Reading BeesBlockData " << *this);
 		BEESTOOLONG("Reading BeesBlockData " << *this);
 		Timer read_timer;
 
-		Blob rv(m_length);
+		Blob rv(size());
 		pread_or_die(m_fd, rv, m_offset);
-		THROW_CHECK2(runtime_error, rv.size(), m_length, ranged_cast<off_t>(rv.size()) == m_length);
+		THROW_CHECK2(runtime_error, rv.size(), size(), ranged_cast<off_t>(rv.size()) == size());
 		m_data = rv;
 		BEESCOUNT(block_read);
 		BEESCOUNTADD(block_bytes, rv.size());
@@ -955,14 +924,10 @@ BeesHash
 BeesBlockData::hash() const
 {
 	if (!m_hash_done) {
-		// We can only dedup unaligned EOF blocks against other unaligned EOF blocks,
+		// We can only dedupe unaligned EOF blocks against other unaligned EOF blocks,
 		// so we do NOT round up to a full sum block size.
 		const Blob &blob = data();
-		// TODO:  It turns out that file formats with 4K block
-		// alignment and embedded CRC64 do exist, and every block
-		// of such files has the same hash.  Could use a subset
-		// of SHA1 here instead.
-		m_hash = Digest::CRC::crc64(blob.data(), blob.size());
+		m_hash = BeesHash(blob.data(), blob.size());
 		m_hash_done = true;
 		BEESCOUNT(block_hash);
 	}
@@ -974,9 +939,8 @@ bool
 BeesBlockData::is_data_zero() const
 {
 	// The CRC64 of zero is zero, so skip some work if we already know the CRC
-	if (m_hash_done && m_hash != 0) {
-		return false;
-	}
+	// ...but that doesn't work for any other hash function, and it
+	// saves us next to nothing.
 
 	// OK read block (maybe) and check every byte
 	for (auto c : data()) {

src/bees-usage.txt

@@ -0,0 +1,35 @@
+Usage: %s [options] fs-root-path
+Performs best-effort extent-same deduplication on btrfs.
+
+fs-root-path MUST be the root of a btrfs filesystem tree (subvol id 5).
+Other directories will be rejected.
+
+Options:
+    -h, --help            Show this help
+
+Load management options:
+    -c, --thread-count    Worker thread count (default CPU count * factor)
+    -C, --thread-factor   Worker thread factor (default 1)
+    -G, --thread-min      Minimum worker thread count (default 0)
+    -g, --loadavg-target  Target load average for worker threads (default none)
+
+Filesystem tree traversal options:
+    -m, --scan-mode       Scanning mode (0..2, default 0)
+
+Workarounds:
+    -a, --workaround-btrfs-send    Workaround for btrfs send
+                                   (ignore RO snapshots)
+
+Logging options:
+    -t, --timestamps      Show timestamps in log output (default)
+    -T, --no-timestamps   Omit timestamps in log output
+    -p, --absolute-paths  Show absolute paths (default)
+    -P, --strip-paths     Strip $CWD from beginning of all paths in the log
+    -v, --verbose         Set maximum log level (0..8, default 8)
+
+Optional environment variables:
+    BEESHOME    Path to hash table and configuration files
+                (default is .beeshome/ in the root of the filesystem).
+
+    BEESSTATUS  File to write status to (tmpfs recommended, e.g. /run).
+                No status is written if this variable is unset.

src/bees.cc

@@ -1,15 +1,17 @@
 #include "bees.h"
 
-#include "crucible/interp.h"
 #include "crucible/limits.h"
 #include "crucible/process.h"
 #include "crucible/string.h"
+#include "crucible/task.h"
 
 #include <cctype>
 #include <cmath>
+#include <cstdio>
 
 #include <iostream>
 #include <memory>
+#include <sstream>
 
 // PRIx64
 #include <inttypes.h>
@@ -20,147 +22,23 @@
 #include <linux/fs.h>
 #include <sys/ioctl.h>
 
+// setrlimit
+#include <sys/time.h>
+#include <sys/resource.h>
+
+#include <getopt.h>
+
 using namespace crucible;
 using namespace std;
 
-int
-do_cmd_help(const ArgList &argv)
-{
-	cerr << "Usage: " << argv[0] << " fs-root-path [fs-root-path-2...]\n"
-		"Performs best-effort extent-same deduplication on btrfs.\n"
-		"\n"
-		"fs-root-path MUST be the root of a btrfs filesystem tree (id 5).\n"
-		"Other directories will be rejected.\n"
-		"\n"
-		"Multiple filesystems can share a single hash table (BEESHOME)\n"
-		"but this only works well if the content of each filesystem\n"
-		"is distinct from all the others.\n"
-		"\n"
-		"Required environment variables:\n"
-		"\tBEESHOME\tPath to hash table and configuration files\n"
-		"\n"
-		"Optional environment variables:\n"
-		"\tBEESSTATUS\tFile to write status to (tmpfs recommended, e.g. /run)\n"
-		"\n"
-	<< endl;
-	return 0;
-}
-
-// tracing ----------------------------------------
-
-RateLimiter bees_info_rate_limit(BEES_INFO_RATE, BEES_INFO_BURST);
-
-thread_local BeesTracer *BeesTracer::s_next_tracer = nullptr;
-
-BeesTracer::~BeesTracer()
-{
-	if (uncaught_exception()) {
-		m_func();
-		if (!m_next_tracer) {
-			BEESLOG("---  END  TRACE --- exception ---");
-		}
-	}
-	s_next_tracer = m_next_tracer;
-}
-
-BeesTracer::BeesTracer(function<void()> f) :
-	m_func(f)
-{
-	m_next_tracer = s_next_tracer;
-	s_next_tracer = this;
-}
-
 void
-BeesTracer::trace_now()
+do_cmd_help(char *argv[])
 {
-	BeesTracer *tp = s_next_tracer;
-	BEESLOG("--- BEGIN TRACE ---");
-	while (tp) {
-		tp->m_func();
-		tp = tp->m_next_tracer;
-	}
-	BEESLOG("---  END  TRACE ---");
-}
-
-thread_local BeesNote *BeesNote::s_next = nullptr;
-mutex BeesNote::s_mutex;
-map<pid_t, BeesNote*> BeesNote::s_status;
-thread_local string BeesNote::s_name;
-
-BeesNote::~BeesNote()
-{
-	unique_lock<mutex> lock(s_mutex);
-	s_next = m_prev;
-	if (s_next) {
-		s_status[gettid()] = s_next;
-	} else {
-		s_status.erase(gettid());
-	}
-}
-
-BeesNote::BeesNote(function<void(ostream &os)> f) :
-	m_func(f)
-{
-	unique_lock<mutex> lock(s_mutex);
-	m_name = s_name;
-	m_prev = s_next;
-	s_next = this;
-	s_status[gettid()] = s_next;
-}
-
-void
-BeesNote::set_name(const string &name)
-{
-	unique_lock<mutex> lock(s_mutex);
-	s_name = name;
-}
-
-string
-BeesNote::get_name()
-{
-	unique_lock<mutex> lock(s_mutex);
-	if (s_name.empty()) {
-		return "bees";
-	} else {
-		return s_name;
-	}
-}
-
-BeesNote::ThreadStatusMap
-BeesNote::get_status()
-{
-	unique_lock<mutex> lock(s_mutex);
-	ThreadStatusMap rv;
-	for (auto t : s_status) {
-		ostringstream oss;
-		if (!t.second->m_name.empty()) {
-			oss << t.second->m_name << ": ";
-		}
-		if (t.second->m_timer.age() > BEES_TOO_LONG) {
-			oss << "[" << t.second->m_timer << "s] ";
-		}
-		t.second->m_func(oss);
-		rv[t.first] = oss.str();
-	}
-	return rv;
+	fprintf(stderr, BEES_USAGE, argv[0]);
 }
 
 // static inline helpers ----------------------------------------
 
-static inline
-bool
-bees_addr_check(uint64_t v)
-{
-	return !(v & (1ULL << 63));
-}
-
-static inline
-bool
-bees_addr_check(int64_t v)
-{
-	return !(v & (1ULL << 63));
-}
-
 string
 pretty(double d)
 {
@@ -208,11 +86,10 @@ template <class T>
 T&
 BeesStatTmpl<T>::at(string idx)
 {
-	unique_lock<mutex> lock(m_mutex);
-    if (!m_stats_map.count(idx)) {
+	if (!m_stats_map.count(idx)) {
 		m_stats_map[idx] = 0;
 	}
-    return m_stats_map[idx];
+	return m_stats_map[idx];
 }
 
 template <class T>
@@ -220,7 +97,8 @@ T
 BeesStatTmpl<T>::at(string idx) const
 {
 	unique_lock<mutex> lock(m_mutex);
-    return m_stats_map.at(idx);
+	auto rv = m_stats_map.at(idx);
+	return rv;
 }
 
 template <class T>
@@ -228,10 +106,11 @@ void
 BeesStatTmpl<T>::add_count(string idx, size_t amount)
 {
 	unique_lock<mutex> lock(m_mutex);
-    if (!m_stats_map.count(idx)) {
-		m_stats_map[idx] = 0;
+	if (!m_stats_map.count(idx)) {
+		m_stats_map[idx] = amount;
+	} else {
+		m_stats_map[idx] += amount;
 	}
-	m_stats_map.at(idx) += amount;
 }
 
 template <class T>
@@ -260,14 +139,17 @@ BeesStats
 BeesStats::operator-(const BeesStats &that) const
 {
 	if (&that == this) return BeesStats();
+
 	unique_lock<mutex> this_lock(m_mutex);
 	BeesStats this_copy;
 	this_copy.m_stats_map = m_stats_map;
+	this_lock.unlock();
+
 	unique_lock<mutex> that_lock(that.m_mutex);
 	BeesStats that_copy;
 	that_copy.m_stats_map = that.m_stats_map;
-	this_lock.unlock();
 	that_lock.unlock();
+
 	for (auto i : that.m_stats_map) {
 		if (i.second != 0) {
 			this_copy.at(i.first) -= i.second;
@@ -316,7 +198,7 @@ BeesTooLong::check() const
 	if (age() > m_limit) {
 		ostringstream oss;
 		m_func(oss);
-		BEESLOG("PERFORMANCE: " << *this << " sec: " << oss.str());
+		BEESLOGWARN("PERFORMANCE: " << *this << " sec: " << oss.str());
 	}
 }
 
@@ -333,22 +215,75 @@ BeesTooLong::operator=(const func_type &f)
 }
 
 void
-bees_sync(int fd)
+bees_readahead(int const fd, const off_t offset, const size_t size)
 {
-	Timer sync_timer;
-	BEESNOTE("syncing " << name_fd(fd));
-	BEESTOOLONG("syncing " << name_fd(fd));
-	DIE_IF_NON_ZERO(fsync(fd));
-	BEESCOUNT(sync_count);
-	BEESCOUNTADD(sync_ms, sync_timer.age() * 1000);
+	Timer readahead_timer;
+	BEESNOTE("readahead " << name_fd(fd) << " offset " << to_hex(offset) << " len " << pretty(size));
+	BEESTOOLONG("readahead " << name_fd(fd) << " offset " << to_hex(offset) << " len " << pretty(size));
+#if 0
+	// In the kernel, readahead() is identical to posix_fadvise(..., POSIX_FADV_DONTNEED)
+	DIE_IF_NON_ZERO(readahead(fd, offset, size));
+#else
+	// Make sure this data is in page cache by brute force
+	// This isn't necessary and it might even be slower,
+	// but the btrfs kernel code does readahead with lower ioprio
+	// and might discard the readahead request entirely,
+	// so it's maybe, *maybe*, worth doing both.
+	BEESNOTE("emulating readahead " << name_fd(fd) << " offset " << to_hex(offset) << " len " << pretty(size));
+	auto working_size = size;
+	auto working_offset = offset;
+	while (working_size) {
+		// don't care about multithreaded writes to this buffer--it is garbage anyway
+		static uint8_t dummy[BEES_READAHEAD_SIZE];
+		const size_t this_read_size = min(working_size, sizeof(dummy));
+		// Ignore errors and short reads.  It turns out our size
+		// parameter isn't all that accurate, so we can't use
+		// the pread_or_die template.
+		(void)!pread(fd, dummy, this_read_size, working_offset);
+		BEESCOUNT(readahead_count);
+		BEESCOUNTADD(readahead_bytes, this_read_size);
+		working_offset += this_read_size;
+		working_size -= this_read_size;
+	}
+#endif
+	BEESCOUNTADD(readahead_ms, readahead_timer.age() * 1000);
 }
 
+void
+bees_unreadahead(int const fd, off_t offset, size_t size)
+{
+	Timer unreadahead_timer;
+	BEESNOTE("unreadahead " << name_fd(fd) << " offset " << to_hex(offset) << " len " << pretty(size));
+	BEESTOOLONG("unreadahead " << name_fd(fd) << " offset " << to_hex(offset) << " len " << pretty(size));
+	DIE_IF_NON_ZERO(posix_fadvise(fd, offset, size, POSIX_FADV_DONTNEED));
+	BEESCOUNTADD(readahead_unread_ms, unreadahead_timer.age() * 1000);
+}
+
+thread_local random_device bees_random_device;
+thread_local uniform_int_distribution<default_random_engine::result_type> bees_random_seed_dist(
+	numeric_limits<default_random_engine::result_type>::min(),
+	numeric_limits<default_random_engine::result_type>::max()
+);
+thread_local default_random_engine bees_generator(bees_random_seed_dist(bees_random_device));
+
 BeesStringFile::BeesStringFile(Fd dir_fd, string name, size_t limit) :
 	m_dir_fd(dir_fd),
 	m_name(name),
 	m_limit(limit)
 {
-	BEESLOG("BeesStringFile " << name_fd(m_dir_fd) << "/" << m_name << " max size " << pretty(m_limit));
+	BEESLOGINFO("BeesStringFile " << name_fd(m_dir_fd) << "/" << m_name << " max size " << pretty(m_limit));
+}
+
+void
+BeesStringFile::name(const string &new_name)
+{
+	m_name = new_name;
+}
+
+string
+BeesStringFile::name() const
+{
+	return m_name;
 }
 
 string
@@ -384,42 +319,25 @@ BeesStringFile::write(string contents)
 		Fd ofd = openat_or_die(m_dir_fd, tmpname, FLAGS_CREATE_FILE, S_IRUSR | S_IWUSR);
 		BEESNOTE("writing " << tmpname << " in " << name_fd(m_dir_fd));
 		write_or_die(ofd, contents);
+#if 0
+		// This triggers too many btrfs bugs.  I wish I was kidding.
+		// Forget snapshots, balance, compression, and dedupe:
+		// the system call you have to fear on btrfs is fsync().
+		// Also note that when bees renames a temporary over an
+		// existing file, it flushes the temporary, so we get
+		// the right behavior if we just do nothing here
+		// (except when the file is first created; however,
+		// in that case the result is the same as if the file
+		// did not exist, was empty, or was filled with garbage).
 		BEESNOTE("fsyncing " << tmpname << " in " << name_fd(m_dir_fd));
 		DIE_IF_NON_ZERO(fsync(ofd));
+#endif
 	}
 	BEESNOTE("renaming " << tmpname << " to " << m_name << " in FD " << name_fd(m_dir_fd));
 	BEESTRACE("renaming " << tmpname << " to " << m_name << " in FD " << name_fd(m_dir_fd));
 	renameat_or_die(m_dir_fd, tmpname, m_dir_fd, m_name);
 }
 
-void
-BeesTempFile::create()
-{
-	// BEESLOG("creating temporary file in " << m_ctx->root_path());
-	BEESNOTE("creating temporary file in " << m_ctx->root_path());
-	BEESTOOLONG("creating temporary file in " << m_ctx->root_path());
-
-	DIE_IF_MINUS_ONE(m_fd = openat(m_ctx->root_fd(), ".", FLAGS_OPEN_TMPFILE, S_IRUSR | S_IWUSR));
-	BEESCOUNT(tmp_create);
-
-	// Can't reopen this file, so don't allow any resolves there
-	// Resolves won't work there anyway.  There are lots of tempfiles
-	// and they're short-lived, so this ends up being just a memory leak
-	// m_ctx->blacklist_add(BeesFileId(m_fd));
-	m_ctx->insert_root_ino(m_fd);
-
-	// Set compression attribute
-	int flags = 0;
-	BEESTRACE("Getting FS_COMPR_FL on m_fd " << name_fd(m_fd) << " flags " << to_hex(flags));
-	DIE_IF_MINUS_ONE(ioctl(m_fd, FS_IOC_GETFLAGS, &flags));
-	flags |= FS_COMPR_FL;
-	BEESTRACE("Setting FS_COMPR_FL on m_fd " << name_fd(m_fd) << " flags " << to_hex(flags));
-	DIE_IF_MINUS_ONE(ioctl(m_fd, FS_IOC_SETFLAGS, &flags));
-
-	// Always leave first block empty to avoid creating a file with an inline extent
-	m_end_offset = BLOCK_SIZE_CLONE;
-}
-
 void
 BeesTempFile::resize(off_t offset)
 {
@@ -427,36 +345,78 @@ BeesTempFile::resize(off_t offset)
 	BEESNOTE("Resizing temporary file " << name_fd(m_fd) << " to " << to_hex(offset));
 	BEESTRACE("Resizing temporary file " << name_fd(m_fd) << " to " << to_hex(offset));
 
-	// Ensure that file covers m_end_offset..offset
-	THROW_CHECK2(invalid_argument, m_end_offset, offset, m_end_offset < offset);
-
 	// Truncate
+	Timer resize_timer;
 	DIE_IF_NON_ZERO(ftruncate(m_fd, offset));
 	BEESCOUNT(tmp_resize);
 
 	// Success
 	m_end_offset = offset;
+
+	// Count time spent here
+	BEESCOUNTADD(tmp_resize_ms, resize_timer.age() * 1000);
+}
+
+void
+BeesTempFile::reset()
+{
+	// Always leave first block empty to avoid creating a file with an inline extent
+	resize(BLOCK_SIZE_CLONE);
+}
+
+
+BeesTempFile::~BeesTempFile()
+{
+	BEESLOGDEBUG("destroying temporary file " << this << " in " << m_ctx->root_path() << " fd " << name_fd(m_fd));
+
+	// Remove this file from open_root_ino lookup table
+	m_roots->erase_tmpfile(m_fd);
+
+	// Remove from blacklist
+	m_ctx->blacklist_erase(BeesFileId(m_fd));
 }
 
 BeesTempFile::BeesTempFile(shared_ptr<BeesContext> ctx) :
 	m_ctx(ctx),
+	m_roots(ctx->roots()),
 	m_end_offset(0)
 {
-	create();
+	BEESLOGDEBUG("creating temporary file " << this << " in " << m_ctx->root_path());
+	BEESNOTE("creating temporary file in " << m_ctx->root_path());
+	BEESTOOLONG("creating temporary file in " << m_ctx->root_path());
+
+	Timer create_timer;
+	DIE_IF_MINUS_ONE(m_fd = openat(m_ctx->root_fd(), ".", FLAGS_OPEN_TMPFILE, S_IRUSR | S_IWUSR));
+	BEESCOUNT(tmp_create);
+
+	// Don't include this file in new extent scans
+	m_ctx->blacklist_insert(BeesFileId(m_fd));
+
+	// Add this file to open_root_ino lookup table
+	m_roots->insert_tmpfile(m_fd);
+
+	// Set compression attribute
+	BEESTRACE("Getting FS_COMPR_FL on m_fd " << name_fd(m_fd));
+	int flags = ioctl_iflags_get(m_fd);
+	flags |= FS_COMPR_FL;
+	BEESTRACE("Setting FS_COMPR_FL on m_fd " << name_fd(m_fd) << " flags " << to_hex(flags));
+	ioctl_iflags_set(m_fd, flags);
+
+	// Count time spent here
+	BEESCOUNTADD(tmp_create_ms, create_timer.age() * 1000);
+
+	// Set initial size
+	reset();
 }
 
 void
 BeesTempFile::realign()
-{ 
-	if (m_end_offset > BLOCK_SIZE_MAX_TEMP_FILE) {
-		BEESLOG("temporary file size " << to_hex(m_end_offset) << " > max " << BLOCK_SIZE_MAX_TEMP_FILE);
-		BEESCOUNT(tmp_trunc);
-		return create();
-	}
+{
 	if (m_end_offset & BLOCK_MASK_CLONE) {
 		// BEESTRACE("temporary file size " << to_hex(m_end_offset) << " not aligned");
 		BEESCOUNT(tmp_realign);
-		return create();
+		reset();
+		return;
 	}
 	// OK as is
 	BEESCOUNT(tmp_aligned);
@@ -483,14 +443,19 @@ BeesTempFile::make_hole(off_t count)
 BeesFileRange
 BeesTempFile::make_copy(const BeesFileRange &src)
 {
-	BEESLOG("copy: " << src);
+	BEESLOGINFO("copy: " << src);
 	BEESNOTE("Copying " << src);
 	BEESTRACE("Copying " << src);
 
 	THROW_CHECK1(invalid_argument, src, src.size() > 0);
 
-	// FIXME:  don't know where these come from, but we can't handle them.
-	// Grab a trace for the log.
+	// FIEMAP used to give us garbage data, e.g. distinct adjacent
+	// extents merged into a single entry in the FIEMAP output.
+	// FIEMAP didn't stop giving us garbage data, we just stopped
+	// using FIEMAP.
+	// We shouldn't get absurdly large extents any more; however,
+	// it's still a problem if we do, so bail out and leave a trace
+	// in the log.
 	THROW_CHECK1(invalid_argument, src, src.size() < BLOCK_SIZE_MAX_TEMP_FILE);
 
 	realign();
@@ -499,6 +464,7 @@ BeesTempFile::make_copy(const BeesFileRange &src)
 	auto end = m_end_offset + src.size();
 	resize(end);
 
+	Timer copy_timer;
 	BeesFileRange rv(m_fd, begin, end);
 	BEESTRACE("copying to: " << rv);
 	BEESNOTE("copying " << src << " to " << rv);
@@ -506,7 +472,6 @@ BeesTempFile::make_copy(const BeesFileRange &src)
 	auto src_p = src.begin();
 	auto dst_p = begin;
 
-	bool did_block_write = false;
 	while (dst_p < end) {
 		auto len = min(BLOCK_SIZE_CLONE, end - dst_p);
 		BeesBlockData bbd(src.fd(), src_p, len);
@@ -517,76 +482,303 @@ BeesTempFile::make_copy(const BeesFileRange &src)
 			BEESNOTE("copying " << src << " to " << rv << "\n"
 				"\tpwrite " << bbd << " to " << name_fd(m_fd) << " offset " << to_hex(dst_p) << " len " << len);
 			pwrite_or_die(m_fd, bbd.data().data(), len, dst_p);
-			did_block_write = true;
 			BEESCOUNT(tmp_block);
 			BEESCOUNTADD(tmp_bytes, len);
 		}
 		src_p += len;
 		dst_p += len;
 	}
-
-	// We seem to get lockups without this!
-	if (did_block_write) {
-		bees_sync(m_fd);
-	}
+	BEESCOUNTADD(tmp_copy_ms, copy_timer.age() * 1000);
 
 	BEESCOUNT(tmp_copy);
 	return rv;
 }
 
-int
-bees_main(ArgList args)
+static
+ostream &
+operator<<(ostream &os, const siginfo_t &si)
 {
-	set_catch_explainer([&](string s) {
-		BEESLOG("\n\n*** EXCEPTION ***\n\t" << s << "\n***\n");
-		BEESCOUNT(exception_caught);
-	});
+	return os << "siginfo_t { "
+		<< "signo = " << si.si_signo << " (" << signal_ntoa(si.si_signo) << "), "
+		<< "errno = " << si.si_errno << ", "
+		<< "code = " << si.si_code << ", "
+		// << "trapno = " << si.si_trapno << ", "
+		<< "pid = " << si.si_pid << ", "
+		<< "uid = " << si.si_uid << ", "
+		<< "status = " << si.si_status << ", "
+		<< "utime = " << si.si_utime << ", "
+		<< "stime = " << si.si_stime << ", "
+		// << "value = " << si.si_value << ", "
+		<< "int = " << si.si_int << ", "
+		<< "ptr = " << si.si_ptr << ", "
+		<< "overrun = " << si.si_overrun << ", "
+		<< "timerid = " << si.si_timerid << ", "
+		<< "addr = " << si.si_addr << ", "
+		<< "band = " << si.si_band << ", "
+		<< "fd = " << si.si_fd << ", "
+		// << "addr_lsb = " << si.si_addr_lsb << ", "
+		// << "lower = " << si.si_lower << ", "
+		// << "upper = " << si.si_upper << ", "
+		// << "pkey = " << si.si_pkey << ", "
+		<< "call_addr = " << si.si_call_addr << ", "
+		<< "syscall = " << si.si_syscall << ", "
+		<< "arch = " << si.si_arch
+		<< " }";
+}
 
-	BEESNOTE("main");
-	BeesNote::set_name("main");
+static sigset_t new_sigset, old_sigset;
 
-	list<shared_ptr<BeesContext>> all_contexts;
-	shared_ptr<BeesContext> bc;
+void
+block_term_signal()
+{
+	BEESLOGDEBUG("Masking signals");
 
-	// Subscribe to fanotify events
-	bool did_subscription = false;
-	for (string arg : args) {
-		catch_all([&]() {
-			bc = make_shared<BeesContext>(bc);
-			bc->set_root_path(arg);
-			did_subscription = true;
-		});
+	DIE_IF_NON_ZERO(sigemptyset(&new_sigset));
+	DIE_IF_NON_ZERO(sigaddset(&new_sigset, SIGTERM));
+	DIE_IF_NON_ZERO(sigaddset(&new_sigset, SIGINT));
+	DIE_IF_NON_ZERO(sigprocmask(SIG_BLOCK, &new_sigset, &old_sigset));
+}
+
+void
+wait_for_term_signal()
+{
+	BEESNOTE("waiting for signals");
+	BEESLOGDEBUG("Waiting for signals...");
+	siginfo_t info;
+
+	// Ironically, sigwaitinfo can be interrupted by a signal.
+	while (true) {
+		const int rv = sigwaitinfo(&new_sigset, &info);
+		if (rv == -1) {
+			if (errno == EINTR) {
+				BEESLOGDEBUG("Restarting sigwaitinfo");
+				continue;
+			}
+			THROW_ERRNO("sigwaitinfo errno = " << errno);
+		} else {
+			BEESLOGNOTICE("Received signal " << rv << " info " << info);
+			// Unblock so we die immediately if signalled again
+			DIE_IF_NON_ZERO(sigprocmask(SIG_BLOCK, &old_sigset, &new_sigset));
+			break;
+		}
 	}
-
-	if (!did_subscription) {
-		BEESLOG("WARNING: no filesystems added");
-	}
-
-	BeesThread status_thread("status", [&]() {
-		bc->dump_status();
-	});
-
-	// Now we just wait forever
-	bc->show_progress();
-
-	// That is all.
-	return 0;
+	BEESLOGDEBUG("Signal catcher exiting");
 }
 
 int
-main(int argc, const char **argv)
+bees_main(int argc, char *argv[])
 {
-	if (argc < 2) {
-		do_cmd_help(argv);
-		return 2;
+	set_catch_explainer([&](string s) {
+		if (BeesTracer::get_silent()) {
+			BEESLOGDEBUG("exception (ignored): " << s);
+			BEESCOUNT(exception_caught_silent);
+		} else {
+			BEESLOGNOTICE("\n\n*** EXCEPTION ***\n\t" << s << "\n***\n");
+			BEESCOUNT(exception_caught);
+		}
+	});
+
+	// The thread name for the main function is also what the kernel
+	// Oops messages call the entire process.  So even though this
+	// thread's proper title is "main", let's call it "bees".
+	BeesNote::set_name("bees");
+	BEESNOTE("main");
+
+	THROW_CHECK1(invalid_argument, argc, argc >= 0);
+
+	// Have to block signals now before we create a bunch of threads
+	// so the threads will also have the signals blocked.
+	block_term_signal();
+
+	// Create a context so we can apply configuration to it
+	shared_ptr<BeesContext> bc = make_shared<BeesContext>();
+	BEESLOGDEBUG("context constructed");
+
+	string cwd(readlink_or_die("/proc/self/cwd"));
+
+	// Defaults
+	bool chatter_prefix_timestamp = true;
+	double thread_factor = 0;
+	unsigned thread_count = 0;
+	unsigned thread_min = 0;
+	double load_target = 0;
+	bool workaround_btrfs_send = false;
+	BeesRoots::ScanMode root_scan_mode = BeesRoots::SCAN_MODE_INDEPENDENT;
+
+	// Configure getopt_long
+	static const struct option long_options[] = {
+		{ "thread-factor",         required_argument, NULL, 'C' },
+		{ "thread-min",            required_argument, NULL, 'G' },
+		{ "strip-paths",           no_argument,       NULL, 'P' },
+		{ "no-timestamps",         no_argument,       NULL, 'T' },
+		{ "workaround-btrfs-send", no_argument,       NULL, 'a' },
+		{ "thread-count",          required_argument, NULL, 'c' },
+		{ "loadavg-target",        required_argument, NULL, 'g' },
+		{ "help",                  no_argument,       NULL, 'h' },
+		{ "scan-mode",             required_argument, NULL, 'm' },
+		{ "absolute-paths",        no_argument,       NULL, 'p' },
+		{ "timestamps",            no_argument,       NULL, 't' },
+		{ "verbose",               required_argument, NULL, 'v' },
+		{ 0, 0, 0, 0 },
+	};
+
+	// Build getopt_long's short option list from the long_options table.
+	// While we're at it, make sure we didn't duplicate any options.
+	string getopt_list;
+	set<decltype(option::val)> option_vals;
+	for (const struct option *op = long_options; op->val; ++op) {
+		THROW_CHECK1(runtime_error, op->val, !option_vals.count(op->val));
+		option_vals.insert(op->val);
+		if ((op->val & 0xff) != op->val) {
+			continue;
+		}
+		getopt_list += op->val;
+		if (op->has_arg == required_argument) {
+			getopt_list += ':';
+		}
 	}
 
-	ArgList args(argv + 1);
+	// Parse options
+	int c;
+	while (true) {
+		int option_index = 0;
 
-	int rv = 1;
-	catch_and_explain([&]() {
-		rv = bees_main(args);
+		c = getopt_long(argc, argv, getopt_list.c_str(), long_options, &option_index);
+		if (-1 == c) {
+			break;
+		}
+
+		BEESLOGDEBUG("Parsing option '" << static_cast<char>(c) << "'");
+
+		switch (c) {
+
+			case 'C':
+				thread_factor = stod(optarg);
+				break;
+			case 'G':
+				thread_min = stoul(optarg);
+				break;
+			case 'P':
+				crucible::set_relative_path(cwd);
+				break;
+			case 'T':
+				chatter_prefix_timestamp = false;
+				break;
+			case 'a':
+				workaround_btrfs_send = true;
+				break;
+			case 'c':
+				thread_count = stoul(optarg);
+				break;
+			case 'g':
+				load_target = stod(optarg);
+				break;
+			case 'm':
+				root_scan_mode = static_cast<BeesRoots::ScanMode>(stoul(optarg));
+				break;
+			case 'p':
+				crucible::set_relative_path("");
+				break;
+			case 't':
+				chatter_prefix_timestamp = true;
+				break;
+			case 'v':
+				{
+					int new_log_level = stoul(optarg);
+					THROW_CHECK1(out_of_range, new_log_level, new_log_level <= 8);
+					THROW_CHECK1(out_of_range, new_log_level, new_log_level >= 0);
+					bees_log_level = new_log_level;
+					BEESLOGNOTICE("log level set to " << bees_log_level);
+				}
+				break;
+
+			case 'h':
+			default:
+				do_cmd_help(argv);
+				return EXIT_FAILURE;
+		}
+	}
+
+	if (optind + 1 != argc) {
+		BEESLOGERR("Only one filesystem path per bees process");
+		return EXIT_FAILURE;
+	}
+
+	Chatter::enable_timestamp(chatter_prefix_timestamp);
+
+	if (!relative_path().empty()) {
+		BEESLOGINFO("using relative path " << relative_path() << "\n");
+	}
+
+	BEESLOGINFO("setting rlimit NOFILE to " << BEES_OPEN_FILE_LIMIT);
+
+	struct rlimit lim = {
+		.rlim_cur = BEES_OPEN_FILE_LIMIT,
+		.rlim_max = BEES_OPEN_FILE_LIMIT,
+	};
+	int rv = setrlimit(RLIMIT_NOFILE, &lim);
+	if (rv) {
+		BEESLOGINFO("setrlimit(RLIMIT_NOFILE, { " << lim.rlim_cur << " }): " << strerror(errno));
+	};
+
+	// Set up worker thread pool
+	THROW_CHECK1(out_of_range, thread_factor, thread_factor >= 0);
+	if (thread_count < 1) {
+		if (thread_factor == 0) {
+			thread_factor = BEES_DEFAULT_THREAD_FACTOR;
+		}
+		thread_count = max(1U, static_cast<unsigned>(ceil(thread::hardware_concurrency() * thread_factor)));
+	}
+
+	if (load_target != 0) {
+		BEESLOGNOTICE("setting load average target to " << load_target);
+		BEESLOGNOTICE("setting worker thread pool minimum size to " << thread_min);
+		TaskMaster::set_thread_min_count(thread_min);
+	}
+	TaskMaster::set_loadavg_target(load_target);
+
+	BEESLOGNOTICE("setting worker thread pool maximum size to " << thread_count);
+	TaskMaster::set_thread_count(thread_count);
+
+	// Set root path
+	string root_path = argv[optind++];
+	BEESLOGNOTICE("setting root path to '" << root_path << "'");
+	bc->set_root_path(root_path);
+
+	// Workaround for btrfs send
+	bc->roots()->set_workaround_btrfs_send(workaround_btrfs_send);
+
+	// Set root scan mode
+	bc->roots()->set_scan_mode(root_scan_mode);
+
+	// Start crawlers
+	bc->start();
+
+	// Now we just wait forever
+	wait_for_term_signal();
+
+	// Shut it down
+	bc->stop();
+
+	// That is all.
+	return EXIT_SUCCESS;
+}
+
+int
+main(int argc, char *argv[])
+{
+	cerr << "bees version " << BEES_VERSION << endl;
+
+	if (argc < 2) {
+		do_cmd_help(argv);
+		return EXIT_FAILURE;
+	}
+
+	int rv = EXIT_FAILURE;
+	catch_all([&]() {
+		rv = bees_main(argc, argv);
 	});
+	BEESLOGNOTICE("Exiting with status " << rv << " " << (rv ? "(failure)" : "(success)"));
 	return rv;
 }
 

src/bees.h

@@ -1,7 +1,7 @@
 #ifndef BEES_H
 #define BEES_H
 
-#include "crucible/bool.h"
+#include "crucible/btrfs-tree.h"
 #include "crucible/cache.h"
 #include "crucible/chatter.h"
 #include "crucible/error.h"
@@ -9,18 +9,21 @@
 #include "crucible/fd.h"
 #include "crucible/fs.h"
 #include "crucible/lockset.h"
+#include "crucible/multilock.h"
+#include "crucible/pool.h"
+#include "crucible/progress.h"
 #include "crucible/time.h"
-#include "crucible/timequeue.h"
-#include "crucible/workqueue.h"
+#include "crucible/task.h"
 
-#include <array>
 #include <functional>
 #include <list>
 #include <mutex>
 #include <string>
+#include <random>
 #include <thread>
 
 #include <endian.h>
+#include <syslog.h>
 
 using namespace crucible;
 using namespace std;
@@ -28,7 +31,7 @@ using namespace std;
 // Block size for clone alignment (FIXME: should read this from /sys/fs/btrfs/<FS-UUID>/clone_alignment)
 const off_t BLOCK_SIZE_CLONE = 4096;
 
-// Block size for dedup checksums (arbitrary, but must be a multiple of clone alignment)
+// Block size for dedupe checksums (arbitrary, but must be a multiple of clone alignment)
 const off_t BLOCK_SIZE_SUMS = 4096;
 
 // Block size for memory allocations and file mappings  (FIXME: should be CPU page size)
@@ -40,13 +43,6 @@ const off_t BLOCK_SIZE_MAX_EXTENT_SAME = 4096 * 4096;
 // Maximum length of a compressed extent in bytes
 const off_t BLOCK_SIZE_MAX_COMPRESSED_EXTENT = 128 * 1024;
 
-// Try to combine smaller extents into larger ones
-const off_t BLOCK_SIZE_MIN_EXTENT_DEFRAG = BLOCK_SIZE_MAX_COMPRESSED_EXTENT;
-
-// Avoid splitting extents that are already too small
-const off_t BLOCK_SIZE_MIN_EXTENT_SPLIT = BLOCK_SIZE_MAX_COMPRESSED_EXTENT;
-// const off_t BLOCK_SIZE_MIN_EXTENT_SPLIT = 1024LL * 1024 * 1024 * 1024;
-
 // Maximum length of any extent in bytes
 // except we've seen 1.03G extents...
 // ...FIEMAP is slow and full of lies
@@ -55,59 +51,61 @@ const off_t BLOCK_SIZE_MAX_EXTENT = 128 * 1024 * 1024;
 // Masks, so we don't have to write "(BLOCK_SIZE_CLONE - 1)" everywhere
 const off_t BLOCK_MASK_CLONE = BLOCK_SIZE_CLONE - 1;
 const off_t BLOCK_MASK_SUMS = BLOCK_SIZE_SUMS - 1;
-const off_t BLOCK_MASK_MMAP = BLOCK_SIZE_MMAP - 1;
-const off_t BLOCK_MASK_MAX_COMPRESSED_EXTENT = BLOCK_SIZE_MAX_COMPRESSED_EXTENT * 2 - 1;
 
-// Maximum temporary file size
+// Maximum temporary file size (maximum extent size for temporary copy)
 const off_t BLOCK_SIZE_MAX_TEMP_FILE = 1024 * 1024 * 1024;
 
 // Bucket size for hash table (size of one hash bucket)
 const off_t BLOCK_SIZE_HASHTAB_BUCKET = BLOCK_SIZE_MMAP;
 
 // Extent size for hash table (since the nocow file attribute does not seem to be working today)
-const off_t BLOCK_SIZE_HASHTAB_EXTENT = 16 * 1024 * 1024;
+const off_t BLOCK_SIZE_HASHTAB_EXTENT = BLOCK_SIZE_MAX_COMPRESSED_EXTENT;
 
-// Bytes per second we want to flush (8GB every two hours)
-const double BEES_FLUSH_RATE = 8.0 * 1024 * 1024 * 1024 / 7200.0;
+// Bytes per second we want to flush from hash table
+// Optimistic sustained write rate for SD cards
+const double BEES_FLUSH_RATE = 128 * 1024;
 
-// Interval between writing non-hash-table things to disk (15 minutes)
+// Interval between writing crawl state to disk
 const int BEES_WRITEBACK_INTERVAL = 900;
 
 // Statistics reports while scanning
 const int BEES_STATS_INTERVAL = 3600;
 
 // Progress shows instantaneous rates and thread status
-const int BEES_PROGRESS_INTERVAL = 3600;
+const int BEES_PROGRESS_INTERVAL = BEES_STATS_INTERVAL;
 
 // Status is output every freakin second.  Use a ramdisk.
 const int BEES_STATUS_INTERVAL = 1;
 
+// Number of file FDs to cache when not in active use
+const size_t BEES_FILE_FD_CACHE_SIZE = 4096;
+
+// Number of root FDs to cache when not in active use
+const size_t BEES_ROOT_FD_CACHE_SIZE = 1024;
+
+// Number of FDs to open (rlimit)
+const size_t BEES_OPEN_FILE_LIMIT = (BEES_FILE_FD_CACHE_SIZE + BEES_ROOT_FD_CACHE_SIZE) * 2 + 100;
+
+// Worker thread factor (multiplied by detected number of CPU cores)
+const double BEES_DEFAULT_THREAD_FACTOR = 1.0;
+
 // Log warnings when an operation takes too long
-const double BEES_TOO_LONG = 2.5;
+const double BEES_TOO_LONG = 5.0;
 
-// Avoid any extent where LOGICAL_INO takes this long
-const double BEES_TOXIC_DURATION = 9.9;
+// Avoid any extent where LOGICAL_INO takes this much kernel CPU time
+const double BEES_TOXIC_SYS_DURATION = 0.1;
 
-// How long we should wait for new btrfs transactions
-const double BEES_COMMIT_INTERVAL = 900;
+// Maximum number of refs to a single extent
+const size_t BEES_MAX_EXTENT_REF_COUNT = (16 * 1024 * 1024 / 24) - 1;
 
 // How long between hash table histograms
-const double BEES_HASH_TABLE_ANALYZE_INTERVAL = 3600;
+const double BEES_HASH_TABLE_ANALYZE_INTERVAL = BEES_STATS_INTERVAL;
 
-// Rate limiting of informational messages
-const double BEES_INFO_RATE = 10.0;
-const double BEES_INFO_BURST = 1.0;
+// Wait at least this long for a new transid
+const double BEES_TRANSID_POLL_INTERVAL = 30.0;
 
-// After we have this many events queued, wait
-const size_t BEES_MAX_QUEUE_SIZE = 1024;
-
-// Read this many items at a time in SEARCHv2
-const size_t BEES_MAX_CRAWL_SIZE = 4096;
-
-// If an extent has this many refs, pretend it does not exist
-// to avoid a crippling btrfs performance bug
-// The actual limit in LOGICAL_INO seems to be 2730, but let's leave a little headroom
-const size_t BEES_MAX_EXTENT_REF_COUNT = 2560;
+// Workaround for silly dedupe / ineffective readahead behavior
+const size_t BEES_READAHEAD_SIZE = 1024 * 1024;
 
 // Flags
 const int FLAGS_OPEN_COMMON   = O_NOFOLLOW | O_NONBLOCK | O_CLOEXEC | O_NOATIME | O_LARGEFILE | O_NOCTTY;
@@ -122,19 +120,18 @@ const int FLAGS_OPEN_FANOTIFY = O_RDWR | O_NOATIME | O_CLOEXEC | O_LARGEFILE;
 
 // macros ----------------------------------------
 
-#define BEESLOG(x)      do { Chatter c(BeesNote::get_name()); c << x; } while (0)
-#define BEESLOGTRACE(x) do { BEESLOG(x); BeesTracer::trace_now(); } while (0)
+#define BEESLOG(lv,x)   do { if (lv < bees_log_level) { Chatter __chatter(lv, BeesNote::get_name()); __chatter << x; } } while (0)
+#define BEESLOGTRACE(x) do { BEESLOG(LOG_DEBUG, x); BeesTracer::trace_now(); } while (0)
 
-#define BEESTRACE(x)   BeesTracer  SRSLY_WTF_C(beesTracer_,  __LINE__) ([&]()                 { BEESLOG(x);   })
+#define BEESTRACE(x)   BeesTracer  SRSLY_WTF_C(beesTracer_,  __LINE__) ([&]()                 { BEESLOG(LOG_ERR, x);   })
 #define BEESTOOLONG(x) BeesTooLong SRSLY_WTF_C(beesTooLong_, __LINE__) ([&](ostream &_btl_os) { _btl_os << x; })
 #define BEESNOTE(x)    BeesNote    SRSLY_WTF_C(beesNote_,    __LINE__) ([&](ostream &_btl_os) { _btl_os << x; })
-#define BEESINFO(x) do { \
-	if (bees_info_rate_limit.is_ready()) { \
-		bees_info_rate_limit.borrow(1); \
-		Chatter c(BeesNote::get_name()); \
-		c << x; \
-	} \
-} while (0)
+
+#define BEESLOGERR(x)    BEESLOG(LOG_ERR, x)
+#define BEESLOGWARN(x)   BEESLOG(LOG_WARNING, x)
+#define BEESLOGNOTICE(x) BEESLOG(LOG_NOTICE, x)
+#define BEESLOGINFO(x)   BEESLOG(LOG_INFO, x)
+#define BEESLOGDEBUG(x)  BEESLOG(LOG_DEBUG, x)
 
 #define BEESCOUNT(stat) do { \
 	BeesStats::s_global.add_count(#stat); \
@@ -154,16 +151,16 @@ class BeesStatTmpl {
 	map<string, T>	m_stats_map;
 	mutable mutex	m_mutex;
 
+	T& at(string idx);
 public:
 	BeesStatTmpl() = default;
 	BeesStatTmpl(const BeesStatTmpl &that);
 	BeesStatTmpl &operator=(const BeesStatTmpl &that);
 	void add_count(string idx, size_t amount = 1);
-	T& at(string idx);
 	T at(string idx) const;
 
 friend ostream& operator<< <>(ostream &os, const BeesStatTmpl<T> &bs);
-friend class BeesStats;
+friend struct BeesStats;
 };
 
 using BeesRates = BeesStatTmpl<double>;
@@ -182,12 +179,16 @@ class BeesBlockData;
 class BeesTracer {
 	function<void()> m_func;
 	BeesTracer *m_next_tracer = 0;
-	
-	thread_local static BeesTracer *s_next_tracer;
+
+	thread_local static BeesTracer *tl_next_tracer;
+	thread_local static bool tl_silent;
+	thread_local static bool tl_first;
 public:
-	BeesTracer(function<void()> f);
+	BeesTracer(function<void()> f, bool silent = false);
 	~BeesTracer();
 	static void trace_now();
+	static bool get_silent();
+	static void set_silent();
 };
 
 class BeesNote {
@@ -199,8 +200,8 @@ class BeesNote {
 	static mutex			s_mutex;
 	static map<pid_t, BeesNote*>	s_status;
 
-	thread_local static BeesNote	*s_next;
-	thread_local static string	s_name;
+	thread_local static BeesNote	*tl_next;
+	thread_local static string	tl_name;
 
 public:
 	BeesNote(function<void(ostream &)> f);
@@ -250,15 +251,14 @@ ostream& operator<<(ostream &os, const BeesFileId &bfi);
 
 class BeesFileRange {
 protected:
-	static mutex		s_mutex;
-	mutable Fd		m_fd;
+	Fd			m_fd;
 	mutable BeesFileId	m_fid;
-	off_t			m_begin, m_end;
-	mutable off_t		m_file_size;
+	off_t			m_begin = 0, m_end = 0;
+	mutable off_t		m_file_size = -1;
 
 public:
 
-	BeesFileRange();
+	BeesFileRange() = default;
 	BeesFileRange(Fd fd, off_t begin, off_t end);
 	BeesFileRange(const BeesFileId &fid, off_t begin, off_t end);
 	BeesFileRange(const BeesBlockData &bbd);
@@ -273,35 +273,31 @@ public:
 	bool is_same_file(const BeesFileRange &that) const;
 	bool overlaps(const BeesFileRange &that) const;
 
-	// If file ranges overlap, extends this to include that.
-	// Coalesce with empty bfr = non-empty bfr
-	bool coalesce(const BeesFileRange &that);
-
-	// Remove that from this, creating 0, 1, or 2 new objects
-	pair<BeesFileRange, BeesFileRange> subtract(const BeesFileRange &that) const;
-
 	off_t begin() const { return m_begin; }
 	off_t end() const { return m_end; }
 	off_t size() const;
 
-	// Lazy accessors
+	/// @{ Lazy accessors
 	off_t file_size() const;
 	BeesFileId fid() const;
+	/// @}
 
-	// Get the fd if there is one
+	/// Get the fd if there is one
 	Fd fd() const;
 
-	// Get the fd, opening it if necessary
-	Fd fd(const shared_ptr<BeesContext> &ctx) const;
+	/// Get the fd, opening it if necessary
+	Fd fd(const shared_ptr<BeesContext> &ctx);
 
+	/// Copy the BeesFileId but not the Fd
 	BeesFileRange copy_closed() const;
 
-	// Is it defined?
+	/// Is it defined?
 	operator bool() const { return !!m_fd || m_fid; }
 
-	// Make range larger
+	/// @{ Make range larger
 	off_t grow_end(off_t delta);
 	off_t grow_begin(off_t delta);
+	/// @}
 
 friend ostream & operator<<(ostream &os, const BeesFileRange &bfr);
 };
@@ -316,7 +312,6 @@ public:
 
 	// Blocks with no physical address (not yet allocated, hole, or "other").
 	// PREALLOC blocks have a physical address so they're not magic enough to be handled here.
-	// Compressed blocks have a physical address but it's two-dimensional.
 	enum MagicValue {
 		ZERO,		// BeesAddress uninitialized
 		DELALLOC,	// delayed allocation
@@ -328,6 +323,7 @@ public:
 	BeesAddress(Type addr = ZERO) : m_addr(addr) {}
 	BeesAddress(MagicValue addr) : m_addr(addr) {}
 	BeesAddress& operator=(const BeesAddress &that) = default;
+	BeesAddress(const BeesAddress &that) = default;
 	operator Type() const { return m_addr; }
 	bool operator==(const BeesAddress &that) const;
 	bool operator==(const MagicValue that) const { return *this == BeesAddress(that); }
@@ -371,9 +367,11 @@ class BeesStringFile {
 	size_t	m_limit;
 
 public:
-	BeesStringFile(Fd dir_fd, string name, size_t limit = 1024 * 1024);
+	BeesStringFile(Fd dir_fd, string name, size_t limit = 16 * 1024 * 1024);
 	string read();
 	void write(string contents);
+	void name(const string &new_name);
+	string name() const;
 };
 
 class BeesHashTable {
@@ -386,6 +384,7 @@ public:
 		HashType	e_hash;
 		AddrType	e_addr;
 		Cell(const Cell &) = default;
+		Cell &operator=(const Cell &) = default;
 		Cell(HashType hash, AddrType addr) : e_hash(hash), e_addr(addr) { }
 		bool operator==(const Cell &e) const { return tie(e_hash, e_addr) == tie(e.e_hash, e.e_addr); }
 		bool operator!=(const Cell &e) const { return tie(e_hash, e_addr) != tie(e.e_hash, e.e_addr); }
@@ -407,15 +406,17 @@ public:
 		uint8_t	p_byte[BLOCK_SIZE_HASHTAB_EXTENT];
 	} __attribute__((packed));
 
-	BeesHashTable(shared_ptr<BeesContext> ctx, string filename);
+	BeesHashTable(shared_ptr<BeesContext> ctx, string filename, off_t size = BLOCK_SIZE_HASHTAB_EXTENT);
 	~BeesHashTable();
 
+	void stop_request();
+	void stop_wait();
+
 	vector<Cell>	find_cell(HashType hash);
 	bool		push_random_hash_addr(HashType hash, AddrType addr);
 	void		erase_hash_addr(HashType hash, AddrType addr);
 	bool		push_front_hash_addr(HashType hash, AddrType addr);
-
-	void		set_shared(bool shared);
+	bool            flush_dirty_extent(uint64_t extent_index);
 
 private:
 	string		m_filename;
@@ -438,36 +439,52 @@ private:
 	uint64_t		m_buckets;
 	uint64_t		m_extents;
 	uint64_t		m_cells;
-	set<uint64_t>		m_buckets_dirty;
-	set<uint64_t>		m_buckets_missing;
 	BeesThread  		m_writeback_thread;
 	BeesThread	        m_prefetch_thread;
 	RateLimiter		m_flush_rate_limit;
-	RateLimiter		m_prefetch_rate_limit;
-	mutex			m_extent_mutex;
-	mutex			m_bucket_mutex;
-	condition_variable	m_condvar;
-	set<HashType>		m_toxic_hashes;
 	BeesStringFile		m_stats_file;
 
-	LockSet<uint64_t> 	m_extent_lock_set;
+	// Prefetch readahead hint
+	bool			m_prefetch_running = false;
 
-	DefaultBool		m_shared;
+	// Mutex/condvar for the writeback thread
+	mutex			m_dirty_mutex;
+	condition_variable	m_dirty_condvar;
+	bool			m_dirty = false;
 
+	// Mutex/condvar to stop
+	mutex			m_stop_mutex;
+	condition_variable	m_stop_condvar;
+	bool			m_stop_requested = false;
+
+	// Per-extent structures
+	struct ExtentMetaData {
+		shared_ptr<mutex> m_mutex_ptr;		// Access serializer
+		bool	m_dirty = false;	// Needs to be written back to disk
+		bool	m_missing = true;	// Needs to be read from disk
+		ExtentMetaData();
+	};
+	vector<ExtentMetaData>	m_extent_metadata;
+
+	void open_file();
 	void writeback_loop();
 	void prefetch_loop();
 	void try_mmap_flags(int flags);
 	pair<Cell *, Cell *> get_cell_range(HashType hash);
 	pair<uint8_t *, uint8_t *> get_extent_range(HashType hash);
-	void fetch_missing_extent(HashType hash);
-	void set_extent_dirty(HashType hash);
-	void flush_dirty_extents();
-	bool is_toxic_hash(HashType h) const;
+	void fetch_missing_extent_by_hash(HashType hash);
+	void fetch_missing_extent_by_index(uint64_t extent_index);
+	void set_extent_dirty_locked(uint64_t extent_index);
+	size_t flush_dirty_extents(bool slowly);
 
-	bool using_shared_map() const { return false; }
+	size_t			hash_to_extent_index(HashType ht);
+	unique_lock<mutex>	lock_extent_by_hash(HashType ht);
+	unique_lock<mutex>	lock_extent_by_index(uint64_t extent_index);
 
 	BeesHashTable(const BeesHashTable &) = delete;
 	BeesHashTable &operator=(const BeesHashTable &) = delete;
+
+	static thread_local uniform_int_distribution<size_t> tl_distribution;
 };
 
 ostream &operator<<(ostream &os, const BeesHashTable::Cell &bhte);
@@ -487,36 +504,56 @@ class BeesCrawl {
 	shared_ptr<BeesContext>			m_ctx;
 
 	mutex					m_mutex;
-	set<BeesFileRange>			m_extents;
-	DefaultBool				m_deferred;
+	BtrfsTreeItem				m_next_extent_data;
+	bool					m_deferred = false;
+	bool					m_finished = false;
 
 	mutex					m_state_mutex;
-	BeesCrawlState				m_state;
+	ProgressTracker<BeesCrawlState>		m_state;
+
+	BtrfsTreeObjectFetcher			m_btof;
 
 	bool fetch_extents();
 	void fetch_extents_harder();
 	bool next_transid();
+	BeesFileRange bti_to_bfr(const BtrfsTreeItem &bti) const;
 
 public:
 	BeesCrawl(shared_ptr<BeesContext> ctx, BeesCrawlState initial_state);
 	BeesFileRange peek_front();
 	BeesFileRange pop_front();
-	BeesCrawlState get_state();
+	ProgressTracker<BeesCrawlState>::ProgressHolder hold_state(const BeesCrawlState &bcs);
+	BeesCrawlState get_state_begin();
+	BeesCrawlState get_state_end() const;
 	void set_state(const BeesCrawlState &bcs);
+	void deferred(bool def_setting);
 };
 
-class BeesRoots {
+class BeesScanMode;
+
+class BeesRoots : public enable_shared_from_this<BeesRoots> {
 	shared_ptr<BeesContext>			m_ctx;
 
+	BtrfsRootFetcher			m_root_fetcher;
 	BeesStringFile				m_crawl_state_file;
-	BeesCrawlState				m_crawl_current;
 	map<uint64_t, shared_ptr<BeesCrawl>>	m_root_crawl_map;
 	mutex					m_mutex;
-	condition_variable			m_condvar;
-	DefaultBool				m_crawl_dirty;
+	uint64_t				m_crawl_dirty = 0;
+	uint64_t				m_crawl_clean = 0;
 	Timer					m_crawl_timer;
 	BeesThread				m_crawl_thread;
 	BeesThread				m_writeback_thread;
+	RateEstimator				m_transid_re;
+	bool					m_workaround_btrfs_send = false;
+
+	shared_ptr<BeesScanMode>		m_scanner;
+
+	mutex					m_tmpfiles_mutex;
+	map<BeesFileId, Fd>			m_tmpfiles;
+
+	mutex					m_stop_mutex;
+	condition_variable			m_stop_condvar;
+	bool					m_stop_requested = false;
 
 	void insert_new_crawl();
 	void insert_root(const BeesCrawlState &bcs);
@@ -524,26 +561,51 @@ class BeesRoots {
 	Fd open_root_ino_nocache(uint64_t root, uint64_t ino);
 	uint64_t transid_min();
 	uint64_t transid_max();
+	uint64_t transid_max_nocache();
 	void state_load();
+	ostream &state_to_stream(ostream &os);
 	void state_save();
-	void crawl_roots();
+	bool crawl_roots();
 	string crawl_state_filename() const;
-	BeesCrawlState crawl_state_get(uint64_t root);
 	void crawl_state_set_dirty();
 	void crawl_state_erase(const BeesCrawlState &bcs);
 	void crawl_thread();
 	void writeback_thread();
 	uint64_t next_root(uint64_t root = 0);
 	void current_state_set(const BeesCrawlState &bcs);
+	RateEstimator& transid_re();
+	bool crawl_batch(shared_ptr<BeesCrawl> crawl);
+	void clear_caches();
 
-friend class BeesFdCache;
 friend class BeesCrawl;
+friend class BeesFdCache;
+friend class BeesScanMode;
 
 public:
 	BeesRoots(shared_ptr<BeesContext> ctx);
+	void start();
+	void stop_request();
+	void stop_wait();
+
+	void insert_tmpfile(Fd fd);
+	void erase_tmpfile(Fd fd);
+
 	Fd open_root(uint64_t root);
 	Fd open_root_ino(uint64_t root, uint64_t ino);
 	Fd open_root_ino(const BeesFileId &bfi) { return open_root_ino(bfi.root(), bfi.ino()); }
+	bool is_root_ro(uint64_t root);
+
+	// TODO:  do extent-tree scans instead
+	enum ScanMode {
+		SCAN_MODE_LOCKSTEP,
+		SCAN_MODE_INDEPENDENT,
+		SCAN_MODE_SEQUENTIAL,
+		SCAN_MODE_RECENT,
+		SCAN_MODE_COUNT, // must be last
+	};
+
+	void set_scan_mode(ScanMode new_mode);
+	void set_workaround_btrfs_send(bool do_avoid);
 };
 
 struct BeesHash {
@@ -553,15 +615,16 @@ struct BeesHash {
 	BeesHash(Type that) : m_hash(that) { }
 	operator Type() const { return m_hash; }
 	BeesHash& operator=(const Type that) { m_hash = that; return *this; }
+	BeesHash(const uint8_t *ptr, size_t len);
 private:
 	Type	m_hash;
-	
+
 };
 
 ostream & operator<<(ostream &os, const BeesHash &bh);
 
 class BeesBlockData {
-	using Blob = vector<char>;
+	using Blob = ByteVector;
 
 	mutable Fd		m_fd;
 	off_t			m_offset;
@@ -569,7 +632,7 @@ class BeesBlockData {
 	mutable BeesAddress	m_addr;
 	mutable Blob		m_data;
 	mutable BeesHash	m_hash;
-	mutable DefaultBool	m_hash_done;
+	mutable bool		m_hash_done = false;
 
 public:
 	// Constructor with the immutable fields
@@ -607,100 +670,73 @@ public:
 friend ostream & operator<<(ostream &os, const BeesRangePair &brp);
 };
 
-class BeesWorkQueueBase {
-	string 				m_name; 
-
-protected:
-	static mutex			s_mutex;
-	static set<BeesWorkQueueBase *>	s_all_workers;
-
-public:
-	virtual ~BeesWorkQueueBase();
-	BeesWorkQueueBase(const string &name);
-
-	string name() const;
-	void name(const string &new_name);
-
-	virtual size_t active_size() const = 0;
-	virtual list<string> peek_active(size_t count) const = 0;
- 
-	static void for_each_work_queue(function<void(BeesWorkQueueBase *)> f);
-};
-
-template <class Task>
-class BeesWorkQueue : public BeesWorkQueueBase {
-	WorkQueue<Task>				m_active_queue;
-
-public:
-	BeesWorkQueue(const string &name);
-	~BeesWorkQueue();
-	void push_active(const Task &task, size_t limit);
-	void push_active(const Task &task);
-
-	size_t active_size() const override;
-	list<string> peek_active(size_t count) const override;
-
-	Task pop();
-};
-
 class BeesTempFile {
 	shared_ptr<BeesContext> m_ctx;
+	shared_ptr<BeesRoots>   m_roots;
 	Fd			m_fd;
 	off_t			m_end_offset;
 
-	void create();
 	void realign();
 	void resize(off_t new_end_offset);
 
 public:
+	~BeesTempFile();
 	BeesTempFile(shared_ptr<BeesContext> ctx);
 	BeesFileRange make_hole(off_t count);
 	BeesFileRange make_copy(const BeesFileRange &src);
+	void reset();
 };
 
 class BeesFdCache {
-	LRUCache<Fd, shared_ptr<BeesContext>, uint64_t>			m_root_cache;
-	LRUCache<Fd, shared_ptr<BeesContext>, uint64_t, uint64_t>	m_file_cache;
-	Timer								m_root_cache_timer;
+	shared_ptr<BeesContext> 		m_ctx;
+	LRUCache<Fd, uint64_t>			m_root_cache;
+	LRUCache<Fd, uint64_t, uint64_t>	m_file_cache;
+	Timer					m_root_cache_timer;
+	Timer					m_file_cache_timer;
 
 public:
-	BeesFdCache();
-	Fd open_root(shared_ptr<BeesContext> ctx, uint64_t root);
-	Fd open_root_ino(shared_ptr<BeesContext> ctx, uint64_t root, uint64_t ino);
-	void insert_root_ino(shared_ptr<BeesContext> ctx, Fd fd);
+	BeesFdCache(shared_ptr<BeesContext> ctx);
+	Fd open_root(uint64_t root);
+	Fd open_root_ino(uint64_t root, uint64_t ino);
+	void clear();
 };
 
 struct BeesResolveAddrResult {
 	BeesResolveAddrResult();
 	vector<BtrfsInodeOffsetRoot> m_biors;
-	DefaultBool m_is_toxic;
+	bool m_is_toxic = false;
 	bool is_toxic() const { return m_is_toxic; }
 };
 
 class BeesContext : public enable_shared_from_this<BeesContext> {
-	shared_ptr<BeesContext>				m_parent_ctx;
-
 	Fd						m_home_fd;
 
 	shared_ptr<BeesFdCache>				m_fd_cache;
 	shared_ptr<BeesHashTable>			m_hash_table;
 	shared_ptr<BeesRoots>				m_roots;
-
-	map<thread::id, shared_ptr<BeesTempFile>>	m_tmpfiles;
+	Pool<BeesTempFile>				m_tmpfile_pool;
 
 	LRUCache<BeesResolveAddrResult, BeesAddress>	m_resolve_cache;
 
 	string						m_root_path;
 	Fd						m_root_fd;
-	string						m_root_uuid;
 
 	mutable mutex					m_blacklist_mutex;
 	set<BeesFileId>					m_blacklist;
 
-	string						m_uuid;
-
 	Timer						m_total_timer;
 
+	NamedPtr<Exclusion, uint64_t>			m_extent_locks;
+	NamedPtr<Exclusion, uint64_t>			m_inode_locks;
+
+	mutable mutex					m_stop_mutex;
+	condition_variable				m_stop_condvar;
+	bool						m_stop_requested = false;
+	bool						m_stop_status = false;
+
+	shared_ptr<BeesThread>				m_progress_thread;
+	shared_ptr<BeesThread>				m_status_thread;
+
 	void set_root_fd(Fd fd);
 
 	BeesResolveAddrResult resolve_addr_uncached(BeesAddress addr);
@@ -709,38 +745,42 @@ class BeesContext : public enable_shared_from_this<BeesContext> {
 	void rewrite_file_range(const BeesFileRange &bfr);
 
 public:
-	BeesContext(shared_ptr<BeesContext> parent_ctx = nullptr);
 
 	void set_root_path(string path);
 
 	Fd root_fd() const { return m_root_fd; }
-	Fd home_fd() const { return m_home_fd; }
+	Fd home_fd();
 	string root_path() const { return m_root_path; }
-	string root_uuid() const { return m_root_uuid; }
 
-	BeesFileRange scan_forward(const BeesFileRange &bfr);
+	bool scan_forward(const BeesFileRange &bfr);
 
-	BeesRangePair dup_extent(const BeesFileRange &src);
+	bool is_root_ro(uint64_t root);
+	BeesRangePair dup_extent(const BeesFileRange &src, const shared_ptr<BeesTempFile> &tmpfile);
 	bool dedup(const BeesRangePair &brp);
 
-	void blacklist_add(const BeesFileId &fid);
+	void blacklist_insert(const BeesFileId &fid);
+	void blacklist_erase(const BeesFileId &fid);
 	bool is_blacklisted(const BeesFileId &fid) const;
 
+	shared_ptr<Exclusion> get_inode_mutex(uint64_t inode);
+
 	BeesResolveAddrResult resolve_addr(BeesAddress addr);
 	void invalidate_addr(BeesAddress addr);
+	void resolve_cache_clear();
 
 	void dump_status();
 	void show_progress();
 
+	void start();
+	void stop();
+	bool stop_requested() const;
+
 	shared_ptr<BeesFdCache> fd_cache();
 	shared_ptr<BeesHashTable> hash_table();
 	shared_ptr<BeesRoots> roots();
 	shared_ptr<BeesTempFile> tmpfile();
 
 	const Timer &total_timer() const { return m_total_timer; }
-
-	// TODO: move the rest of the FD cache methods here
-	void insert_root_ino(Fd fd);
 };
 
 class BeesResolver {
@@ -748,25 +788,25 @@ class BeesResolver {
 	BeesAddress				m_addr;
 	vector<BtrfsInodeOffsetRoot>		m_biors;
 	set<BeesFileRange>			m_ranges;
-	unsigned				m_bior_count;
+	size_t					m_bior_count;
 
-	// We found matching data, so we can dedup
-	DefaultBool				m_found_data;
+	// We found matching data, so we can dedupe
+	bool					m_found_data = false;
 
-	// We found matching data, so we *did* dedup
-	DefaultBool				m_found_dup;
+	// We found matching data, so we *did* dedupe
+	bool					m_found_dup = false;
 
 	// We found matching hash, so the hash table is still correct
-	DefaultBool				m_found_hash;
+	bool					m_found_hash = false;
 
 	// We found matching physical address, so the hash table isn't totally wrong
-	DefaultBool				m_found_addr;
+	bool					m_found_addr = false;
 
 	// We found matching physical address, but data did not match
-	DefaultBool				m_wrong_data;
+	bool					m_wrong_data = false;
 
 	// The whole thing is a placebo to avoid crippling btrfs performance bugs
-	DefaultBool				m_is_toxic;
+	bool					m_is_toxic = false;
 
 	BeesFileRange chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &needle_bbd);
 	BeesBlockData adjust_offset(const BeesFileRange &haystack, const BeesBlockData &needle);
@@ -820,9 +860,13 @@ public:
 };
 
 // And now, a giant pile of extern declarations
+extern int bees_log_level;
+extern const char *BEES_USAGE;
+extern const char *BEES_VERSION;
+extern thread_local default_random_engine bees_generator;
 string pretty(double d);
-extern RateLimiter bees_info_rate_limit;
-void bees_sync(int fd);
+void bees_readahead(int fd, off_t offset, size_t size);
+void bees_unreadahead(int fd, off_t offset, size_t size);
 string format_time(time_t t);
 
 #endif

src/fiemap.cc

@@ -1,52 +0,0 @@
-#include "crucible/fd.h"
-#include "crucible/fs.h"
-#include "crucible/error.h"
-#include "crucible/string.h"
-
-#include <iostream>
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-using namespace crucible;
-using namespace std;
-
-int
-main(int argc, char **argv)
-{
-	catch_all([&]() {
-		THROW_CHECK1(invalid_argument, argc, argc > 1);
-		string filename = argv[1];
-
-	
-		cout << "File: " << filename << endl;
-		Fd fd = open_or_die(filename, O_RDONLY);
-		Fiemap fm;
-		fm.m_max_count = 100;
-		if (argc > 2) { fm.fm_start = stoull(argv[2], nullptr, 0); }
-		if (argc > 3) { fm.fm_length = stoull(argv[3], nullptr, 0); }
-		if (argc > 4) { fm.fm_flags = stoull(argv[4], nullptr, 0); }
-		fm.fm_length = min(fm.fm_length, FIEMAP_MAX_OFFSET - fm.fm_start);
-		uint64_t stop_at = fm.fm_start + fm.fm_length;
-		uint64_t last_byte = fm.fm_start;
-		do {
-			fm.do_ioctl(fd);
-			// cerr << fm;
-			uint64_t last_logical = FIEMAP_MAX_OFFSET;
-			for (auto &extent : fm.m_extents) {
-				if (extent.fe_logical > last_byte) {
-					cout << "Log " << to_hex(last_byte) << ".." << to_hex(extent.fe_logical) << " Hole" << endl;
-				}
-				cout << "Log " << to_hex(extent.fe_logical) << ".." << to_hex(extent.fe_logical + extent.fe_length)
-					<< " Phy " << to_hex(extent.fe_physical) << ".." << to_hex(extent.fe_physical + extent.fe_length)
-					<< " Flags " << fiemap_extent_flags_ntoa(extent.fe_flags) << endl;
-				last_logical = extent.fe_logical + extent.fe_length;
-				last_byte = last_logical;
-			}
-			fm.fm_start = last_logical;
-		} while (fm.fm_start < stop_at);
-	});
-	exit(EXIT_SUCCESS);
-}
-

src/fiewalk.cc

@@ -1,40 +0,0 @@
-#include "crucible/extentwalker.h"
-#include "crucible/error.h"
-#include "crucible/string.h"
-
-#include <iostream>
-
-#include <fcntl.h>
-#include <unistd.h>
-
-using namespace crucible;
-using namespace std;
-
-int
-main(int argc, char **argv)
-{
-	catch_all([&]() {
-		THROW_CHECK1(invalid_argument, argc, argc > 1);
-		string filename = argv[1];
-
-		cout << "File: " << filename << endl;
-		Fd fd = open_or_die(filename, O_RDONLY);
-		BtrfsExtentWalker ew(fd);
-		off_t pos = 0;
-		if (argc > 2) { pos = stoull(argv[2], nullptr, 0); }
-		ew.seek(pos);
-		do {
-			// cout << "\n\n>>>" << ew.current() << "<<<\n\n" << endl;
-			cout << ew.current() << endl;
-		} while (ew.next());
-#if 0
-		cout << "\n\n\nAnd now, backwards...\n\n\n" << endl;
-		do {
-			cout << "\n\n>>>" << ew.current() << "<<<\n\n" << endl;
-		} while (ew.prev());
-		cout << "\n\n\nDone!\n\n\n" << endl;
-#endif
-	});
-	exit(EXIT_SUCCESS);
-}
-

test/Makefile

@@ -1,36 +1,39 @@
 PROGRAMS = \
 	chatter \
 	crc64 \
-	execpipe \
 	fd \
-	interp \
 	limits \
+	namedptr \
 	path \
 	process \
+	progress \
+	seeker \
+	task \
 
 all: test
 
-test: $(PROGRAMS)
-	set -x; for prog in $(PROGRAMS); do ./$$prog || exit 1; done
+test: $(PROGRAMS:%=%.txt) Makefile
+FORCE:
 
 include ../makeflags
+-include ../localconf
 
-LIBS = -lcrucible
-LDFLAGS = -L../lib -Wl,-rpath=$(shell realpath ../lib)
+LIBS = -lcrucible -lpthread
+BEES_LDFLAGS = -L../lib $(LDFLAGS)
 
-depends.mk: *.cc
-	for x in *.cc; do $(CXX) $(CXXFLAGS) -M "$$x"; done >> depends.mk.new
-	mv -fv depends.mk.new depends.mk
-                                       
--include depends.mk
+%.dep: %.cc tests.h Makefile
+	$(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
 
-%.o: %.cc %.h ../makeflags
-	-echo "Implicit rule %.o: %.cc" >&2
-	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+include $(PROGRAMS:%=%.dep)
 
-%: %.o ../makeflags
-	-echo "Implicit rule %: %.o" >&2
-	$(CXX) $(CXXFLAGS) -o "$@" "$<" $(LDFLAGS) $(LIBS)
+$(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile
+	$(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
+
+$(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a
+	$(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
+
+%.txt: % Makefile FORCE
+	./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
 
 clean:
-	-rm -fv *.o
+	rm -fv $(PROGRAMS:%=%.o) $(PROGRAMS:%=%.txt) $(PROGRAMS)

test/chatter.cc

@@ -32,7 +32,7 @@ void
 test_chatter_three()
 {
 	cerr << endl;
-	Chatter c("tct");
+	Chatter c(0, "tct");
 	c << "More complicated";
 	c << "\ncase with\n";
 	c << "some \\ns";

test/crc64.cc

@@ -5,18 +5,6 @@
 
 using namespace crucible;
 
-static
-void
-test_getcrc64_strings()
-{
-	assert(Digest::CRC::crc64("John") == 5942451273432301568);
-	assert(Digest::CRC::crc64("Paul") == 5838402100630913024);
-	assert(Digest::CRC::crc64("George") == 6714394476893704192);
-	assert(Digest::CRC::crc64("Ringo") == 6038837226071130112);
-	assert(Digest::CRC::crc64("") == 0);
-	assert(Digest::CRC::crc64("\377\277\300\200") == 15615382887346470912ULL);
-}
-
 static
 void
 test_getcrc64_byte_arrays()
@@ -32,7 +20,6 @@ test_getcrc64_byte_arrays()
 int
 main(int, char**)
 {
-	RUN_A_TEST(test_getcrc64_strings());
 	RUN_A_TEST(test_getcrc64_byte_arrays());
 
 	exit(EXIT_SUCCESS);

test/execpipe.cc

@@ -1,64 +0,0 @@
-#include "tests.h"
-
-#include "crucible/execpipe.h"
-
-#include <ios>
-#include <cassert>
-#include <cstring>
-#include <cstdlib>
-#include <stdexcept>
-
-#include <unistd.h>
-
-using namespace crucible;
-using namespace std;
-
-#if 1 // Needs rework
-static inline
-void
-test_hello_world()
-{
-	// alarm(9);
-	Fd fd = popen([]() { return system("echo Hello, World!"); });
-	char buf[1024];
-	size_t rv = -1;
-	read_partial_or_die(fd, buf, rv);
-	assert(rv > 0);
-	string b(buf, buf + rv - 1);
-	// cerr << "hello_world says: '" << b << "'" << endl;
-	assert(b == "Hello, World!");
-}
-
-static inline
-void
-test_read_limit(size_t limit = 4096)
-{
-	alarm(9);
-	Fd fd = popen([]() { return system("yes Hello!"); });
-	try {
-		string b = read_all(fd, limit);
-	} catch (out_of_range &re) {
-		return;
-	}
-	assert(!"no exception thrown by read_all");
-}
-#endif
-
-namespace crucible {
-	extern bool assert_no_leaked_fds();
-};
-
-int
-main(int, char**)
-{
-#if 1
-	RUN_A_TEST(test_hello_world());
-	assert(assert_no_leaked_fds());
-	RUN_A_TEST(test_read_limit(4095));
-	RUN_A_TEST(test_read_limit(4096));
-	RUN_A_TEST(test_read_limit(4097));
-	assert(assert_no_leaked_fds());
-#endif
-
-	exit(EXIT_SUCCESS);
-}

test/fd.cc

@@ -37,7 +37,7 @@ test_basic_read()
 	char read_buf[test_string_len];
 	read_or_die(f, read_buf);
 	assert(!strncmp(read_buf, test_string, test_string_len));
-	f->close();
+	f = Fd();
 }
 
 static
@@ -207,8 +207,8 @@ static void test_assign_int_close()
 		assert(j == -1);
 		// Bonus conversion operator tests
 		assert(fd == -1);
-		// Chasing a closed ref now triggers an exception
-		assert(catch_all([&]() { return fd->get_fd() == -1; }));
+		// Chasing a closed ref no longer triggers an exception
+		assert(fd->get_fd() == -1);
 	}
 	assert_is_closed(i, true);
 }
@@ -228,8 +228,8 @@ static void test_assign_int_close_2()
 		assert(j == -1);
 		// Bonus conversion operator tests
 		assert(fd == -1);
-		// Chasing a closed ref now triggers an exception
-		assert(catch_all([&]() { return fd->get_fd() == -1; }));
+		// Chasing a closed ref no longer triggers an exception
+		assert(fd->get_fd() == -1);
 	}
 	assert_is_closed(i, true);
 }
@@ -262,36 +262,52 @@ static void test_map()
 	assert_is_closed(c, false);
 }
 
-static void test_close_method()
+static void test_close()
 {
 	Fd fd = open("fd.cc", O_RDONLY);
 	int i = fd;
 	assert_is_closed(i, false);
-	fd->close();
+	fd = Fd();
 	assert_is_closed(i, true);
 }
 
-static void test_shared_close_method()
+static void test_shared_close()
 {
 	Fd fd = open("fd.cc", O_RDONLY);
 	int i = fd;
 	Fd fd2 = fd;
 	assert_is_closed(i, false);
 	assert_is_closed(fd2, false);
-	fd->close();
+	fd2 = Fd();
+	assert_is_closed(i, false);
+	assert_is_closed(fd, false);
+	assert_is_closed(fd2, true);
+	fd = Fd();
 	assert_is_closed(i, true);
+	assert_is_closed(fd, true);
 	assert_is_closed(fd2, true);
 }
 
 struct DerivedFdResource : public Fd::resource_type {
 	string	m_name;
-	DerivedFdResource(string name) : m_name(name) {
-		Fd::resource_type::operator=(open(name.c_str(), O_RDONLY));
+	DerivedFdResource(string name) : Fd::resource_type(open(name.c_str(), O_RDONLY)), m_name(name) {
 		assert_is_closed(this->get_fd(), false);
 	}
 	const string &name() const { return m_name; }
 };
 
+template<class T>
+shared_ptr<T>
+cast(const Fd &fd)
+{
+	auto dp = dynamic_pointer_cast<T>(fd.operator->());
+	if (!dp) {
+		cerr << "expect bad cast exception: " << flush;
+		throw bad_cast();
+	}
+	return dp;
+}
+
 struct DerivedFd : public Fd {
 	using resource_type = DerivedFdResource;
 	DerivedFd(string name) {
@@ -299,7 +315,7 @@ struct DerivedFd : public Fd {
 		Fd::operator=(static_pointer_cast<Fd::resource_type>(ptr));
 	}
 	shared_ptr<DerivedFdResource> operator->() const {
-		shared_ptr<DerivedFdResource> rv = cast<DerivedFdResource>();
+		shared_ptr<DerivedFdResource> rv = cast<DerivedFdResource>(*this);
 		THROW_CHECK1(out_of_range, rv, rv);
 		return rv;
 	}
@@ -328,12 +344,12 @@ static void test_derived_cast()
 	Fd fd2(fd);
 	Fd fd3 = open("fd.cc", O_RDONLY);
 	assert(fd->name() == "fd.cc");
-	assert(fd.cast<Fd::resource_type>());
-	assert(fd.cast<DerivedFd::resource_type>());
-	assert(fd2.cast<Fd::resource_type>());
-	assert(fd2.cast<DerivedFd::resource_type>());
-	assert(fd3.cast<Fd::resource_type>());
-	assert(catch_all([&](){ assert(!fd3.cast<DerivedFd::resource_type>()); } ));
+	assert(cast<Fd::resource_type>(fd));
+	assert(cast<DerivedFd::resource_type>(fd));
+	assert(cast<Fd::resource_type>(fd2));
+	assert(cast<DerivedFd::resource_type>(fd2));
+	assert(cast<Fd::resource_type>(fd3));
+	assert(catch_all([&](){ assert(!cast<DerivedFd::resource_type>(fd3)); } ));
 }
 
 static void test_derived_map()
@@ -381,8 +397,8 @@ int main(int, const char **)
 	RUN_A_TEST(test_assign_int_close());
 	RUN_A_TEST(test_assign_int_close_2());
 	RUN_A_TEST(test_map());
-	RUN_A_TEST(test_close_method());
-	RUN_A_TEST(test_shared_close_method());
+	RUN_A_TEST(test_close());
+	RUN_A_TEST(test_shared_close());
 	RUN_A_TEST(test_derived_resource_type());
 	RUN_A_TEST(test_derived_map());
 	RUN_A_TEST(test_derived_cast());

test/interp.cc

@@ -1,88 +0,0 @@
-#include "tests.h"
-
-#include "crucible/interp.h"
-
-using namespace crucible;
-using namespace std;
-
-/***********************************************************************
-
-How this should work:
-
-Interpreter reads an arg list:
-
-	argv[0] --method0args --method1arg arg1 --method1arg=arg1 -- args...
-
-argv[0] should look up a shared_ptr<Command> which creates an object of
-type shared_ptr<Process>.  This object is used to receive args by
-method calls or one at a time.
-
-<Command> and <Process> can be the same object, or not.
-
-Process p methods:
-
-	p->spawn(Interp*) -> Process
-	p->exec(ArgList) -> Process / Result
-	p->method (from ArgParser<>)
-		p->finish() -> void (destroys object without early destruction warnings...?)
-		p->~Process() -> complains loudly if finish() not called first...?
-
-Result might be a pair of Process, string.  Or just string.
-
-ArgParser should be more like GetOpt:
-
-	build a dictionary and an arg list from arguments
-	Process methods should interrogate ArgParser
-	ArgParser might have a table of boolean and string option names so it can reject invalid options
-		but if it had that, we could also pass in Process and have it call methods on it
-		...but that is a _lot_ of pointer-hiding when we could KISS
-		...but if we had that solved, argparser tables look like lists of method names
-	ArgParser<T> has a table of names and methods on object of type T
-		ArgParser hides everything behind void* and hands off to a compiled implementation to do callbacks
-
-Extreme simplification:  arguments are themselves executable
-
-	so '--method_foo arg' really means construct MethodFoo(arg) and cast to shared_ptr<ProcArg>
-	then Process->invokeSomething(ProcArg)
-	too extreme, use argparser instead
-
-***********************************************************************/
-
-void
-test_arg_parser()
-{
-	ArgParser ap;
-	ArgList al( { "abc", "--def", "ghi" } );
-	ap.parse(NULL, al);
-}
-
-struct Thing {
-	int m_i;
-	double m_d;
-	string m_s;
-
-	void set_i(int i) { cerr << "i = " << i << endl; m_i = i; }
-	void set_d(double d) { cerr << "d = " << d << endl; m_d = d; }
-	void set_s(string s) { cerr << "s = " << s << endl; m_s = s; }
-};
-
-template <typename F, typename T, typename A>
-void
-assign(T& t, F f, A a)
-{
-	cerr << __PRETTY_FUNCTION__ << " - a = " << a << endl;
-	(t.*f)(a);
-}
-
-int
-main(int, char**)
-{
-	RUN_A_TEST(test_arg_parser());
-
-	Thing p;
-	assign(p, &Thing::set_i, 5);
-
-	cerr << "p.m_i = " << p.m_i << endl;
-
-	exit(EXIT_SUCCESS);
-}