Merge branch 'master' into subvol-threads

Somehow a delete failed to get merged.

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

.gitignore

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

Defines.mk

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

Makefile

@@ -1,32 +1,16 @@
-PREFIX ?= /usr
-ETC_PREFIX ?= /etc
+PREFIX ?= /
 LIBDIR ?= lib
+USR_PREFIX ?= $(PREFIX)/usr
+USRLIB_PREFIX ?= $(USR_PREFIX)/$(LIBDIR)
+SYSTEMD_LIB_PREFIX ?= $(PREFIX)/lib/systemd
+LIBEXEC_PREFIX ?= $(USRLIB_PREFIX)/bees
 
-LIB_PREFIX ?= $(PREFIX)/$(LIBDIR)
-LIBEXEC_PREFIX ?= $(LIB_PREFIX)/bees
-
-SYSTEMD_SYSTEM_UNIT_DIR ?= $(shell pkg-config systemd --variable=systemdsystemunitdir)
-
-MARKDOWN := $(firstword $(shell type -P markdown markdown2 markdown_py 2>/dev/null || echo markdown))
-
-BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
+MARKDOWN := $(firstword $(shell which markdown markdown2 markdown_py 2>/dev/null || echo markdown))
 
 # 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
-docs: README.html
-reallyall: all docs test
+default all: lib src scripts test README.html
 
 clean: ## Cleanup
 	git clean -dfx -e localconf
@@ -34,18 +18,18 @@ clean: ## Cleanup
 .PHONY: lib src test
 
 lib: ## Build libs
-	$(MAKE) TAG="$(BEES_VERSION)" -C lib
+	$(MAKE) -C lib
 
 src: ## Build bins
 src: lib
-	$(MAKE) BEES_VERSION="$(BEES_VERSION)" -C src
+	$(MAKE) -C src
 
 test: ## Run tests
 test: lib src
 	$(MAKE) -C test
 
 scripts/%: scripts/%.in
-	$(TEMPLATE_COMPILER)
+	sed -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -e's#@PREFIX@#$(PREFIX)#' "$<" >"$@"
 
 scripts: scripts/beesd scripts/beesd@.service
 
@@ -53,31 +37,22 @@ README.html: README.md
 	$(MARKDOWN) README.md > README.html.new
 	mv -f README.html.new README.html
 
-install_libs: lib
-	install -Dm644 lib/libcrucible.so $(DESTDIR)$(LIB_PREFIX)/libcrucible.so
-
-install_tools: ## Install support tools + libs
-install_tools: install_libs src
-	install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
-	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
-
 install_bees: ## Install bees + libs
-install_bees: install_libs src $(RUN_INSTALL_TESTS)
+install_bees: lib src test
+	install -Dm644 lib/libcrucible.so $(DESTDIR)$(USRLIB_PREFIX)/libcrucible.so
 	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 -Dm755 scripts/beesd $(DESTDIR)$(USR_PREFIX)/sbin/beesd
+	install -Dm644 scripts/beesd.conf.sample $(DESTDIR)$(PREFIX)/etc/bees/beesd.conf.sample
+	install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_LIB_PREFIX)/system/beesd@.service
 
 install: ## Install distribution
-install: install_bees install_scripts $(OPTIONAL_INSTALL_TARGETS)
+install: install_bees install_scripts
 
 help: ## Show help
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##/\t/'
 
-bees: reallyall
+bees: all
 fly: install

README.md

@@ -102,7 +102,7 @@ and some metadata bits).  Each entry represents a minimum of 4K on disk.
 
 To change the size of the hash table, use 'truncate' to change the hash
 table size, delete `beescrawl.dat` so that bees will start over with a
-fresh full-filesystem rescan, and restart `bees`.
+fresh full-filesystem rescan, and restart `bees'.
 
 Things You Might Expect That Bees Doesn't Have
 ----------------------------------------------
@@ -152,13 +152,13 @@ Good Btrfs Feature Interactions
 
 Bees has been tested in combination with the following:
 
-* btrfs compression (zlib, lzo, zstd), mixtures of compressed and uncompressed extents
+* 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 and RO)
+* 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 to bees)
+* 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
@@ -166,40 +166,25 @@ Bees has been tested in combination with the following:
 * Large (>16M) extents
 * Huge files (>1TB--although Btrfs performance on such files isn't great in general)
 * filesystems up to 25T 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)
+* btrfs read-only snapshots
 
 Bad Btrfs Feature Interactions
 ------------------------------
 
-Bees has been tested in combination with the following, and various problems are known:
-
-* bcache, lvmcache:  *severe (filesystem-destroying) metadata corruption
-  issues* observed in testing and reported by users, apparently only when
-  used with bees.  Plain SSD and HDD seem to be OK.
-* btrfs send:  sometimes aborts with an I/O error when bees changes the
-  data layout during a send.  The send can be restarted and will work
-  if bees has finished processing the snapshot being sent.  No data
-  corruption observed other than the truncated send.
-* btrfs qgroups:  very slow, sometimes hangs
-* 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,
-  so it should probably be turned off for bees in any case.
-
-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 (probably never will work)
+* btrfs send/receive (receive is probably OK, but send could be confused?)
+* 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/nodatasum inode attribute or mount option (bees skips all nodatasum files)
 * btrfs out-of-tree kernel patches (e.g. in-band dedup 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)
-* Filesystems mounted *without* the flushoncommit option (don't know the impact of crashes during dedup writes vs. ordinary writes)
+* open(O_DIRECT)
+* Filesystems mounted *without* the flushoncommit option
 
 Other Caveats
 -------------
@@ -266,7 +251,7 @@ in the future):
 
 Bug fixes (sometimes included in older LTS kernels):
 
-* Bugs fixed prior to 4.4.107 are not listed here.
+* Bugs fixed prior to 4.4.3 are not listed here.
 * 4.5: hang in the `INO_PATHS` ioctl used by Bees.
 * 4.5: use-after-free in the `FILE_EXTENT_SAME` ioctl used by Bees.
 * 4.6: lost inodes after a rename, crash, and log tree replay
@@ -275,30 +260,10 @@ Bug fixes (sometimes included in older LTS kernels):
   takes too long to resolve a block address to a root/inode/offset triple.
 * 4.10: reduced CPU time cost of the LOGICAL_INO ioctl and dedup
   backref processing in general.
-* 4.11: yet another dedup deadlock case is fixed.  Alas, it is not the
-  last one.
-* 4.14: backref performance improvements make LOGICAL_INO even faster
-  in the worst cases (but possibly slower in the best cases?).
-* 4.14.29: WARN_ON(ref->count < 0) in fs/btrfs/backref.c triggers
-  almost once per second.  The WARN_ON is incorrect and can be removed.
+* 4.11: yet another dedup deadlock case is fixed.
+* 4.14: backref performance improvements make LOGICAL_INO even faster.
 
-Unfixed kernel bugs (as of 4.14.34) with workarounds in Bees:
-
-* *Deadlocks* in the kernel dedup ioctl when files are modified
-  immediately before dedup.  `BeesTempFile::make_copy` calls `fsync()`
-  immediately before dedup to work around this.  If the `fsync()` is
-  removed, the filesystem hangs within a few hours, requiring a reboot
-  to recover.  Even with the `fsync()`, it is possible to lose the
-  kernel race condition and encounter a deadlock within a machine-year.
-  VM image workloads may trigger this faster.  Over the past years
-  several specific deadlock cases have been fixed, but at least one
-  remains.
-
-* *Bad interactions* with other Linux block layers:  bcache and lvmcache
-  can fail spectacularly, and apparently only while running bees.
-  This is definitely a kernel bug, either in btrfs or the lower block
-  layers.  Avoid using bees with these tools, or test very carefully
-  before deployment.
+Unfixed kernel bugs (as of 4.11.9) with workarounds in Bees:
 
 * *slow backrefs* (aka toxic extents): If the number of references to a
   single shared extent within a single file grows above a few thousand,
@@ -307,8 +272,7 @@ Unfixed kernel bugs (as of 4.14.34) with workarounds in Bees:
   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.  Linux kernel v4.14 is better but can still
-  have problems.
+  hash/block addresses.  *Needs to be retested after v4.14.*
 
 * `LOGICAL_INO` output is arbitrarily limited to 2730 references
   even if more buffer space is provided for results.  Once this number
@@ -331,35 +295,32 @@ Unfixed kernel bugs (as of 4.14.34) with workarounds in Bees:
   list of all extent refs referencing a data extent (i.e. Bees wants
   the compressed-extent behavior in all cases).  *Fixed in v4.14.*
 
+* `LOGICAL_INO` is only called from one thread at any time per process.
+  This means at most one core is irretrievably stuck in this ioctl.
+
 * `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.
 
-* **Systems with many CPU cores** may [lock up when bees runs with one
-  worker thread for every core](https://github.com/Zygo/bees/issues/91).
-  bees limits the number of threads it will try to create based on
-  detected CPU core count.  Users may override this limit with the
-  [`--thread-count` option](options.md).
+* If the `fsync()` in `BeesTempFile::make_copy` is removed, the filesystem
+  hangs within a few hours, requiring a reboot to recover.  On the other
+  hand, the `fsync()` only costs about 8% of overall performance.
 
-Not really bugs, but gotchas nonetheless:
+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 10 btrfs transactions.
+  all of the FDs in its directory FD cache every 15 minutes.
 
 * 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.
-
-* 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.
+  15 minutes.
 
 Installation
 ============
@@ -369,7 +330,7 @@ Bees can be installed by following one these instructions:
 Arch package
 ------------
 
-Bees is available in Arch Linux AUR. Install with:
+Bees is availabe in Arch Linux AUR. Install with:
 
 `$ pacaur -S bees-git`
 
@@ -402,45 +363,28 @@ within a temporary runtime directory.
 ### Ubuntu 14.04:
 You can try to carry on the work done here: https://gist.github.com/dagelf/99ee07f5638b346adb8c058ab3d57492
 
-Packaging
----------
-
-See 'Dependencies' below. Package maintainers can pick ideas for building and
-configuring the source package from the Gentoo ebuild in `contrib/gentoo`.
-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.
-
 Dependencies
 ------------
 
-* C++11 compiler (tested with GCC 4.9, 6.2.0, 8.1.0)
+* C++11 compiler (tested with GCC 4.9 and 6.2.0)
 
   Sorry.  I really like closures and shared_ptr, so support
   for earlier compiler versions is unlikely.
 
-* btrfs-progs (tested with 4.1..4.15.1) or libbtrfs-dev
-  (tested with version 4.16.1)
+* btrfs-progs (tested with 4.1..4.7)
 
   Needed for btrfs.h and ctree.h during compile.
-  Also needed by the service wrapper script.
+  Not needed at runtime.
 
 * libuuid-dev
 
   This library is only required for a feature that was removed after v0.1.
   The lingering support code can be removed.
 
-* Linux kernel version: *minimum* 4.4.107, *4.14.29 or later recommended*
+* Linux kernel 4.4.3 or later
 
-  Don't bother trying to make Bees work with kernel versions older than
-  4.4.107.  It may appear to work, but it won't end well:  there are
-  too many missing features and bugs (including data corruption bugs)
-  to work around in older kernels.
-
-  Kernel versions between 4.4.107 and 4.14.29 are usable with bees,
-  but bees can trigger known performance bugs and hangs in dedup-related
-  functions.
+  Don't bother trying to make Bees work with older kernels.
+  It won't end well.
 
 * markdown
 
@@ -493,7 +437,7 @@ be the name of a subvol):
 Configuration
 -------------
 
-There are some runtime configurable options using environment variables:
+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.
@@ -509,7 +453,7 @@ There are some runtime configurable options using environment variables:
 	watch -n1 cat $BEESSTATUS
 
 Other options (e.g. interval between filesystem crawls) can be configured
-in src/bees.h or on the cmdline (see 'Command Line Options' below).
+in src/bees.h.
 
 Running
 -------
@@ -536,57 +480,6 @@ of information about the contents of the filesystem through the log file.
 There are also some shell wrappers in the `scripts/` directory.
 
 
-
-Command Line Options
---------------------
-
-* --thread-count (-c) COUNT
-  * Specify maximum number of worker threads for scanning.  Overrides
-    --thread-factor (-C) and default/autodetected values,
-    and the hardcoded thread limit.
-* --thread-factor (-C) FACTOR
-  * Specify ratio of worker threads to 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.
-    If the computed thread count is higher than `BEES_DEFAULT_THREAD_LIMIT`
-    (currently 8), then only that number of threads will be created.
-    This limit can be overridden by the `--thread-count` option; however,
-    be aware that there are kernel issues with systems that have many CPU
-    cores when users try to run bees on all of them.
-* --loadavg-target (-g) LOADAVG
-  * Specify load average target for dynamic worker threads.
-    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 (-G) COUNT
-  * Specify minimum number of worker threads for scanning.
-    Ignored unless -g option is used to specify a target load.
-
-* --scan-mode (-m) MODE
-  * Specify extent scanning algorithm.  Default mode is 0.
-    _EXPERIMENTAL_ feature that may go away.
-    * Mode 0: scan extents in ascending order of (inode, subvol, offset).
-      Keeps shared extents between snapshots together.  Reads files sequentially.
-      Minimizes temporary space usage.
-    * Mode 1: scan extents from all subvols in parallel.  Good performance
-      on non-spinning media when subvols are unrelated.
-    * Mode 2: scan all extents from one subvol at a time.  Good sequential
-      read performance for spinning media.  Maximizes temporary space usage.
-
-* --timestamps (-t)
-  * Enable timestamps in log output.
-* --no-timestamps (-T)
-  * Disable timestamps in log output.
-* --absolute-paths (-p)
-  * Paths in log output will be absolute.
-* --strip-paths (-P)
-  * Paths in log output will have the working directory at Bees startup
-    stripped.
-* --verbose (-v)
-  * Set log verbosity (0 = no output, 8 = all output, default 8).
-
-
 Bug Reports and Contributions
 -----------------------------
 

contrib/gentoo-bees/metadata/layout.conf

@@ -1,18 +0,0 @@
-# manifest-hashes specify hashes used for new/updated entries
-# the current set went live on 2017-11-21, per 2017-11-12 Council meeting
-# https://archives.gentoo.org/gentoo-dev/message/ba2e5d9666ebd7e1bff1143485a37856
-manifest-hashes = BLAKE2B SHA512
-
-# The following hashes are required on all Manifest entries. If any
-# of them are missing, repoman will refetch and rehash old distfiles.
-# Otherwise, old distfiles will keep using their current hash set.
-manifest-required-hashes = BLAKE2B
-
-# No more old ChangeLogs in Git
-update-changelog = false
-
-# Sign Git commits, and NOT Manifests
-sign-commits = true
-sign-manifests = false
-
-masters = gentoo

contrib/gentoo-bees/profiles/repo_name

@@ -1 +0,0 @@
-bees

contrib/gentoo-bees/sys-fs/bees/Manifest

@@ -1,2 +0,0 @@
-EBUILD bees-9999.ebuild 2001 BLAKE2B 7fa1c9d043a4334579dfad3560d1593717e548c0d31695cf8ccf8ffe45f2347584c7da43b47cad873745f3c843207433c6b892a0469c5618f107c68f78fd5fe2 SHA512 d49266e007895c049e1c9f7e28ec2f649b386a6441eccba02ee411f14ad395925eecdaa8a747962ccc526f9e1d3aba9fd68f4452a1d276d4e5b7d48c80102cd8
-MISC metadata.xml 479 BLAKE2B ef5e110ba8d88f0188dbc0d12bec2ad45c51abf707656f6fe4e0fa498d933fe9c32c5dc4c9b446402ec686084459f9f075e52f33402810962c1ac6b149fb70c8 SHA512 3fcc136ed4c55323cac4f8cf542210eb77f73e2a80f95fcce2d688bc645f6e5126404776536dedc938b18287b54abbc264610cc2f587a42a3a8e6d7bf8415aaa

contrib/gentoo-bees/sys-fs/bees/bees-9999.ebuild

@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
-HOMEPAGE="https://github.com/Zygo/bees"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="tools"
-
-DEPEND="
-	>=sys-apps/util-linux-2.30.2
-	>=sys-fs/btrfs-progs-4.1
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~BTRFS_FS"
-ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 4 3; then
-			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
-			ewarn "properly operate, so it won't work. It's recommended to run at least"
-			ewarn "kernel version 4.11 for best performance and reliability."
-			ewarn
-		elif kernel_is -lt 4 11; then
-			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
-			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
-			ewarn "running, it's recommended to run at least kernel 4.11."
-			ewarn
-		elif kernel_is -lt 4 14 29; then
-			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
-			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
-			ewarn "with more recent kernels:"
-			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
-			ewarn
-		fi
-		elog "Bees recommends to run the latest current kernel for performance and"
-		elog "reliability reasons, see README.md."
-	fi
-}
-
-src_configure() {
-	cat >localconf <<-EOF || die
-		LIBEXEC_PREFIX=/usr/libexec
-		PREFIX=/usr
-		LIBDIR=$(get_libdir)
-		DEFAULT_MAKE_TARGET=all
-	EOF
-	if use tools; then
-		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
-	fi
-}

contrib/gentoo-bees/sys-fs/bees/metadata.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>hurikhan77+bgo@gmail.com</email>
-	<name>Kai Krakow</name>
-</maintainer>
-<use>
-	<flag name="tools">Build extra tools useful for debugging (fiemap, feiwalk, beestop)</flag>
-</use>
-<upstream>
-	<bugs-to>https://github.com/Zygo/bees/issues</bugs-to>
-	<remote-id type="github">Zygo/bees</remote-id>
-</upstream>
-</pkgmetadata>

contrib/gentoo/bees-9999.ebuild

@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3 eutils multilib
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kakra/bees.git"
+	EGIT_BRANCH="integration"
+else
+	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+PATCHES="
+	${FILESDIR}/v0.5-gentoo_build.patch
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-devel/gcc-4.9
+	>=sys-fs/btrfs-progs-4.1
+"
+DEPEND="
+	${COMMON_DEPEND}
+	|| ( dev-python/markdown dev-python/markdown2 )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="README.md COPYING"
+HTML_DOCS="README.html"
+
+src_prepare() {
+	default
+	echo LIBDIR=$(get_libdir) >>${S}/localconf
+}

contrib/gentoo/files/v0.5-gentoo_build.patch

@@ -0,0 +1,20 @@
+diff --git a/localconf b/localconf
+new file mode 100644
+index 0000000..7705cbb
+--- /dev/null
++++ b/localconf
+@@ -0,0 +1,2 @@
++PREFIX=/
++LIBEXEC_PREFIX=/usr/libexec
+diff --git a/makeflags b/makeflags
+index f5983cb..0348623 100644
+--- a/makeflags
++++ b/makeflags
+@@ -1,4 +1,3 @@
+-CCFLAGS  = -Wall -Wextra -Werror -O3 -march=native -I../include -ggdb -D_FILE_OFFSET_BITS=64
+-# CCFLAGS  = -Wall -Wextra -Werror -O0 -I../include -ggdb -fpic -D_FILE_OFFSET_BITS=64
+-CFLAGS   = $(CCFLAGS) -std=c99
+-CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast
++CCFLAGS  = -O3 -I../include -fpic -D_FILE_OFFSET_BITS=64
++CFLAGS   += $(CCFLAGS) -std=c99
++CXXFLAGS += $(CCFLAGS) -std=c++11 -Wold-style-cast

include/crucible/btrfs.h

@@ -23,7 +23,6 @@
 #undef min
 #undef max
 #undef mutex
-#undef swap
 
 #ifndef BTRFS_FIRST_FREE_OBJECTID
 

include/crucible/cache.h

@@ -18,27 +18,17 @@ namespace crucible {
 	public:
 		using Key = tuple<Arguments...>;
 		using Func = function<Return(Arguments...)>;
+		using Time = size_t;
+		using Value = pair<Time, Return>;
 	private:
-		struct Value {
-			Value *fp = nullptr;
-			Value *bp = nullptr;
-			Key key;
-			Return ret;
-			Value(Key k, Return r) : key(k), ret(r) { }
-			// Crash early!
-			~Value() { fp = bp = nullptr; };
-		};
-
 		Func		m_fn;
+		Time		m_ctr;
 		map<Key, Value>	m_map;
 		LockSet<Key>	m_lockset;
 		size_t		m_max_size;
 		mutex		m_mutex;
-		Value		*m_last = nullptr;
 
-		void check_overflow();
-		void move_to_front(Value *vp);
-		void erase_one(Value *vp);
+		bool check_overflow();
 	public:
 		LRUCache(Func f = Func(), size_t max_size = 100);
 
@@ -56,82 +46,30 @@ namespace crucible {
 	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>
-	void
-	LRUCache<Return, Arguments...>::erase_one(Value *vp)
-	{
-		THROW_CHECK0(invalid_argument, vp);
-		Value *vp_bp = vp->bp;
-		THROW_CHECK0(runtime_error, vp_bp);
-		Value *vp_fp = vp->fp;
-		THROW_CHECK0(runtime_error, vp_fp);
-		vp_fp->bp = vp_bp;
-		vp_bp->fp = vp_fp;
-		// If we delete the head of the list then advance the head by one
-		if (vp == m_last) {
-			// If the head of the list is also the tail of the list then clear m_last
-			if (vp_fp == m_last) {
-				m_last = nullptr;
-			} else {
-				m_last = vp_fp;
-			}
-		}
-		m_map.erase(vp->key);
-		if (!m_last) {
-			THROW_CHECK0(runtime_error, m_map.empty());
-		} else {
-			THROW_CHECK0(runtime_error, !m_map.empty());
-		}
-	}
-
-	template <class Return, class... Arguments>
-	void
+	bool
 	LRUCache<Return, Arguments...>::check_overflow()
 	{
-		while (m_map.size() >= m_max_size) {
-			THROW_CHECK0(runtime_error, m_last);
-			THROW_CHECK0(runtime_error, m_last->bp);
-			erase_one(m_last->bp);
+		if (m_map.size() <= m_max_size) {
+			return false;
 		}
-	}
-
-	template <class Return, class... Arguments>
-	void
-	LRUCache<Return, Arguments...>::move_to_front(Value *vp)
-	{
-		if (!m_last) {
-			// Create new LRU list
-			m_last = vp->fp = vp->bp = vp;
-		} else if (m_last != vp) {
-			Value *vp_fp = vp->fp;
-			Value *vp_bp = vp->bp;
-			if (vp_fp && vp_bp) {
-				// There are at least two and we are removing one that isn't m_last
-				// Connect adjacent nodes to each other (has no effect if vp is new), removing vp from list
-				vp_fp->bp = vp_bp;
-				vp_bp->fp = vp_fp;
-			} else {
-				// New insertion, both must be null
-				THROW_CHECK0(runtime_error, !vp_fp);
-				THROW_CHECK0(runtime_error, !vp_bp);
-			}
-			// Splice new node into list
-			Value *last_bp = m_last->bp;
-			THROW_CHECK0(runtime_error, last_bp);
-			// New element points to both ends of list
-			vp->fp = m_last;
-			vp->bp = last_bp;
-			// Insert vp as fp from the end of the list
-			last_bp->fp = vp;
-			// Insert vp as bp from the second from the start of the list
-			m_last->bp = vp;
-			// Update start of list
-			m_last = vp;
+		vector<pair<Key, Time>> key_times;
+		key_times.reserve(m_map.size());
+		for (auto i : m_map) {
+			key_times.push_back(make_pair(i.first, i.second.first));
 		}
+		sort(key_times.begin(), key_times.end(), [](const pair<Key, Time> &a, const pair<Key, Time> &b) {
+			return a.second < b.second;
+		});
+		for (size_t i = 0; i < key_times.size() / 2; ++i) {
+			m_map.erase(key_times[i].first);
+		}
+		return true;
 	}
 
 	template <class Return, class... Arguments>
@@ -140,9 +78,6 @@ namespace crucible {
 	{
 		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();
 	}
 
@@ -158,11 +93,8 @@ namespace crucible {
 	void
 	LRUCache<Return, Arguments...>::clear()
 	{
-		// Move the map onto the stack, then destroy it after we've released the lock.
-		decltype(m_map) new_map;
 		unique_lock<mutex> lock(m_mutex);
-		m_map.swap(new_map);
-		m_last = nullptr;
+		m_map.clear();
 	}
 
 	template <class Return, class... Arguments>
@@ -172,8 +104,8 @@ namespace crucible {
 		unique_lock<mutex> lock(m_mutex);
 		for (auto it = m_map.begin(); it != m_map.end(); ) {
 			auto next_it = ++it;
-			if (pred(it.second.ret)) {
-				erase_one(&it.second);
+			if (pred(it.second.second)) {
+				m_map.erase(it);
 			}
 			it = next_it;
 		}
@@ -201,18 +133,12 @@ namespace crucible {
 
 				// 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();
-
-				// Create new value
-				Value v(k, m_fn(args...));
-
-				// Reacquire cache lock
-				lock.lock();
-
-				// Make room
-				check_overflow();
+				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
@@ -221,17 +147,23 @@ namespace crucible {
 				// Release key lock, keep the cache lock
 				key_lock.unlock();
 
+				// Check to see if we have too many items and reduce if so.
+				if (check_overflow()) {
+					// Reset iterator
+					found = m_map.find(k);
+				}
 			}
 		}
 
 		// Item should be in cache now
 		THROW_CHECK0(runtime_error, found != m_map.end());
 
-		// (Re)insert at head of LRU
-		move_to_front(&(found->second));
-
+		// We are using this object so update the timestamp
+		if (!inserted) {
+			found->second.first = m_ctr++;
+		}
 		// Make copy before releasing lock
-		auto rv = found->second.ret;
+		auto rv = found->second.second;
 		return rv;
 	}
 
@@ -241,10 +173,7 @@ namespace crucible {
 	{
 		Key k(args...);
 		unique_lock<mutex> lock(m_mutex);
-		auto found = m_map.find(k);
-		if (found != m_map.end()) {
-			erase_one(&found->second);
-		}
+		m_map.erase(k);
 	}
 
 	template<class Return, class... Arguments>
@@ -275,24 +204,33 @@ namespace crucible {
 			found = m_map.find(k);
 			if (found == m_map.end()) {
 
-				// Make room
-				check_overflow();
-
 				// No, we hold key and cache locks, but item not in cache.
-				// Insert the provided return value (no need to unlock here)
-				Value v(k, r);
+				// 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 to see if we have too many items and reduce if so.
+				if (check_overflow()) {
+					// Reset iterator
+					found = m_map.find(k);
+				}
 			}
 		}
 
 		// Item should be in cache now
 		THROW_CHECK0(runtime_error, found != m_map.end());
 
-		// (Re)insert at head of LRU
-		move_to_front(&(found->second));
+		// We are using this object so update the timestamp
+		if (!inserted) {
+			found->second.first = m_ctr++;
+		}
 	}
 }
 

include/crucible/chatter.h

@@ -8,8 +8,6 @@
 #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.
 
@@ -35,13 +33,12 @@ namespace crucible {
 	using namespace std;
 
 	class Chatter {
-		int m_loglevel;
 		string m_name;
 		ostream &m_os;
 		ostringstream m_oss;
 
 	public:
-		Chatter(int loglevel, string name, ostream &os = cerr);
+		Chatter(string name, ostream &os = cerr);
 		Chatter(Chatter &&c);
 		ostream &get_os() { return m_oss; }
 
@@ -106,7 +103,7 @@ namespace crucible {
 
 		template <class T> Chatter operator<<(const T &t)
 		{
-			Chatter c(LOG_NOTICE, m_pretty_function, m_os);
+			Chatter c(m_pretty_function, m_os);
 			c << t;
 			return c;
 		}

include/crucible/error.h

@@ -81,21 +81,21 @@ namespace crucible {
 // macro for throwing an error
 #define THROW_ERROR(type, expr) do { \
 	std::ostringstream _te_oss; \
-	_te_oss << expr << " at " << __FILE__ << ":" << __LINE__; \
+	_te_oss << expr; \
 	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 << " at " << __FILE__ << ":" << __LINE__; \
+	_te_oss << expr; \
 	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 << " at " << __FILE__ << ":" << __LINE__; \
+	_te_oss << expr; \
 	throw std::system_error(std::error_code((value), std::system_category()), _te_oss.str()); \
 } while (0)
 

include/crucible/extentwalker.h

@@ -58,7 +58,7 @@ namespace crucible {
 
 		virtual Vec get_extent_map(off_t pos);
 
-		static const unsigned sc_extent_fetch_max = 16;
+		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);
 

include/crucible/lockset.h

@@ -1,6 +1,7 @@
 #ifndef CRUCIBLE_LOCKSET_H
 #define CRUCIBLE_LOCKSET_H
 
+#include <crucible/cleanup.h>
 #include <crucible/error.h>
 #include <crucible/process.h>
 
@@ -12,6 +13,8 @@
 #include <map>
 #include <memory>
 #include <mutex>
+#include <set>
+#include <thread>
 
 namespace crucible {
 	using namespace std;
@@ -29,8 +32,11 @@ namespace crucible {
 		mutex				m_mutex;
 		condition_variable		m_condvar;
 		size_t				m_max_size = numeric_limits<size_t>::max();
+		set<uint64_t>			m_priorities;
+		uint64_t			m_priority_counter;
 
 		bool full();
+		bool first_in_priority(uint64_t my_priority);
 		bool locked(const key_type &name);
 
 		class Lock {
@@ -95,6 +101,26 @@ namespace crucible {
 		return m_set.size() >= m_max_size;
 	}
 
+	template <class T>
+	bool
+	LockSet<T>::first_in_priority(uint64_t my_priority)
+	{
+#if 1
+		auto counter = m_max_size;
+		for (auto i : m_priorities) {
+			if (i == my_priority) {
+				return true;
+			}
+			if (++counter > m_max_size) {
+				return false;
+			}
+		}
+		THROW_ERROR(runtime_error, "my_priority " << my_priority << " not in m_priorities (size " << m_priorities.size() << ")");
+#else
+		return *m_priorities.begin() == my_priority;
+#endif
+	}
+
 	template <class T>
 	bool
 	LockSet<T>::locked(const key_type &name)
@@ -104,9 +130,10 @@ namespace crucible {
 
 	template <class T>
 	void
-	LockSet<T>::max_size(size_t s)
+	LockSet<T>::max_size(size_t new_max_size)
 	{
-		m_max_size = s;
+		THROW_CHECK1(out_of_range, new_max_size, new_max_size > 0);
+		m_max_size = new_max_size;
 	}
 
 	template <class T>
@@ -114,11 +141,18 @@ namespace crucible {
 	LockSet<T>::lock(const key_type &name)
 	{
 		unique_lock<mutex> lock(m_mutex);
-		while (full() || locked(name)) {
+		auto my_priority = m_priority_counter++;
+		Cleanup cleanup([&]() {
+			m_priorities.erase(my_priority);
+		});
+		m_priorities.insert(my_priority);
+		while (full() || locked(name) || !first_in_priority(my_priority)) {
 			m_condvar.wait(lock);
 		}
-		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
+		auto rv = m_set.insert(make_pair(name, gettid()));
 		THROW_CHECK0(runtime_error, rv.second);
+		// We removed our priority slot so other threads have to check again
+		m_condvar.notify_all();
 	}
 
 	template <class T>
@@ -129,7 +163,7 @@ namespace crucible {
 		if (full() || locked(name)) {
 			return false;
 		}
-		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
+		auto rv = m_set.insert(make_pair(name, gettid()));
 		THROW_CHECK1(runtime_error, name, rv.second);
 		return true;
 	}
@@ -141,6 +175,8 @@ namespace crucible {
 		unique_lock<mutex> lock(m_mutex);
 		auto erase_count = m_set.erase(name);
 		m_condvar.notify_all();
+		lock.unlock();
+		this_thread::yield();
 		THROW_CHECK1(invalid_argument, erase_count, erase_count == 1);
 	}
 

include/crucible/process.h

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

include/crucible/progress.h

@@ -1,122 +0,0 @@
-#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();
-		value_type end();
-
-		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()
-	{
-		unique_lock<mutex> lock(m_state->m_mutex);
-		return m_state->m_begin;
-	}
-
-	template <class T>
-	typename ProgressTracker<T>::value_type
-	ProgressTracker<T>::end()
-	{
-		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/task.h

@@ -1,163 +0,0 @@
-#ifndef CRUCIBLE_TASK_H
-#define CRUCIBLE_TASK_H
-
-#include <functional>
-#include <memory>
-#include <ostream>
-#include <string>
-
-namespace crucible {
-	using namespace std;
-
-	class TaskState;
-
-	using TaskId = uint64_t;
-
-	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 at end of queue.
-		// May run Task in current thread or in other thread.
-		// May run Task before or after returning.
-		void run() const;
-
-		// schedule Task before other queued tasks
-		void run_earlier() 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();
-
-		// Ordering 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();
-
-	};
-
-	// Barrier executes waiting Tasks once the last BarrierLock
-	// is released.  Multiple unique Tasks may be scheduled while
-	// BarrierLocks exist and all will be run() at once upon
-	// release.  If no BarrierLocks exist, Tasks are executed
-	// immediately upon insertion.
-
-	class BarrierState;
-
-	class BarrierLock {
-		shared_ptr<BarrierState> m_barrier_state;
-		BarrierLock(shared_ptr<BarrierState> pbs);
-	friend class Barrier;
-	public:
-		// Release this Lock immediately and permanently
-		void release();
-	};
-
-	class Barrier {
-		shared_ptr<BarrierState> m_barrier_state;
-
-		Barrier(shared_ptr<BarrierState> pbs);
-	public:
-		Barrier();
-
-		// Prevent execution of tasks behind barrier until
-		// BarrierLock destructor or release() method is called.
-		BarrierLock lock();
-
-		// Schedule a task for execution when no Locks exist
-		void insert_task(Task t);
-	};
-
-	// Exclusion provides exclusive access to a ExclusionLock.
-	// One Task will be able to obtain the ExclusionLock; other Tasks
-	// may schedule themselves for re-execution after the ExclusionLock
-	// is released.
-
-	class ExclusionState;
-	class Exclusion;
-
-	class ExclusionLock {
-		shared_ptr<ExclusionState> m_exclusion_state;
-		ExclusionLock(shared_ptr<ExclusionState> pes);
-		ExclusionLock() = default;
-	friend class Exclusion;
-	public:
-		// Calls release()
-		~ExclusionLock();
-
-		// Release this Lock immediately and permanently
-		void release();
-
-		// Test for locked state
-		operator bool() const;
-	};
-
-	class Exclusion {
-		shared_ptr<ExclusionState> m_exclusion_state;
-
-		Exclusion(shared_ptr<ExclusionState> pes);
-	public:
-		Exclusion();
-
-		// 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 expected to call
-		// insert_task(current_task()), release any ExclusionLock
-		// objects it holds, and exit its Task function.
-		ExclusionLock try_lock();
-
-		// Execute Task when Exclusion is unlocked (possibly immediately).
-		// First Task is scheduled with run_earlier(), all others are
-		// scheduled with run().
-		void insert_task(Task t);
-	};
-
-
-}
-
-#endif // CRUCIBLE_TASK_H

include/crucible/time.h

@@ -4,8 +4,6 @@
 #include "crucible/error.h"
 
 #include <chrono>
-#include <condition_variable>
-#include <limits>
 #include <mutex>
 #include <ostream>
 
@@ -19,9 +17,10 @@ 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;
@@ -46,59 +45,6 @@ namespace crucible {
 		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

@@ -0,0 +1,188 @@
+#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 long 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/workqueue.h

@@ -0,0 +1,192 @@
+#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 {
+			// Make copy with lock held
+			auto rv = *m_set.begin();
+			return rv;
+		}
+	}
+
+	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);
+		auto rv = m_set;
+		return rv;
+	}
+
+	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/Makefile

@@ -1,9 +1,8 @@
-TAG ?= $(shell git describe --always --dirty || echo UNKNOWN)
+TAG := $(shell git describe --always --dirty || echo UNKNOWN)
 
 default: libcrucible.so
-%.so: Makefile
 
-CRUCIBLE_OBJS = \
+OBJS = \
 	chatter.o \
 	cleanup.o \
 	crc64.o \
@@ -15,33 +14,24 @@ CRUCIBLE_OBJS = \
 	path.o \
 	process.o \
 	string.o \
-	task.o \
 	time.o \
 	uuid.o \
+	.version.o \
 
 include ../makeflags
--include ../localconf
-include ../Defines.mk
 
-configure.h: configure.h.in
-	$(TEMPLATE_COMPILER)
+depends.mk: *.cc
+	for x in *.cc; do $(CXX) $(CXXFLAGS) -M "$$x"; done >> depends.mk.new
+	mv -fv depends.mk.new depends.mk
 
-.depends/%.dep: %.cc configure.h Makefile
-	@mkdir -p .depends
-	$(CXX) $(CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
+.version.cc: Makefile ../makeflags *.cc ../include/crucible/*.h
+	echo "namespace crucible { const char *VERSION = \"$(TAG)\"; }" > .version.new.cc
+	mv -f .version.new.cc .version.cc
 
-depends.mk: $(CRUCIBLE_OBJS:%.o=.depends/%.dep)
-	cat $^ > $@.new
-	mv -f $@.new $@
+-include depends.mk
 
-.version.cc: configure.h Makefile ../makeflags $(CRUCIBLE_OBJS:.o=.cc) ../include/crucible/*.h
-	echo "namespace crucible { const char *VERSION = \"$(TAG)\"; }" > $@.new
-	mv -f $@.new $@
-
-include depends.mk
-
-%.o: %.cc ../makeflags
+%.o: %.cc ../include/crucible/%.h
 	$(CXX) $(CXXFLAGS) -fPIC -o $@ -c $<
 
-libcrucible.so: $(CRUCIBLE_OBJS) .version.o
-	$(CXX) $(LDFLAGS) -fPIC -shared -Wl,-soname,$@ -o $@ $^ -luuid
+libcrucible.so: $(OBJS) Makefile
+	$(CXX) $(LDFLAGS) -fPIC -o $@ $(OBJS) -shared -Wl,-soname,$@ -luuid

lib/chatter.cc

@@ -44,8 +44,8 @@ namespace crucible {
 		}
 	}
 
-	Chatter::Chatter(int loglevel, string name, ostream &os)
-		: m_loglevel(loglevel), m_name(name), m_os(os)
+	Chatter::Chatter(string name, ostream &os)
+		: m_name(name), m_os(os)
 	{
 	}
 
@@ -69,16 +69,14 @@ namespace crucible {
 			DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm));
 
 			header_stream << buf;
-			header_stream << " " << getpid() << "." << crucible::gettid() << "<" << m_loglevel << ">";
-			if (!m_name.empty()) {
-				header_stream << " " << m_name;
-			}
+			header_stream << " " << getpid() << "." << gettid();
 		} else {
-			header_stream << "<" << m_loglevel << ">";
-			header_stream << (m_name.empty() ? "thread" : m_name);
-			header_stream << "[" << crucible::gettid() << "]";
+			header_stream << "tid " << gettid();
 		}
 
+		if (!m_name.empty()) {
+			header_stream << " " << m_name;
+		}
 		header_stream << ": ";
 
 		string out = m_oss.str();
@@ -100,7 +98,7 @@ namespace crucible {
 	}
 
 	Chatter::Chatter(Chatter &&c)
-		: m_loglevel(c.m_loglevel), m_name(c.m_name), m_os(c.m_os), m_oss(c.m_oss.str())
+		: m_name(c.m_name), m_os(c.m_os), m_oss(c.m_oss.str())
 	{
 		c.m_oss.str("");
 	}
@@ -124,7 +122,6 @@ 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;
 	}
 

lib/configure.h.in

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

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/extentwalker.cc

@@ -6,6 +6,7 @@
 #include "crucible/limits.h"
 #include "crucible/string.h"
 
+
 namespace crucible {
 	using namespace std;
 
@@ -14,6 +15,7 @@ namespace crucible {
 	// 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");
@@ -331,9 +333,7 @@ namespace crucible {
 		THROW_CHECK1(runtime_error, new_vec.size(), !new_vec.empty());
 
 		// Allow last extent to extend beyond desired range (e.g. at EOF)
-		// ...but that's not what this does
-		// THROW_CHECK3(runtime_error, ipos, new_vec.rbegin()->m_end, m_stat.st_size, ipos <= new_vec.rbegin()->m_end);
-
+		THROW_CHECK2(runtime_error, ipos, new_vec.rbegin()->m_end, 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);

lib/fd.cc

@@ -174,13 +174,11 @@ 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),
-#ifdef MAP_FILE
+#if MAP_FILE
 		NTOA_TABLE_ENTRY_BITS(MAP_FILE),
 #endif
 		NTOA_TABLE_ENTRY_BITS(MAP_FIXED),

lib/fs.cc

@@ -701,7 +701,7 @@ namespace crucible {
 	BtrfsIoctlSearchHeader::set_data(const vector<char> &v, size_t offset)
 	{
 		THROW_CHECK2(invalid_argument, offset, v.size(), offset + sizeof(btrfs_ioctl_search_header) <= v.size());
-		*static_cast<btrfs_ioctl_search_header *>(this) = *reinterpret_cast<const btrfs_ioctl_search_header *>(&v[offset]);
+		memcpy(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]);

lib/process.cc

@@ -3,7 +3,6 @@
 #include "crucible/chatter.h"
 #include "crucible/error.h"
 
-#include <cstdlib>
 #include <utility>
 
 // for gettid()
@@ -110,43 +109,13 @@ 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];
-	}
-
 }

lib/task.cc

@@ -1,644 +0,0 @@
-#include "crucible/task.h"
-
-#include "crucible/cleanup.h"
-#include "crucible/error.h"
-#include "crucible/process.h"
-#include "crucible/time.h"
-
-#include <atomic>
-#include <cmath>
-#include <condition_variable>
-#include <list>
-#include <map>
-#include <mutex>
-#include <set>
-#include <thread>
-
-namespace crucible {
-	using namespace std;
-
-	static thread_local weak_ptr<TaskState> tl_current_task_wp;
-
-	class TaskState : public enable_shared_from_this<TaskState> {
-		const function<void()> 			m_exec_fn;
-		const string				m_title;
-		TaskId					m_id;
-
-		static atomic<TaskId>			s_next_id;
-	public:
-		TaskState(string title, function<void()> exec_fn);
-
-		void exec();
-		string title() const;
-		TaskId id() const;
-	};
-
-	atomic<TaskId> TaskState::s_next_id;
-
-	class TaskConsumer;
-	class TaskMasterState;
-
-	class TaskMasterState : public enable_shared_from_this<TaskMasterState> {
-		mutex 					m_mutex;
-		condition_variable 			m_condvar;
-		list<shared_ptr<TaskState>>		m_queue;
-		size_t					m_thread_max;
-		size_t					m_thread_min = 0;
-		set<shared_ptr<TaskConsumer>>		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;
-
-	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();
-
-	public:
-		~TaskMasterState();
-		TaskMasterState(size_t thread_max = thread::hardware_concurrency());
-
-		static void push_back(shared_ptr<TaskState> task);
-		static void push_front(shared_ptr<TaskState> task);
-		size_t get_queue_count();
-	};
-
-	class TaskConsumer : public enable_shared_from_this<TaskConsumer> {
-		weak_ptr<TaskMasterState>	m_master;
-		thread				m_thread;
-		shared_ptr<TaskState>		m_current_task;
-
-		void consumer_thread();
-		shared_ptr<TaskState> current_task_locked();
-	public:
-		TaskConsumer(weak_ptr<TaskMasterState> tms);
-		shared_ptr<TaskState> current_task();
-	friend class TaskMaster;
-	friend class TaskMasterState;
-	};
-
-	static shared_ptr<TaskMasterState> s_tms = make_shared<TaskMasterState>();
-
-	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());
-	}
-
-	void
-	TaskState::exec()
-	{
-		THROW_CHECK0(invalid_argument, m_exec_fn);
-		THROW_CHECK0(invalid_argument, !m_title.empty());
-
-		char buf[24];
-		memset(buf, '\0', sizeof(buf));
-		DIE_IF_MINUS_ERRNO(pthread_getname_np(pthread_self(), buf, sizeof(buf)));
-		Cleanup pthread_name_cleaner([&]() {
-			pthread_setname_np(pthread_self(), buf);
-		});
-		DIE_IF_MINUS_ERRNO(pthread_setname_np(pthread_self(), m_title.c_str()));
-
-		weak_ptr<TaskState> this_task_wp = shared_from_this();
-		Cleanup current_task_cleaner([&]() {
-			swap(this_task_wp, tl_current_task_wp);
-		});
-		swap(this_task_wp, tl_current_task_wp);
-
-		m_exec_fn();
-	}
-
-	string
-	TaskState::title() const
-	{
-		THROW_CHECK0(runtime_error, !m_title.empty());
-		return m_title;
-	}
-
-	TaskId
-	TaskState::id() const
-	{
-		return m_id;
-	}
-
-	TaskMasterState::TaskMasterState(size_t thread_max) :
-		m_thread_max(thread_max),
-		m_configured_thread_max(thread_max),
-		m_thread_target(thread_max)
-	{
-	}
-
-	void
-	TaskMasterState::start_threads_nolock()
-	{
-		while (m_threads.size() < m_thread_max) {
-			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(shared_ptr<TaskState> task)
-	{
-		THROW_CHECK0(runtime_error, task);
-		unique_lock<mutex> lock(s_tms->m_mutex);
-		s_tms->m_queue.push_back(task);
-		s_tms->m_condvar.notify_all();
-		s_tms->start_threads_nolock();
-	}
-
-	void
-	TaskMasterState::push_front(shared_ptr<TaskState> task)
-	{
-		THROW_CHECK0(runtime_error, task);
-		unique_lock<mutex> lock(s_tms->m_mutex);
-		s_tms->m_queue.push_front(task);
-		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();
-	}
-
-	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_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;
-
-		// Change the thread target based on the
-		// difference between current and desired load
-		// but don't get too close all at once due to rounding and sample error.
-		// If m_load_target < 1.0 then we are just doing PWM with one thread.
-
-		if (m_load_target <= 1.0) {
-			m_thread_target = 1.0;
-		} else if (m_load_target - current_load >= 1.0) {
-			m_thread_target += (m_load_target - current_load - 1.0) / 2.0;
-		} else if (m_load_target < current_load) {
-			m_thread_target += m_load_target - current_load;
-		}
-
-		// 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::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_np(pthread_self(), "load_tracker");
-		while (true) {
-			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);
-		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);
-		TaskMasterState::push_back(m_task_state);
-	}
-
-	void
-	Task::run_earlier() const
-	{
-		THROW_CHECK0(runtime_error, m_task_state);
-		TaskMasterState::push_front(m_task_state);
-	}
-
-	Task
-	Task::current_task()
-	{
-		return Task(tl_current_task_wp.lock());
-	}
-
-	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()
-	{
-		auto master_locked = m_master.lock();
-		unique_lock<mutex> lock(master_locked->m_mutex);
-		return current_task_locked();
-	}
-
-	void
-	TaskConsumer::consumer_thread()
-	{
-		auto master_locked = m_master.lock();
-		while (true) {
-			unique_lock<mutex> lock(master_locked->m_mutex);
-			if (master_locked->m_thread_max < master_locked->m_threads.size()) {
-				break;
-			}
-
-			if (master_locked->m_queue.empty()) {
-				master_locked->m_condvar.wait(lock);
-				continue;
-			}
-
-			m_current_task = *master_locked->m_queue.begin();
-			master_locked->m_queue.pop_front();
-			lock.unlock();
-			catch_all([&]() {
-				m_current_task->exec();
-			});
-			lock.lock();
-			m_current_task.reset();
-		}
-
-		unique_lock<mutex> lock(master_locked->m_mutex);
-		m_thread.detach();
-		master_locked->m_threads.erase(shared_from_this());
-		master_locked->m_condvar.notify_all();
-	}
-
-	TaskConsumer::TaskConsumer(weak_ptr<TaskMasterState> tms) :
-		m_master(tms),
-		m_thread([=](){ consumer_thread(); })
-	{
-	}
-
-	class BarrierState {
-		mutex		m_mutex;
-		set<Task>	m_tasks;
-
-		void release();
-	public:
-		~BarrierState();
-		void insert_task(Task t);
-	};
-
-	Barrier::Barrier(shared_ptr<BarrierState> pbs) :
-		m_barrier_state(pbs)
-	{
-	}
-
-	Barrier::Barrier() :
-		m_barrier_state(make_shared<BarrierState>())
-	{
-	}
-
-	void
-	BarrierState::release()
-	{
-		unique_lock<mutex> lock(m_mutex);
-		for (auto i : m_tasks) {
-			i.run();
-		}
-		m_tasks.clear();
-	}
-
-	BarrierState::~BarrierState()
-	{
-		release();
-	}
-
-	BarrierLock::BarrierLock(shared_ptr<BarrierState> pbs) :
-		m_barrier_state(pbs)
-	{
-	}
-
-	void
-	BarrierLock::release()
-	{
-		m_barrier_state.reset();
-	}
-
-	void
-	BarrierState::insert_task(Task t)
-	{
-		unique_lock<mutex> lock(m_mutex);
-		m_tasks.insert(t);
-	}
-
-	void
-	Barrier::insert_task(Task t)
-	{
-		m_barrier_state->insert_task(t);
-	}
-
-	BarrierLock
-	Barrier::lock()
-	{
-		return BarrierLock(m_barrier_state);
-	}
-
-	class ExclusionState {
-		mutex		m_mutex;
-		bool		m_locked = false;
-		set<Task>	m_tasks;
-
-	public:
-		~ExclusionState();
-		void release();
-		bool try_lock();
-		void insert_task(Task t);
-	};
-
-	Exclusion::Exclusion(shared_ptr<ExclusionState> pbs) :
-		m_exclusion_state(pbs)
-	{
-	}
-
-	Exclusion::Exclusion() :
-		m_exclusion_state(make_shared<ExclusionState>())
-	{
-	}
-
-	void
-	ExclusionState::release()
-	{
-		unique_lock<mutex> lock(m_mutex);
-		m_locked = false;
-		bool first = true;
-		for (auto i : m_tasks) {
-			if (first) {
-				i.run_earlier();
-				first = false;
-			} else {
-				i.run();
-			}
-		}
-		m_tasks.clear();
-	}
-
-	ExclusionState::~ExclusionState()
-	{
-		release();
-	}
-
-	ExclusionLock::ExclusionLock(shared_ptr<ExclusionState> pbs) :
-		m_exclusion_state(pbs)
-	{
-	}
-
-	void
-	ExclusionLock::release()
-	{
-		if (m_exclusion_state) {
-			m_exclusion_state->release();
-			m_exclusion_state.reset();
-		}
-	}
-
-	ExclusionLock::~ExclusionLock()
-	{
-		release();
-	}
-
-	void
-	ExclusionState::insert_task(Task task)
-	{
-		unique_lock<mutex> lock(m_mutex);
-		m_tasks.insert(task);
-	}
-
-	bool
-	ExclusionState::try_lock()
-	{
-		unique_lock<mutex> lock(m_mutex);
-		if (m_locked) {
-			return false;
-		} else {
-			m_locked = true;
-			return true;
-		}
-	}
-
-	void
-	Exclusion::insert_task(Task t)
-	{
-		m_exclusion_state->insert_task(t);
-	}
-
-	ExclusionLock::operator bool() const
-	{
-		return !!m_exclusion_state;
-	}
-
-	ExclusionLock
-	Exclusion::try_lock()
-	{
-		THROW_CHECK0(runtime_error, m_exclusion_state);
-		if (m_exclusion_state->try_lock()) {
-			return ExclusionLock(m_exclusion_state);
-		} else {
-			return ExclusionLock();
-		}
-	}
-}

lib/time.cc

@@ -1,13 +1,11 @@
 #include "crucible/time.h"
 
 #include "crucible/error.h"
-#include "crucible/process.h"
 
 #include <algorithm>
-#include <thread>
-
 #include <cmath>
 #include <ctime>
+#include <thread>
 
 namespace crucible {
 
@@ -61,10 +59,16 @@ namespace crucible {
 		m_start = chrono::high_resolution_clock::now();
 	}
 
-	chrono::high_resolution_clock::time_point
-	Timer::get() const
+	void
+	Timer::set(const chrono::high_resolution_clock::time_point &start)
 	{
-		return m_start;
+		m_start = start;
+	}
+
+	void
+	Timer::set(double delta)
+	{
+		m_start += chrono::duration_cast<chrono::high_resolution_clock::duration>(chrono::duration<double>(delta));
 	}
 
 	double
@@ -151,189 +155,4 @@ 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);
-	}
-
 }

makeflags

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

scripts/beesd.conf.sample

@@ -15,8 +15,8 @@ UUID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
 # BEESHOME="$MNT_DIR/.beeshome"
 # BEESSTATUS="$WORK_DIR/$UUID.status"
 
-## Options to apply, see `beesd --help` for details
-# OPTIONS="--strip-paths --no-timestamps"
+## Default options to apply, see --help for details
+# OPTIONS="--relative-paths --notimestamps"
 
 ## Bees DB size
 # Hash Table Sizing

scripts/beesd.in

@@ -12,71 +12,7 @@ export CONFIG_FILE
 export UUID AL16M
 
 readonly AL16M="$((16*1024*1024))"
-readonly CONFIG_DIR=@ETC_PREFIX@/bees/
-
-readonly bees_bin=$(realpath @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
-}
-
-get_bees_supp_opts(){
-    "$bees_bin" --help |& awk '/--../ { gsub( ",", "" ); print $1 " " $2}'
-}
-
-SUPPORTED_ARGS=(
-    $(get_bees_supp_opts)
-)
-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="$(egrep -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"
-
+readonly CONFIG_DIR=@PREFIX@/etc/bees/
 
 ## Pre checks
 {
@@ -84,6 +20,44 @@ source "$FILE_CONFIG"
     [ "$UID" == "0" ] || ERRO "Must be run as root"
 }
 
+command -v @LIBEXEC_PREFIX@/bees &> /dev/null || ERRO "Missing 'bees' agent"
+
+## Parse args
+ARGUMENTS=()
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -*)
+            ARGUMENTS+=($1)
+        ;;
+        *)
+            if [ -z "$UUID" ]; then
+                UUID="$1"
+            else
+                ERRO "Only one filesystem may be supplied"
+            fi
+        ;;
+    esac
+    shift
+done
+
+case "$UUID" in
+    *-*-*-*-*)
+        FILE_CONFIG=""
+        for file in "$CONFIG_DIR"/*.conf; do
+            [ ! -f "$file" ] && continue
+            if grep -q "$UUID" "$file"; then
+                INFO "Find $UUID in $file, use as conf"
+                FILE_CONFIG="$file"
+            fi
+        done
+        [ ! -f "$FILE_CONFIG" ] && ERRO "No config for $UUID"
+        source "$FILE_CONFIG"
+    ;;
+    *)
+        echo "beesd [options] <btrfs_uuid>"
+        exit 1
+    ;;
+esac
 
 WORK_DIR="${WORK_DIR:-/run/bees/}"
 MNT_DIR="${MNT_DIR:-$WORK_DIR/mnt/$UUID}"
@@ -139,7 +113,7 @@ fi
     chmod 700 "$DB_PATH"
 }
 
-MNT_DIR="$(realpath $MNT_DIR)"
+MNT_DIR="${MNT_DIR//\/\//\/}"
 
 cd "$MNT_DIR"
-"$bees_bin" "${ARGUMENTS[@]}" $OPTIONS "$MNT_DIR"
+@LIBEXEC_PREFIX@/bees "${ARGUMENTS[@]}" $OPTIONS "$MNT_DIR"

scripts/beesd@.service.in

@@ -5,20 +5,21 @@ 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
+ExecStart=/usr/sbin/beesd %i
+Nice=19
 KillMode=control-group
 KillSignal=SIGTERM
-MemoryAccounting=true
+CPUShares=128
+StartupCPUShares=256
+BlockIOWeight=100
+StartupBlockIOWeight=250
+IOSchedulingClass=idle
+IOSchedulingPriority=7
+CPUSchedulingPolicy=batch
 Nice=19
 Restart=on-abnormal
-StartupCPUWeight=25
-StartupIOWeight=25
+CPUAccounting=true
+MemoryAccounting=true
 
 [Install]
 WantedBy=basic.target

src/.gitignore

@@ -1,2 +1 @@
 bees-version.[ch]
-bees-version.new.c

src/Makefile

@@ -3,14 +3,30 @@ PROGRAMS = \
 	../bin/fiemap \
 	../bin/fiewalk \
 
-all: $(PROGRAMS)
+all: $(PROGRAMS) depends.mk
 
 include ../makeflags
--include ../localconf
 
 LIBS = -lcrucible -lpthread
 LDFLAGS = -L../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
+
+bees-version.c: Makefile *.cc *.h
+	echo "const char *BEES_VERSION = \"$(shell git describe --always --dirty || echo UNKNOWN)\";" > bees-version.new.c
+	mv -f bees-version.new.c bees-version.c
+
+-include depends.mk
+
+%.o: %.cc %.h
+	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+../bin/%: %.o
+	@echo Implicit bin rule "$<" '->' "$@"
+	$(CXX) $(CXXFLAGS) -o "$@" "$<" $(LDFLAGS) $(LIBS)
+
 BEES_OBJS = \
 	bees.o \
 	bees-context.o \
@@ -19,30 +35,11 @@ BEES_OBJS = \
 	bees-roots.o \
 	bees-thread.o \
 	bees-types.o \
+	bees-version.o \
 
-bees-version.c: bees.h $(BEES_OBJS:.o=.cc) Makefile
-	echo "const char *BEES_VERSION = \"$(BEES_VERSION)\";" > bees-version.new.c
-	mv -f bees-version.new.c bees-version.c
-
-.depends/%.dep: %.cc Makefile
-	@mkdir -p .depends
-	$(CXX) $(CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
-
-depends.mk: $(BEES_OBJS:%.o=.depends/%.dep)
-	cat $^ > $@.new
-	mv -f $@.new $@
-
-include depends.mk
-
-%.o: %.cc %.h
-	$(CXX) $(CXXFLAGS) -o $@ -c $<
-
-../bin/%: %.o
-	@echo Implicit bin rule "$<" '->' "$@"
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-
-../bin/bees: $(BEES_OBJS) bees-version.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+../bin/bees: $(BEES_OBJS)
+	$(CXX) $(CXXFLAGS) -o "$@" $(BEES_OBJS) $(LDFLAGS) $(LIBS)
 
 clean:
-	rm -fv *.o bees-version.c
+	-rm -fv bees-version.h
+	-rm -fv *.o bees-version.c

src/bees-context.cc

@@ -1,8 +1,8 @@
 #include "bees.h"
 
 #include "crucible/limits.h"
+#include "crucible/process.h"
 #include "crucible/string.h"
-#include "crucible/task.h"
 
 #include <fstream>
 #include <iostream>
@@ -11,6 +11,17 @@
 using namespace crucible;
 using namespace std;
 
+static inline
+const char *
+getenv_or_die(const char *name)
+{
+	const char *rv = getenv(name);
+	if (!rv) {
+		THROW_ERROR(runtime_error, "Environment variable " << name << " not defined");
+	}
+	return rv;
+}
+
 BeesFdCache::BeesFdCache()
 {
 	m_root_cache.func([&](shared_ptr<BeesContext> ctx, uint64_t root) -> Fd {
@@ -29,26 +40,30 @@ BeesFdCache::BeesFdCache()
 	m_file_cache.max_size(BEES_FILE_FD_CACHE_SIZE);
 }
 
-void
-BeesFdCache::clear()
-{
-	BEESNOTE("Clearing root FD cache to enable subvol delete");
-	m_root_cache.clear();
-	BEESCOUNT(root_clear);
-	BEESNOTE("Clearing open FD cache to enable file delete");
-	m_file_cache.clear();
-	BEESCOUNT(open_clear);
-}
-
 Fd
 BeesFdCache::open_root(shared_ptr<BeesContext> ctx, uint64_t root)
 {
+	// Don't hold root FDs open too long.
+	// The open FDs prevent snapshots from being deleted.
+	// cleaner_kthread just keeps skipping over the open dir and all its children.
+	if (m_root_cache_timer.age() > BEES_COMMIT_INTERVAL) {
+		BEESINFO("Clearing root FD cache to enable subvol delete");
+		m_root_cache.clear();
+		m_root_cache_timer.reset();
+		BEESCOUNT(root_clear);
+	}
 	return m_root_cache(ctx, root);
 }
 
 Fd
 BeesFdCache::open_root_ino(shared_ptr<BeesContext> ctx, uint64_t root, uint64_t ino)
 {
+	if (m_file_cache_timer.age() > BEES_COMMIT_INTERVAL) {
+		BEESINFO("Clearing open FD cache to enable file delete");
+		m_file_cache.clear();
+		m_file_cache_timer.reset();
+		BEESCOUNT(open_clear);
+	}
 	return m_file_cache(ctx, root, ino);
 }
 
@@ -65,7 +80,7 @@ BeesContext::dump_status()
 	auto status_charp = getenv("BEESSTATUS");
 	if (!status_charp) return;
 	string status_file(status_charp);
-	BEESLOGINFO("Writing status to file '" << status_file << "' every " << BEES_STATUS_INTERVAL << " sec");
+	BEESLOG("Writing status to file '" << status_file << "' every " << BEES_STATUS_INTERVAL << " sec");
 	while (1) {
 		BEESNOTE("waiting " << BEES_STATUS_INTERVAL);
 		sleep(BEES_STATUS_INTERVAL);
@@ -80,19 +95,11 @@ BeesContext::dump_status()
 		ofs << "RATES:\n";
 		ofs << "\t" << avg_rates << "\n";
 
-		ofs << "THREADS (work queue " << TaskMaster::get_queue_count() << " tasks):\n";
-		for (auto t : BeesNote::get_status()) {
+		ofs << "THREADS:\n";
+		for (auto t : BeesNote::get_status()) {	
 			ofs << "\ttid " << t.first << ": " << t.second << "\n";
 		}
 
-#if 0
-		// Huge amount of data, not a lot of information (yet)
-		ofs << "WORKERS:\n";
-		TaskMaster::print_workers(ofs);
-		ofs << "QUEUE:\n";
-		TaskMaster::print_queue(ofs);
-#endif
-
 		ofs.close();
 
 		BEESNOTE("renaming status file '" << status_file << "'");
@@ -114,24 +121,24 @@ BeesContext::show_progress()
 
 			auto thisStats = BeesStats::s_global;
 			auto avg_rates = lastStats / BEES_STATS_INTERVAL;
-			BEESLOGINFO("TOTAL: " << thisStats);
-			BEESLOGINFO("RATES: " << avg_rates);
+			BEESLOG("TOTAL: " << thisStats);
+			BEESLOG("RATES: " << avg_rates);
 			lastStats = thisStats;
 		}
 
-		BEESLOGINFO("ACTIVITY:");
+		BEESLOG("ACTIVITY:");
 
 		auto thisStats = BeesStats::s_global;
 		auto deltaStats = thisStats - lastProgressStats;
 		if (deltaStats) {
-			BEESLOGINFO("\t" << deltaStats / BEES_PROGRESS_INTERVAL);
+			BEESLOG("\t" << deltaStats / BEES_PROGRESS_INTERVAL);
 		};
 		lastProgressStats = thisStats;
 
-		BEESLOGINFO("THREADS:");
+		BEESLOG("THREADS:");
 
-		for (auto t : BeesNote::get_status()) {
-			BEESLOGINFO("\ttid " << t.first << ": " << t.second);
+		for (auto t : BeesNote::get_status()) {	
+			BEESLOG("\ttid " << t.first << ": " << t.second);
 		}
 	}
 }
@@ -139,10 +146,6 @@ BeesContext::show_progress()
 Fd
 BeesContext::home_fd()
 {
-	if (!!m_home_fd) {
-		return m_home_fd;
-	}
-
 	const char *base_dir = getenv("BEESHOME");
 	if (!base_dir) {
 		base_dir = ".beeshome";
@@ -157,40 +160,27 @@ BeesContext::home_fd()
 BeesContext::BeesContext(shared_ptr<BeesContext> parent) :
 	m_parent_ctx(parent)
 {
+	// m_extent_lock_set.max_size(bees_worker_thread_count());;
 	if (m_parent_ctx) {
 		m_fd_cache = m_parent_ctx->fd_cache();
 	}
 }
 
-bool
-BeesContext::is_root_ro(uint64_t root)
-{
-	return roots()->is_root_ro(root);
-}
-
 bool
 BeesContext::dedup(const BeesRangePair &brp)
 {
-	// TOOLONG and NOTE can retroactively fill in the filename details, but LOG can't
-	BEESNOTE("dedup " << brp);
-
+	// Open the files
+	brp.first.fd(shared_from_this());
 	brp.second.fd(shared_from_this());
 
-	if (is_root_ro(brp.second.fid().root())) {
-		// BEESLOGDEBUG("WORKAROUND: dst subvol is read-only in " << name_fd(brp.second.fd()));
-		BEESCOUNT(dedup_workaround_btrfs_send);
-		return false;
-	}
-
-	brp.first.fd(shared_from_this());
-
+	BEESNOTE("dedup " << brp);
 	BEESTOOLONG("dedup " << brp);
 
 	BeesAddress first_addr(brp.first.fd(), brp.first.begin());
 	BeesAddress second_addr(brp.second.fd(), brp.second.begin());
 
-	BEESLOGINFO("dedup: src " << pretty(brp.first.size())  << " [" << to_hex(brp.first.begin())  << ".." << to_hex(brp.first.end())  << "] {" << first_addr  << "} " << name_fd(brp.first.fd()) << "\n"
-		 << "       dst " << pretty(brp.second.size()) << " [" << to_hex(brp.second.begin()) << ".." << to_hex(brp.second.end()) << "] {" << second_addr << "} " << name_fd(brp.second.fd()));
+	BEESLOG("dedup: src " << pretty(brp.first.size())  << " [" << to_hex(brp.first.begin())  << ".." << to_hex(brp.first.end())  << "] {" << first_addr  << "} " << name_fd(brp.first.fd()));
+	BEESLOG("       dst " << pretty(brp.second.size()) << " [" << to_hex(brp.second.begin()) << ".." << to_hex(brp.second.end()) << "] {" << second_addr << "} " << name_fd(brp.second.fd()));
 
 	if (first_addr.get_physical_or_zero() == second_addr.get_physical_or_zero()) {
 		BEESLOGTRACE("equal physical addresses in dedup");
@@ -215,7 +205,7 @@ BeesContext::dedup(const BeesRangePair &brp)
 		}
 	} else {
 		BEESCOUNT(dedup_miss);
-		BEESLOGWARN("NO Dedup! " << brp);
+		BEESLOG("NO Dedup! " << brp);
 	}
 
 	return rv;
@@ -291,7 +281,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 		Extent::OBSCURED | Extent::PREALLOC
 	)) {
 		BEESCOUNT(scan_interesting);
-		BEESLOGWARN("Interesting extent flags " << e << " from fd " << name_fd(bfr.fd()));
+		BEESLOG("Interesting extent flags " << e << " from fd " << name_fd(bfr.fd()));
 	}
 
 	if (e.flags() & Extent::HOLE) {
@@ -303,10 +293,8 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 	if (e.flags() & Extent::PREALLOC) {
 		// Prealloc is all zero and we replace it with a hole.
 		// No special handling is required here.  Nuke it and move on.
-		BEESLOGINFO("prealloc extent " << e);
-		// Must not extend past EOF
-		auto extent_size = min(e.end(), bfr.file_size()) - e.begin();
-		BeesFileRange prealloc_bfr(m_ctx->tmpfile()->make_hole(extent_size));
+		BEESLOG("prealloc extent " << e);
+		BeesFileRange prealloc_bfr(m_ctx->tmpfile()->make_hole(e.size()));
 		BeesRangePair brp(prealloc_bfr, bfr);
 		// Raw dedup here - nothing else to do with this extent, nothing to merge with
 		if (m_ctx->dedup(brp)) {
@@ -319,7 +307,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 	}
 
 	// OK we need to read extent now
-	readahead(bfr.fd(), bfr.begin(), bfr.size());
+	posix_fadvise(bfr.fd(), bfr.begin(), bfr.size(), POSIX_FADV_WILLNEED);
 
 	map<off_t, pair<BeesHash, BeesAddress>> insert_map;
 	set<off_t> noinsert_set;
@@ -379,7 +367,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 				// Do not attempt to lookup hash of zero block
 				continue;
 			} else {
-				BEESLOGINFO("zero bbd " << bbd << "\n\tin extent " << e);
+				BEESLOG("zero bbd " << bbd << "\n\tin extent " << e);
 				BEESCOUNT(scan_zero_uncompressed);
 				rewrite_extent = true;
 				break;
@@ -436,7 +424,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 
 			// Hash is toxic
 			if (found_addr.is_toxic()) {
-				BEESLOGWARN("WORKAROUND: abandoned toxic match for hash " << hash << " addr " << found_addr << " matching bbd " << bbd);
+				BEESINFO("WORKAROUND: abandoned toxic match for hash " << hash << " addr " << found_addr);
 				// Don't push these back in because we'll never delete them.
 				// Extents may become non-toxic so give them a chance to expire.
 				// hash_table->push_front_hash_addr(hash, found_addr);
@@ -453,7 +441,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 				BeesResolver resolved(m_ctx, found_addr);
 				// Toxic extents are really toxic
 				if (resolved.is_toxic()) {
-					BEESLOGWARN("WORKAROUND: discovered toxic match at found_addr " << found_addr << " matching bbd " << bbd);
+					BEESINFO("WORKAROUND: abandoned toxic match at found_addr " << found_addr << " matching bbd " << bbd);
 					BEESCOUNT(scan_toxic_match);
 					// Make sure we never see this hash again.
 					// It has become toxic since it was inserted into the hash table.
@@ -495,8 +483,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 
 			BeesAddress last_replaced_addr;
 			for (auto it = resolved_addrs.begin(); it != resolved_addrs.end(); ++it) {
-				// FIXME:  Need to terminate this loop on replace_dst exception condition
-				// catch_all([&]() {
+				catch_all([&]() {
 					auto it_copy = *it;
 					BEESNOTE("finding one match (out of " << it_copy.count() << ") at " << it_copy.addr() << " for " << bbd);
 					BEESTRACE("finding one match (out of " << it_copy.count() << ") at " << it_copy.addr() << " for " << bbd);
@@ -508,7 +495,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 					if (it_copy.found_hash()) {
 						BEESCOUNT(scan_hash_hit);
 					} else {
-						// BEESLOGDEBUG("erase src hash " << hash << " addr " << it_copy.addr());
+						// BEESINFO("erase src hash " << hash << " addr " << it_copy.addr());
 						BEESCOUNT(scan_hash_miss);
 						hash_table->erase_hash_addr(hash, it_copy.addr());
 					}
@@ -519,7 +506,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 						// FIXME:  we will thrash if we let multiple references to identical blocks
 						// exist in the hash table.  Erase all but the last one.
 						if (last_replaced_addr) {
-							BEESLOGINFO("Erasing redundant hash " << hash << " addr " << last_replaced_addr);
+							BEESLOG("Erasing redundant hash " << hash << " addr " << last_replaced_addr);
 							hash_table->erase_hash_addr(hash, last_replaced_addr);
 							BEESCOUNT(scan_erase_redundant);
 						}
@@ -548,7 +535,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 					} else {
 						BEESCOUNT(scan_dup_miss);
 					}
-				// });
+				});
 			}
 			if (last_replaced_addr) {
 				// If we replaced extents containing the incoming addr,
@@ -681,7 +668,7 @@ BeesContext::scan_one_extent(const BeesFileRange &bfr, const Extent &e)
 
 	// Visualize
 	if (bar != string(block_count, '.')) {
-		BEESLOGINFO("scan: " << pretty(e.size()) << " " << to_hex(e.begin()) << " [" << bar << "] " << to_hex(e.end()) << ' ' << name_fd(bfr.fd()));
+		BEESLOG("scan: " << pretty(e.size()) << " " << to_hex(e.begin()) << " [" << bar << "] " << to_hex(e.end()) << ' ' << name_fd(bfr.fd()));
 	}
 
 	return bfr;
@@ -711,14 +698,14 @@ BeesContext::scan_forward(const BeesFileRange &bfr)
 
 	// No FD?  Well, that was quick.
 	if (!bfr.fd()) {
-		// BEESLOGINFO("No FD in " << root_path() << " for " << bfr);
+		BEESINFO("No FD in " << root_path() << " for " << bfr);
 		BEESCOUNT(scan_no_fd);
 		return bfr;
 	}
 
 	// Sanity check
 	if (bfr.begin() >= bfr.file_size()) {
-		BEESLOGWARN("past EOF: " << bfr);
+		BEESLOG("past EOF: " << bfr);
 		BEESCOUNT(scan_eof);
 		return bfr;
 	}
@@ -762,48 +749,24 @@ BeesResolveAddrResult::BeesResolveAddrResult()
 {
 }
 
-void
-BeesContext::wait_for_balance()
-{
-	Timer balance_timer;
-	BEESNOTE("WORKAROUND: waiting for balance to stop");
-	while (true) {
-		btrfs_ioctl_balance_args args;
-		memset_zero<btrfs_ioctl_balance_args>(&args);
-		const int ret = ioctl(root_fd(), BTRFS_IOC_BALANCE_PROGRESS, &args);
-		if (ret < 0) {
-			// Either can't get balance status or not running, exit either way
-			break;
-		}
-
-		if (!(args.state & BTRFS_BALANCE_STATE_RUNNING)) {
-			// Balance not running, doesn't matter if paused or cancelled
-			break;
-		}
-
-		BEESLOGDEBUG("WORKAROUND: Waiting " << balance_timer << "s for balance to stop");
-		sleep(BEES_BALANCE_POLL_INTERVAL);
-	}
-}
-
 BeesResolveAddrResult
 BeesContext::resolve_addr_uncached(BeesAddress addr)
 {
 	THROW_CHECK1(invalid_argument, addr, !addr.is_magic());
 	THROW_CHECK0(invalid_argument, !!root_fd());
 
-	// Is there a bug where resolve and balance cause a crash (BUG_ON at fs/btrfs/ctree.c:1227)?
-	// Apparently yes, and more than one.
-	// Wait for the balance to finish before we run LOGICAL_INO
-	wait_for_balance();
+	// To avoid hammering all the cores with long-running ioctls,
+	// only do one resolve at any given time.
+	BEESNOTE("waiting to resolve addr " << addr);
+	auto lock = bees_ioctl_lock_set.make_lock(gettid());
 
-	// Time how long this takes
 	Timer resolve_timer;
 
 	// There is no performance benefit if we restrict the buffer size.
         BtrfsIoctlLogicalInoArgs log_ino(addr.get_physical_or_zero());
 
 	{
+		BEESNOTE("resolving addr " << addr);
 		BEESTOOLONG("Resolving addr " << addr << " in " << root_path() << " refs " << log_ino.m_iors.size());
 		if (log_ino.do_ioctl_nothrow(root_fd())) {
 			BEESCOUNT(resolve_ok);
@@ -822,7 +785,7 @@ BeesContext::resolve_addr_uncached(BeesAddress addr)
 	if (rt_age < BEES_TOXIC_DURATION && log_ino.m_iors.size() < BEES_MAX_EXTENT_REF_COUNT) {
 		rv.m_is_toxic = false;
 	} else {
-		BEESLOGWARN("WORKAROUND: toxic address " << addr << " in " << root_path() << " with " << log_ino.m_iors.size() << " refs took " << rt_age << "s in LOGICAL_INO");
+		BEESLOG("WORKAROUND: toxic address " << addr << " in " << root_path() << " with " << log_ino.m_iors.size() << " refs took " << rt_age << "s in LOGICAL_INO");
 		BEESCOUNT(resolve_toxic);
 		rv.m_is_toxic = true;
 	}
@@ -847,7 +810,7 @@ void
 BeesContext::set_root_fd(Fd fd)
 {
 	uint64_t root_fd_treeid = btrfs_get_root_id(fd);
-	BEESLOGINFO("set_root_fd " << name_fd(fd));
+	BEESLOG("set_root_fd " << name_fd(fd));
 	BEESTRACE("set_root_fd " << name_fd(fd));
 	THROW_CHECK1(invalid_argument, root_fd_treeid, root_fd_treeid == BTRFS_FS_TREE_OBJECTID);
 	Stat st(fd);
@@ -856,11 +819,11 @@ BeesContext::set_root_fd(Fd fd)
 	BtrfsIoctlFsInfoArgs fsinfo;
 	fsinfo.do_ioctl(fd);
 	m_root_uuid = fsinfo.uuid();
-	BEESLOGINFO("Filesystem UUID is " << m_root_uuid);
+	BEESLOG("Filesystem UUID is " << m_root_uuid);
 
 	// 65536 is big enough for two max-sized extents.
 	// Need enough total space in the cache for the maximum number of active threads.
-	m_resolve_cache.max_size(65536);
+	m_resolve_cache.max_size(65536 * bees_worker_thread_count());
 	m_resolve_cache.func([&](BeesAddress addr) -> BeesResolveAddrResult {
 		return resolve_addr_uncached(addr);
 	});
@@ -868,13 +831,13 @@ BeesContext::set_root_fd(Fd fd)
 	// Start queue producers
 	roots();
 
-	BEESLOGINFO("returning from set_root_fd in " << name_fd(fd));
+	BEESLOG("returning from set_root_fd in " << name_fd(fd));
 }
 
 void
 BeesContext::blacklist_add(const BeesFileId &fid)
 {
-	BEESLOGDEBUG("Adding " << fid << " to blacklist");
+	BEESLOG("Adding " << fid << " to blacklist");
 	unique_lock<mutex> lock(m_blacklist_mutex);
 	m_blacklist.insert(fid);
 }
@@ -943,7 +906,7 @@ BeesContext::hash_table()
 void
 BeesContext::set_root_path(string path)
 {
-	BEESLOGINFO("set_root_path " << path);
+	BEESLOG("set_root_path " << path);
 	m_root_path = path;
 	set_root_fd(open_or_die(m_root_path, FLAGS_OPEN_DIR));
 }

src/bees-hash.cc

@@ -46,7 +46,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);
-			BEESLOGDEBUG("Bad hash table address hash " << to_hex(cell->e_hash) << " addr " << to_hex(cell->e_addr));
+			BEESINFO("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;
@@ -55,8 +55,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);
-			// BEESLOGDEBUG("Duplicate hash table entry:\nthis = " << *cell << "\nold = " << *seen_it.find(*cell));
-			BEESLOGDEBUG("Duplicate hash table entry: " << *cell);
+			// BEESLOG("Duplicate hash table entry:\nthis = " << *cell << "\nold = " << *seen_it.find(*cell));
+			BEESINFO("Duplicate hash table entry: " << *cell);
 			if (clear_bugs) {
 				cell->e_addr = 0;
 				cell->e_hash = 0;
@@ -185,8 +185,14 @@ percent(size_t num, size_t den)
 void
 BeesHashTable::prefetch_loop()
 {
-	bool not_locked = true;
-	while (true) {
+	// 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) {
 		size_t width = 64;
 		vector<size_t> occupancy(width, 0);
 		size_t occupied_count = 0;
@@ -197,11 +203,11 @@ BeesHashTable::prefetch_loop()
 		size_t unaligned_eof_count = 0;
 
 		for (uint64_t ext = 0; ext < m_extents; ++ext) {
-			BEESNOTE("prefetching hash table extent #" << ext << " of " << m_extents);
+			BEESNOTE("prefetching hash table extent " << ext << " of " << m_extents);
 			catch_all([&]() {
 				fetch_missing_extent_by_index(ext);
 
-				BEESNOTE("analyzing hash table extent #" << ext << " of " << m_extents);
+				BEESNOTE("analyzing hash table extent " << ext << " of " << m_extents);
 				bool duplicate_bugs_found = false;
 				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) {
@@ -269,7 +275,8 @@ BeesHashTable::prefetch_loop()
 			out << "\n";
 		}
 
-		size_t uncompressed_count = occupied_count - compressed_offset_count;
+		size_t uncompressed_count = occupied_count - compressed_count;
+		size_t legacy_count = compressed_count - compressed_offset_count;
 
 		ostringstream graph_blob;
 
@@ -280,7 +287,9 @@ BeesHashTable::prefetch_loop()
 		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) << ")\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"
 			<< "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) << ")";
@@ -295,24 +304,11 @@ BeesHashTable::prefetch_loop()
 		auto avg_rates = thisStats / m_ctx->total_timer().age();
 		graph_blob << "\t" << avg_rates << "\n";
 
-		BEESLOGINFO(graph_blob.str());
+		BEESLOG(graph_blob.str());
 		catch_all([&]() {
 			m_stats_file.write(graph_blob.str());
 		});
 
-		if (not_locked) {
-			// 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);
 	}
@@ -436,7 +432,7 @@ BeesHashTable::erase_hash_addr(HashType hash, AddrType addr)
 		BEESCOUNT(hash_erase);
 #if 0
 		if (verify_cell_range(er.first, er.second)) {
-			BEESLOGDEBUG("while erasing hash " << hash << " addr " << addr);
+			BEESINFO("while erasing hash " << hash << " addr " << addr);
 		}
 #endif
 	}
@@ -487,7 +483,7 @@ BeesHashTable::push_front_hash_addr(HashType hash, AddrType addr)
 	}
 #if 0
 	if (verify_cell_range(er.first, er.second)) {
-		BEESLOGDEBUG("while push_fronting hash " << hash << " addr " << addr);
+		BEESINFO("while push_fronting hash " << hash << " addr " << addr);
 	}
 #endif
 	return found;
@@ -588,9 +584,9 @@ BeesHashTable::try_mmap_flags(int flags)
 		THROW_CHECK1(out_of_range, m_size, m_size > 0);
 		Timer map_time;
 		catch_all([&]() {
-			BEESLOGINFO("mapping hash table size " << m_size << " with flags " << mmap_flags_ntoa(flags));
+			BEESLOG("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);
-			BEESLOGINFO("mmap done in " << map_time << " sec");
+			BEESLOG("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);
@@ -610,15 +606,12 @@ BeesHashTable::open_file()
 	// 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 << "'");
+		BEESLOGNOTE("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) << ")");
+		BEESLOGNOTE("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 << "'");
+		BEESLOGNOTE("truncating new hash table '" << tmp_filename << "' -> '" << m_filename << "'");
 		renameat_or_die(m_ctx->home_fd(), tmp_filename, m_ctx->home_fd(), m_filename);
 	}
 
@@ -662,13 +655,13 @@ BeesHashTable::BeesHashTable(shared_ptr<BeesContext> ctx, string filename, off_t
 	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);
+	BEESLOG("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;
-	BEESLOGINFO("\tcells " << m_cells << ", buckets " << m_buckets << ", extents " << m_extents);
+	BEESLOG("\tcells " << m_cells << ", buckets " << m_buckets << ", extents " << m_extents);
 
-	BEESLOGINFO("\tflush rate limit " << BEES_FLUSH_RATE);
+	BEESLOG("\tflush rate limit " << BEES_FLUSH_RATE);
 
 	// Try to mmap that much memory
 	try_mmap_flags(MAP_PRIVATE | MAP_ANONYMOUS);
@@ -696,7 +689,7 @@ BeesHashTable::BeesHashTable(shared_ptr<BeesContext> ctx, string filename, off_t
 	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)");
+			BEESLOG("madvise(..., " << fp->name << "): " << strerror(errno) << " (ignored)");
 		}
 	}
 

src/bees-resolve.cc

@@ -98,77 +98,90 @@ BeesResolver::adjust_offset(const BeesFileRange &haystack, const BeesBlockData &
 		return BeesBlockData();
 	}
 
-	off_t haystack_offset = haystack.begin();
+	off_t lower_offset = haystack.begin();
+	off_t upper_offset = haystack.end();
 	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);
 		Extent e = ew.current();
-		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();
+		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;
 		}
-		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 << " offset " << to_hex(haystack_offset));
+	BEESTRACE("Checking haystack " << haystack << " offsets " << to_hex(lower_offset) << ".." << to_hex(upper_offset));
 
 	// Check all the blocks in the list
-	THROW_CHECK1(out_of_range, haystack_offset, (haystack_offset & BLOCK_MASK_CLONE) == 0);
+	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);
 
-	// Straw cannot extend beyond end of haystack
-	if (haystack_offset + needle.size() > haystack_size) {
-		BEESCOUNT(adjust_needle_too_long);
-		return BeesBlockData();
-	}
+		// 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());
+		// 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);
+		BEESTRACE("straw = " << straw);
 
-	// Stop if we find a match
-	if (straw.is_data_equal(needle)) {
-		BEESCOUNT(adjust_hit);
-		m_found_data = true;
+		// 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;
-		if (is_compressed_offset) BEESCOUNT(adjust_compressed_offset_correct);
-		if (is_exact) BEESCOUNT(adjust_exact_correct);
-		return straw;
+		BEESLOG("HASH COLLISION\n"
+			<< "\tneedle " << needle << "\n"
+			<< "\tstraw " << straw);
+		BEESCOUNT(hash_collision);
 	}
 
-	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;
-	BEESLOGINFO("HASH COLLISION\n"
-		<< "\tneedle " << needle << "\n"
-		<< "\tstraw " << straw);
-	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();
@@ -184,7 +197,7 @@ 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) {
 		// Deleted snapshots generate craptons of these
-		// BEESLOGDEBUG("No FD in chase_extent_ref " << bior);
+		// BEESINFO("No FD in chase_extent_ref " << bior);
 		BEESCOUNT(chase_no_fd);
 		return BeesFileRange();
 	}
@@ -198,7 +211,7 @@ BeesResolver::chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &
 
 	// ...or are we?
 	if (file_addr.is_magic()) {
-		BEESLOGDEBUG("file_addr is magic: file_addr = " << file_addr << " bior = " << bior << " needle_bbd = " << needle_bbd);
+		BEESINFO("file_addr is magic: file_addr = " << file_addr << " bior = " << bior << " needle_bbd = " << needle_bbd);
 		BEESCOUNT(chase_wrong_magic);
 		return BeesFileRange();
 	}
@@ -207,7 +220,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()) {
-		// BEESLOGDEBUG("found addr " << file_addr << " at " << name_fd(file_fd) << " offset " << to_hex(bior.m_offset) << " but looking for " << m_addr);
+		// BEESINFO("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();
@@ -230,7 +243,7 @@ BeesResolver::chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &
 	auto new_bbd = adjust_offset(haystack_bbd, needle_bbd);
 	if (new_bbd.empty()) {
 		// matching offset search failed
-		BEESCOUNT(chase_no_data);
+		BEESCOUNT(chase_wrong_data);
 		return BeesFileRange();
 	}
 	if (new_bbd.begin() == haystack_bbd.begin()) {
@@ -355,8 +368,7 @@ BeesResolver::for_each_extent_ref(BeesBlockData bbd, function<bool(const BeesFil
 		}
 
 		// Look at the old data
-		// FIXME:  propagate exceptions for now.  Proper fix requires a rewrite.
-		// catch_all([&]() {
+		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?
@@ -371,7 +383,7 @@ BeesResolver::for_each_extent_ref(BeesBlockData bbd, function<bool(const BeesFil
 				// to a different extent between them.
 				// stop_now = true;
 			}
-		// });
+		});
 
 		if (stop_now) {
 			break;
@@ -412,8 +424,7 @@ 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);
-			// stop looping here, all the other srcs will probably fail this test too
-			throw runtime_error("FIXME: bailing out here, need to fix this further up the call stack");
+			return false; // i.e. continue
 		}
 
 		// Make pair(src, dst)

src/bees-thread.cc

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

src/bees-types.cc

@@ -160,8 +160,7 @@ BeesFileRange::file_size() const
 		// 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.
-		// Well, OK, but we call this function from exception handlers...
-		THROW_CHECK1(invalid_argument, m_file_size, m_file_size >= 0);
+		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;
@@ -369,7 +368,6 @@ 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);
@@ -386,8 +384,8 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 	BEESTRACE("e_second " << e_second);
 
 	// Preread entire extent
-	readahead(second.fd(), e_second.begin(), e_second.size());
-	readahead(first.fd(), e_second.begin() + first.begin() - second.begin(), e_second.size());
+	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);
 
 	auto hash_table = ctx->hash_table();
 
@@ -406,7 +404,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 				BEESCOUNT(pairbackward_hole);
 				break;
 			}
-			readahead(second.fd(), e_second.begin(), e_second.size());
+			posix_fadvise(second.fd(), e_second.begin(), e_second.size(), POSIX_FADV_WILLNEED);
 #else
 			// This tends to repeatedly process extents that were recently processed.
 			// We tend to catch duplicate blocks early since we scan them forwards.
@@ -430,7 +428,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()) {
-				BEESLOGWARN("WORKAROUND: not growing matching pair backward because src addr is toxic:\n" << *this);
+				BEESLOG("WORKAROUND: not growing matching pair backward because src addr is toxic:\n" << *this);
 				BEESCOUNT(pairbackward_toxic_addr);
 				break;
 			}
@@ -486,7 +484,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 			}
 		}
 		if (found_toxic) {
-			BEESLOGWARN("WORKAROUND: found toxic hash in " << first_bbd << " while extending backward:\n" << *this);
+			BEESLOG("WORKAROUND: found toxic hash in " << first_bbd << " while extending backward:\n" << *this);
 			BEESCOUNT(pairbackward_toxic_hash);
 			break;
 		}
@@ -498,11 +496,9 @@ 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) {
@@ -515,7 +511,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 				BEESCOUNT(pairforward_hole);
 				break;
 			}
-			readahead(second.fd(), e_second.begin(), e_second.size());
+			posix_fadvise(second.fd(), e_second.begin(), e_second.size(), POSIX_FADV_WILLNEED);
 		}
 		BEESCOUNT(pairforward_try);
 
@@ -533,7 +529,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()) {
-				BEESLOGWARN("WORKAROUND: not growing matching pair forward because src is toxic:\n" << *this);
+				BEESLOG("WORKAROUND: not growing matching pair forward because src is toxic:\n" << *this);
 				BEESCOUNT(pairforward_toxic);
 				break;
 			}
@@ -597,7 +593,7 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 			}
 		}
 		if (found_toxic) {
-			BEESLOGWARN("WORKAROUND: found toxic hash in " << first_bbd << " while extending forward:\n" << *this);
+			BEESLOG("WORKAROUND: found toxic hash in " << first_bbd << " while extending forward:\n" << *this);
 			BEESCOUNT(pairforward_toxic_hash);
 			break;
 		}
@@ -616,7 +612,6 @@ BeesRangePair::grow(shared_ptr<BeesContext> ctx, bool constrained)
 	}
 
 	BEESCOUNT(pairforward_stop);
-	BEESCOUNTADD(pairforward_ms, grow_forward_timer.age() * 1000);
 	return rv;
 }
 
@@ -877,9 +872,6 @@ 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;
@@ -896,9 +888,6 @@ operator<<(ostream &os, const BeesBlockData &bbd)
 			}
 		}
 		os << "...'";
-#else
-		os << ", data[" << bbd.m_data.size() << "]";
-#endif
 	}
 	return os << " }";
 }
@@ -945,9 +934,9 @@ BeesBlockData::data() const
 		BEESTOOLONG("Reading BeesBlockData " << *this);
 		Timer read_timer;
 
-		Blob rv(size());
+		Blob rv(m_length);
 		pread_or_die(m_fd, rv, m_offset);
-		THROW_CHECK2(runtime_error, rv.size(), size(), ranged_cast<off_t>(rv.size()) == size());
+		THROW_CHECK2(runtime_error, rv.size(), m_length, ranged_cast<off_t>(rv.size()) == m_length);
 		m_data = rv;
 		BEESCOUNT(block_read);
 		BEESCOUNTADD(block_bytes, rv.size());

src/bees.cc

@@ -3,14 +3,12 @@
 #include "crucible/limits.h"
 #include "crucible/process.h"
 #include "crucible/string.h"
-#include "crucible/task.h"
 
 #include <cctype>
 #include <cmath>
 
 #include <iostream>
 #include <memory>
-#include <sstream>
 
 // PRIx64
 #include <inttypes.h>
@@ -30,12 +28,9 @@
 using namespace crucible;
 using namespace std;
 
-int bees_log_level = 8;
-
-void
+int
 do_cmd_help(char *argv[])
 {
-	// 80col 01234567890123456789012345678901234567890123456789012345678901234567890123456789
 	cerr << "Usage: " << argv[0] << " [options] fs-root-path [fs-root-path-2...]\n"
 		"Performs best-effort extent-same deduplication on btrfs.\n"
 		"\n"
@@ -43,40 +38,27 @@ do_cmd_help(char *argv[])
 		"Other directories will be rejected.\n"
 		"\n"
 		"Options:\n"
-		"    -h, --help            Show this help\n"
-		"\n"
-		"Load management options:\n"
-		"    -c, --thread-count    Worker thread count (default CPU count * factor)\n"
-		"    -C, --thread-factor   Worker thread factor (default " << BEES_DEFAULT_THREAD_FACTOR << ")\n"
-		"    -G, --thread-min      Minimum worker thread count (default 0)\n"
-		"    -g, --loadavg-target  Target load average for worker threads (default none)\n"
-		"\n"
-		"Filesystem tree traversal options:\n"
-		"    -m, --scan-mode       Scanning mode (0..2, default 0)\n"
-		"\n"
-		"Workarounds:\n"
-		"    -a, --workaround-btrfs-send    Workaround for btrfs send\n"
-		"\n"
-		"Logging options:\n"
-		"    -t, --timestamps      Show timestamps in log output (default)\n"
-		"    -T, --no-timestamps   Omit timestamps in log output\n"
-		"    -p, --absolute-paths  Show absolute paths (default)\n"
-		"    -P, --strip-paths     Strip $CWD from beginning of all paths in the log\n"
-		"    -v, --verbose         Set maximum log level (0..8, default 8)\n"
+		"\t-h, --help\t\tShow this help\n"
+		"\t-t, --timestamps\tShow timestamps in log output (default)\n"
+		"\t-T, --notimestamps\tOmit timestamps in log output\n"
+		"\t-p, --absolute-paths\tShow absolute paths (default)\n"
+		"\t-P, --relative-paths\tShow paths relative to $CWD\n"
 		"\n"
 		"Optional environment variables:\n"
-		"    BEESHOME    Path to hash table and configuration files\n"
-		"                (default is .beeshome/ in the root of each filesystem).\n"
+		"\tBEESHOME\tPath to hash table and configuration files\n"
+		"\t\t\t(default is .beeshome/ in the root of each filesystem).\n"
 		"\n"
-		"    BEESSTATUS  File to write status to (tmpfs recommended, e.g. /run).\n"
-		"                No status is written if this variable is unset.\n"
+		"\tBEESSTATUS\tFile to write status to (tmpfs recommended, e.g. /run).\n"
+		"\t\t\tNo status is written if this variable is unset.\n"
 		"\n"
-	// 80col 01234567890123456789012345678901234567890123456789012345678901234567890123456789
 	<< endl;
+	return 0;
 }
 
 // tracing ----------------------------------------
 
+RateLimiter bees_info_rate_limit(BEES_INFO_RATE, BEES_INFO_BURST);
+
 thread_local BeesTracer *BeesTracer::tl_next_tracer = nullptr;
 
 BeesTracer::~BeesTracer()
@@ -85,12 +67,12 @@ BeesTracer::~BeesTracer()
 		try {
 			m_func();
 		} catch (exception &e) {
-			BEESLOGERR("Nested exception: " << e.what());
+			BEESLOG("Nested exception: " << e.what());
 		} catch (...) {
-			BEESLOGERR("Nested exception ...");
+			BEESLOG("Nested exception ...");
 		}
 		if (!m_next_tracer) {
-			BEESLOGERR("---  END  TRACE --- exception ---");
+			BEESLOG("---  END  TRACE --- exception ---");
 		}
 	}
 	tl_next_tracer = m_next_tracer;
@@ -107,12 +89,12 @@ void
 BeesTracer::trace_now()
 {
 	BeesTracer *tp = tl_next_tracer;
-	BEESLOGERR("--- BEGIN TRACE ---");
+	BEESLOG("--- BEGIN TRACE ---");
 	while (tp) {
 		tp->m_func();
 		tp = tp->m_next_tracer;
 	}
-	BEESLOGERR("---  END  TRACE ---");
+	BEESLOG("---  END  TRACE ---");
 }
 
 thread_local BeesNote *BeesNote::tl_next = nullptr;
@@ -125,62 +107,36 @@ BeesNote::~BeesNote()
 	tl_next = m_prev;
 	unique_lock<mutex> lock(s_mutex);
 	if (tl_next) {
-		s_status[crucible::gettid()] = tl_next;
+		s_status[gettid()] = tl_next;
 	} else {
-		s_status.erase(crucible::gettid());
+		s_status.erase(gettid());
 	}
 }
 
 BeesNote::BeesNote(function<void(ostream &os)> f) :
 	m_func(f)
 {
-	m_name = get_name();
+	m_name = tl_name;
 	m_prev = tl_next;
 	tl_next = this;
 	unique_lock<mutex> lock(s_mutex);
-	s_status[crucible::gettid()] = tl_next;
+	s_status[gettid()] = tl_next;
 }
 
 void
 BeesNote::set_name(const string &name)
 {
 	tl_name = name;
-	catch_all([&]() {
-		DIE_IF_MINUS_ERRNO(pthread_setname_np(pthread_self(), name.c_str()));
-	});
 }
 
 string
 BeesNote::get_name()
 {
-	// Use explicit name if given
-	if (!tl_name.empty()) {
+	if (tl_name.empty()) {
+		return "bees";
+	} else {
 		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.
-	char buf[24];
-	memset(buf, '\0', sizeof(buf));
-	int err = pthread_getname_np(pthread_self(), buf, sizeof(buf));
-	if (err) {
-		return string("pthread_getname_np: ") + strerror(err);
-	}
-	buf[sizeof(buf) - 1] = '\0';
-
-	// thread_getname_np returns process name
-	// ...by default?  ...for the main thread?
-	// ...except during exception handling?
-	// ...randomly?
-	return buf;
 }
 
 BeesNote::ThreadStatusMap
@@ -204,6 +160,20 @@ BeesNote::get_status()
 
 // 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)
 {
@@ -247,6 +217,13 @@ operator<<(ostream &os, const BeesStatTmpl<T> &bs)
 
 // other ----------------------------------------
 
+/**
+ * Don't allow two threads to use some btrfs ioctls at the same time.
+ * Some of them consume egregious amounts of kernel CPU time and are
+ * not interruptible, so if we have more threads than cores we will
+ * effectively crash the kernel. */
+LockSet<pid_t> bees_ioctl_lock_set;
+
 template <class T>
 T&
 BeesStatTmpl<T>::at(string idx)
@@ -362,7 +339,7 @@ BeesTooLong::check() const
 	if (age() > m_limit) {
 		ostringstream oss;
 		m_func(oss);
-		BEESLOGWARN("PERFORMANCE: " << *this << " sec: " << oss.str());
+		BEESLOG("PERFORMANCE: " << *this << " sec: " << oss.str());
 	}
 }
 
@@ -394,7 +371,7 @@ BeesStringFile::BeesStringFile(Fd dir_fd, string name, size_t limit) :
 	m_name(name),
 	m_limit(limit)
 {
-	BEESLOGINFO("BeesStringFile " << name_fd(m_dir_fd) << "/" << m_name << " max size " << pretty(m_limit));
+	BEESLOG("BeesStringFile " << name_fd(m_dir_fd) << "/" << m_name << " max size " << pretty(m_limit));
 }
 
 void
@@ -446,12 +423,6 @@ BeesStringFile::write(string contents)
 		// This triggers too many btrfs bugs.  I wish I was kidding.
 		// Forget snapshots, balance, compression, and dedup:
 		// 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
@@ -527,7 +498,7 @@ void
 BeesTempFile::realign()
 {
 	if (m_end_offset > BLOCK_SIZE_MAX_TEMP_FILE) {
-		BEESLOGINFO("temporary file size " << to_hex(m_end_offset) << " > max " << 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();
 	}
@@ -561,7 +532,7 @@ BeesTempFile::make_hole(off_t count)
 BeesFileRange
 BeesTempFile::make_copy(const BeesFileRange &src)
 {
-	BEESLOGINFO("copy: " << src);
+	BEESLOG("copy: " << src);
 	BEESNOTE("Copying " << src);
 	BEESTRACE("Copying " << src);
 
@@ -612,11 +583,9 @@ BeesTempFile::make_copy(const BeesFileRange &src)
 
 	// We seem to get lockups without this!
 	if (did_block_write) {
-#if 0
+#if 1
 		// Is this fixed by "Btrfs: fix deadlock between dedup on same file and starting writeback"?
 		// No.
-		// Is this fixed in kernel 4.14.34?
-		// No.
 		bees_sync(m_fd);
 #endif
 	}
@@ -625,140 +594,82 @@ BeesTempFile::make_copy(const BeesFileRange &src)
 	return rv;
 }
 
+unsigned
+bees_worker_thread_count()
+{
+	// Maybe # of cores * (scalar from 0.25..4)?
+	return max(1U, thread::hardware_concurrency() * 4);
+}
+
 int
 bees_main(int argc, char *argv[])
 {
 	set_catch_explainer([&](string s) {
-		BEESLOGERR("\n\n*** EXCEPTION ***\n\t" << s << "\n***\n");
+		BEESLOG("\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");
+	BeesNote::set_name("main");
+
+	list<shared_ptr<BeesContext>> all_contexts;
+	shared_ptr<BeesContext> bc;
 
 	THROW_CHECK1(invalid_argument, argc, argc >= 0);
 
-	// Create a context so we can apply configuration to it
-	shared_ptr<BeesContext> bc = make_shared<BeesContext>();
-
 	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_ZERO;
-
-	// 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 += ':';
-		}
-	}
 
 	// Parse options
 	int c;
-	while (true) {
+	while (1) {
 		int option_index = 0;
+		static struct option long_options[] = {
+			{ "timestamps",     no_argument, NULL, 't' },
+			{ "notimestamps",   no_argument, NULL, 'T' },
+			{ "absolute-paths", no_argument, NULL, 'p' },
+			{ "relative-paths", no_argument, NULL, 'P' },
+			{ "help",           no_argument, NULL, 'h' }
+		};
 
-		c = getopt_long(argc, argv, getopt_list.c_str(), long_options, &option_index);
+		c = getopt_long(argc, argv, "TtPph", long_options, &option_index);
 		if (-1 == c) {
 			break;
 		}
 
 		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);
-				}
+			case 'P':
+				crucible::set_relative_path(cwd);
+				break;
+			case 'p':
+				crucible::set_relative_path("");
 				break;
-
 			case 'h':
+				do_cmd_help(argv); // fallthrough
 			default:
-				do_cmd_help(argv);
-				return EXIT_FAILURE;
+				return 2;
 		}
 	}
 
-	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");
+		BEESLOG("using relative path " << relative_path() << "\n");
 	}
 
-	BEESLOGINFO("setting rlimit NOFILE to " << BEES_OPEN_FILE_LIMIT);
+	// There can be only one because we measure running time with it
+	// EXPERIMENT:  don't try this on kernels before v4.14
+	// bees_ioctl_lock_set.max_size(1);
+
+	BEESLOG("setting rlimit NOFILE to " << BEES_OPEN_FILE_LIMIT);
 
 	struct rlimit lim = {
 		.rlim_cur = BEES_OPEN_FILE_LIMIT,
@@ -766,43 +677,22 @@ bees_main(int argc, char *argv[])
 	};
 	int rv = setrlimit(RLIMIT_NOFILE, &lim);
 	if (rv) {
-		BEESLOGINFO("setrlimit(RLIMIT_NOFILE, { " << lim.rlim_cur << " }): " << strerror(errno));
+		BEESLOG("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 (thread_count > BEES_DEFAULT_THREAD_LIMIT) {
-			BEESLOGNOTICE("Limiting computed thread count to " << BEES_DEFAULT_THREAD_LIMIT);
-			BEESLOGNOTICE("Use --thread-count to override this limit");
-			thread_count = BEES_DEFAULT_THREAD_LIMIT;
-		}
+	// Create a context and start crawlers
+	bool did_subscription = false;
+	while (optind < argc) {
+		catch_all([&]() {
+			bc = make_shared<BeesContext>(bc);
+			bc->set_root_path(argv[optind++]);
+			did_subscription = true;
+		});
 	}
 
-	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);
+	if (!did_subscription) {
+		BEESLOG("WARNING: no filesystems added");
 	}
-	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);
 
 	BeesThread status_thread("status", [&]() {
 		bc->dump_status();
@@ -812,7 +702,7 @@ bees_main(int argc, char *argv[])
 	bc->show_progress();
 
 	// That is all.
-	return EXIT_SUCCESS;
+	return 0;
 }
 
 int
@@ -822,7 +712,7 @@ main(int argc, char *argv[])
 
 	if (argc < 2) {
 		do_cmd_help(argv);
-		return EXIT_FAILURE;
+		return 2;
 	}
 
 	int rv = 1;

src/bees.h

@@ -8,18 +8,17 @@
 #include "crucible/fd.h"
 #include "crucible/fs.h"
 #include "crucible/lockset.h"
-#include "crucible/progress.h"
 #include "crucible/time.h"
-#include "crucible/task.h"
+#include "crucible/timequeue.h"
+#include "crucible/workqueue.h"
 
-#include <atomic>
+#include <array>
 #include <functional>
 #include <list>
 #include <mutex>
 #include <string>
 #include <thread>
 
-#include <syslog.h>
 #include <endian.h>
 
 using namespace crucible;
@@ -61,8 +60,11 @@ const off_t BLOCK_SIZE_HASHTAB_EXTENT = 16 * 1024 * 1024;
 // Bytes per second we want to flush (8GB every two hours)
 const double BEES_FLUSH_RATE = 8.0 * 1024 * 1024 * 1024 / 7200.0;
 
-// Interval between writing crawl state to disk
-const int BEES_WRITEBACK_INTERVAL = 900;
+// How long we should wait for new btrfs transactions
+const double BEES_COMMIT_INTERVAL = 900;
+
+// Interval between writing non-hash-table things to disk, and starting new subvol crawlers
+const int BEES_WRITEBACK_INTERVAL = BEES_COMMIT_INTERVAL;
 
 // Statistics reports while scanning
 const int BEES_STATS_INTERVAL = 3600;
@@ -82,44 +84,35 @@ 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;
-
-// Don't use more than this number of threads unless explicitly configured
-const size_t BEES_DEFAULT_THREAD_LIMIT = 8;
+// Worker thread limit (more threads may be created, but only this number will be active concurrently)
+const size_t BEES_WORKER_THREAD_LIMIT = 128;
 
 // Log warnings when an operation takes too long
-const double BEES_TOO_LONG = 5.0;
+const double BEES_TOO_LONG = 2.5;
 
 // Avoid any extent where LOGICAL_INO takes this long
-const double BEES_TOXIC_DURATION = 9.9;
+// const double BEES_TOXIC_DURATION = 9.9;
 // EXPERIMENT:  Kernel v4.14+ may let us ignore toxicity
-// NOPE:  kernel 4.14 has the same toxicity problems as any previous kernel
-// const double BEES_TOXIC_DURATION = 99.9;
+const double BEES_TOXIC_DURATION = BEES_COMMIT_INTERVAL;
 
 // How long between hash table histograms
 const double BEES_HASH_TABLE_ANALYZE_INTERVAL = BEES_STATS_INTERVAL;
 
-// Stop growing the work queue after we have this many tasks queued
-const size_t BEES_MAX_QUEUE_SIZE = 128;
+// Rate limiting of informational messages
+const double BEES_INFO_RATE = 10.0;
+const double BEES_INFO_BURST = 1.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 = 1024;
 
-// Insert this many items before switching to a new subvol
-const size_t BEES_MAX_CRAWL_BATCH = 128;
-
-// Wait this many transids between crawls
-const size_t BEES_TRANSID_FACTOR = 10;
-
 // 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;
 
-// Wait this long for a balance to stop
-const double BEES_BALANCE_POLL_INTERVAL = 60.0;
-
 // Flags
 const int FLAGS_OPEN_COMMON   = O_NOFOLLOW | O_NONBLOCK | O_CLOEXEC | O_NOATIME | O_LARGEFILE | O_NOCTTY;
 const int FLAGS_OPEN_DIR      = FLAGS_OPEN_COMMON | O_RDONLY | O_DIRECTORY;
@@ -133,18 +126,21 @@ const int FLAGS_OPEN_FANOTIFY = O_RDWR | O_NOATIME | O_CLOEXEC | O_LARGEFILE;
 
 // macros ----------------------------------------
 
-#define BEESLOG(lv,x)   do { if (lv < bees_log_level) { Chatter c(lv, BeesNote::get_name()); c << x; } } while (0)
-#define BEESLOGTRACE(x) do { BEESLOG(LOG_DEBUG, x); BeesTracer::trace_now(); } while (0)
+#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 BEESTRACE(x)   BeesTracer  SRSLY_WTF_C(beesTracer_,  __LINE__) ([&]()                 { BEESLOG(LOG_ERR, x);   })
+#define BEESTRACE(x)   BeesTracer  SRSLY_WTF_C(beesTracer_,  __LINE__) ([&]()                 { BEESLOG(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 BEESLOGNOTE(x) BEESLOG(x); BEESNOTE(x)
 
 #define BEESCOUNT(stat) do { \
 	BeesStats::s_global.add_count(#stat); \
@@ -173,7 +169,7 @@ public:
 	T at(string idx) const;
 
 friend ostream& operator<< <>(ostream &os, const BeesStatTmpl<T> &bs);
-friend struct BeesStats;
+friend class BeesStats;
 };
 
 using BeesRates = BeesStatTmpl<double>;
@@ -192,7 +188,7 @@ class BeesBlockData;
 class BeesTracer {
 	function<void()> m_func;
 	BeesTracer *m_next_tracer = 0;
-
+	
 	thread_local static BeesTracer *tl_next_tracer;
 public:
 	BeesTracer(function<void()> f);
@@ -506,64 +502,56 @@ class BeesCrawl {
 	mutex					m_mutex;
 	set<BeesFileRange>			m_extents;
 	bool					m_deferred = false;
-	bool					m_finished = false;
 
 	mutex					m_state_mutex;
-	ProgressTracker<BeesCrawlState>		m_state;
+	BeesCrawlState				m_state;
+
+	BeesThread				m_thread;
+	bool					m_stopped = false;
+	condition_variable			m_cond_stopped;
 
 	bool fetch_extents();
 	void fetch_extents_harder();
 	bool next_transid();
 
 public:
+	~BeesCrawl();
 	BeesCrawl(shared_ptr<BeesContext> ctx, BeesCrawlState initial_state);
 	BeesFileRange peek_front();
 	BeesFileRange pop_front();
-	ProgressTracker<BeesCrawlState>::ProgressHolder hold_state(const BeesFileRange &bfr);
-	BeesCrawlState get_state_begin();
-	BeesCrawlState get_state_end();
+	BeesCrawlState get_state();
 	void set_state(const BeesCrawlState &bcs);
-	void deferred(bool def_setting);
+	void crawl_thread();
 };
 
-class BeesRoots : public enable_shared_from_this<BeesRoots> {
+class BeesRoots {
 	shared_ptr<BeesContext>			m_ctx;
 
 	BeesStringFile				m_crawl_state_file;
 	map<uint64_t, shared_ptr<BeesCrawl>>	m_root_crawl_map;
 	mutex					m_mutex;
+	condition_variable			m_condvar;
 	bool					m_crawl_dirty = false;
 	Timer					m_crawl_timer;
-	BeesThread				m_crawl_thread;
 	BeesThread				m_writeback_thread;
-	RateEstimator				m_transid_re;
-	size_t					m_transid_factor = BEES_TRANSID_FACTOR;
-	Task					m_crawl_task;
-	bool					m_workaround_btrfs_send = false;
-	LRUCache<bool, uint64_t>		m_root_ro_cache;
+	LockSet<uint64_t>			m_lock_set;
 
 	void insert_new_crawl();
 	void insert_root(const BeesCrawlState &bcs);
 	Fd open_root_nocache(uint64_t root);
 	Fd open_root_ino_nocache(uint64_t root, uint64_t ino);
-	bool is_root_ro_nocache(uint64_t root);
 	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();
-	bool crawl_roots();
+	void 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();
-	size_t crawl_batch(shared_ptr<BeesCrawl> crawl);
-	void clear_caches();
 
 friend class BeesFdCache;
 friend class BeesCrawl;
@@ -573,24 +561,7 @@ public:
 	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:  think of better names for these.
-	// or TODO:  do extent-tree scans instead
-	enum ScanMode {
-		SCAN_MODE_ZERO,
-		SCAN_MODE_ONE,
-		SCAN_MODE_TWO,
-		SCAN_MODE_COUNT, // must be last
-	};
-
-	void set_scan_mode(ScanMode new_mode);
-	void set_workaround_btrfs_send(bool do_avoid);
-
-private:
-	ScanMode m_scan_mode = SCAN_MODE_ZERO;
-	static string scan_mode_ntoa(ScanMode new_mode);
-
+	LockSet<uint64_t> &lock_set() { return m_lock_set; }
 };
 
 struct BeesHash {
@@ -602,13 +573,13 @@ struct BeesHash {
 	BeesHash& operator=(const Type that) { m_hash = that; return *this; }
 private:
 	Type	m_hash;
-
+	
 };
 
 ostream & operator<<(ostream &os, const BeesHash &bh);
 
 class BeesBlockData {
-	using Blob = vector<uint8_t>;
+	using Blob = vector<char>;
 
 	mutable Fd		m_fd;
 	off_t			m_offset;
@@ -680,7 +651,6 @@ public:
 	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);
-	void clear();
 };
 
 struct BeesResolveAddrResult {
@@ -714,12 +684,11 @@ class BeesContext : public enable_shared_from_this<BeesContext> {
 
 	Timer						m_total_timer;
 
-	LockSet<uint64_t>				m_extent_lock_set;
+	LockSet<uint64_t>			m_extent_lock_set;
 
 	void set_root_fd(Fd fd);
 
 	BeesResolveAddrResult resolve_addr_uncached(BeesAddress addr);
-	void wait_for_balance();
 
 	BeesFileRange scan_one_extent(const BeesFileRange &bfr, const Extent &e);
 	void rewrite_file_range(const BeesFileRange &bfr);
@@ -736,7 +705,6 @@ public:
 
 	BeesFileRange scan_forward(const BeesFileRange &bfr);
 
-	bool is_root_ro(uint64_t root);
 	BeesRangePair dup_extent(const BeesFileRange &src);
 	bool dedup(const BeesRangePair &brp);
 
@@ -838,10 +806,12 @@ public:
 };
 
 // And now, a giant pile of extern declarations
-extern int bees_log_level;
 extern const char *BEES_VERSION;
 string pretty(double d);
+extern RateLimiter bees_info_rate_limit;
 void bees_sync(int fd);
 string format_time(time_t t);
+extern LockSet<pid_t> bees_ioctl_lock_set;
+extern unsigned bees_worker_thread_count();
 
 #endif

test/Makefile

@@ -5,40 +5,30 @@ PROGRAMS = \
 	limits \
 	path \
 	process \
-	progress \
-	task \
 
 all: test
 
-test: $(PROGRAMS:%=%.txt) Makefile
-FORCE:
+test: $(PROGRAMS)
+	set -x; for prog in $(PROGRAMS); do ./$$prog || exit 1; done
 
 include ../makeflags
--include ../localconf
 
-LIBS = -lcrucible -lpthread
+LIBS = -lcrucible
 LDFLAGS = -L../lib -Wl,-rpath=$(shell realpath ../lib)
 
-.depends/%.dep: %.cc tests.h Makefile
-	@mkdir -p .depends
-	$(CXX) $(CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
+depends.mk: *.cc
+	for x in *.cc; do $(CXX) $(CXXFLAGS) -M "$$x"; done >> depends.mk.new
+	mv -fv depends.mk.new depends.mk
 
-depends.mk: $(PROGRAMS:%=.depends/%.dep)
-	cat $^ > $@.new
-	mv -f $@.new $@
+-include depends.mk
 
-include depends.mk
+%.o: %.cc %.h ../makeflags
+	-echo "Implicit rule %.o: %.cc" >&2
+	$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-%.o: %.cc %.h ../makeflags Makefile
-	@echo "Implicit rule %.o: %.cc"
-	$(CXX) $(CXXFLAGS) -o $@ -c $<
-
-$(PROGRAMS): %: %.o ../makeflags Makefile
-	@echo "Implicit rule %: %.o"
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-
-%.txt: % Makefile FORCE
-	./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
+%: %.o ../makeflags
+	-echo "Implicit rule %: %.o" >&2
+	$(CXX) $(CXXFLAGS) -o "$@" "$<" $(LDFLAGS) $(LIBS)
 
 clean:
-	rm -fv $(PROGRAMS:%=%.o) $(PROGRAMS:%=%.txt) $(PROGRAMS)
+	-rm -fv *.o

test/chatter.cc

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

test/progress.cc

@@ -1,40 +0,0 @@
-#include "tests.h"
-
-#include "crucible/progress.h"
-
-#include <cassert>
-
-#include <unistd.h>
-
-using namespace crucible;
-using namespace std;
-
-void
-test_progress()
-{
-	ProgressTracker<uint64_t> pt(123);
-	auto hold = pt.hold(234);
-	auto hold2 = pt.hold(345);
-	assert(pt.begin() == 123);
-	assert(pt.end() == 345);
-	auto hold3 = pt.hold(456);
-	assert(pt.begin() == 123);
-	assert(pt.end() == 456);
-	hold2.reset();
-	assert(pt.begin() == 123);
-	assert(pt.end() == 456);
-	hold.reset();
-	assert(pt.begin() == 345);
-	assert(pt.end() == 456);
-	hold3.reset();
-	assert(pt.begin() == 456);
-	assert(pt.end() == 456);
-}
-
-int
-main(int, char**)
-{
-	RUN_A_TEST(test_progress());
-
-	exit(EXIT_SUCCESS);
-}

test/task.cc

@@ -1,227 +0,0 @@
-#include "tests.h"
-
-#include "crucible/task.h"
-#include "crucible/time.h"
-
-#include <cassert>
-#include <condition_variable>
-#include <mutex>
-#include <sstream>
-#include <vector>
-
-#include <unistd.h>
-
-using namespace crucible;
-using namespace std;
-
-void
-test_tasks(size_t count)
-{
-	TaskMaster::set_thread_count();
-
-	vector<bool> task_done(count, false);
-
-	mutex mtx;
-	condition_variable cv;
-
-	unique_lock<mutex> lock(mtx);
-
-	// Run several tasks in parallel
-	for (size_t c = 0; c < count; ++c) {
-		ostringstream oss;
-		oss << "task #" << c;
-		Task t(
-			oss.str(),
-			[c, &task_done, &mtx, &cv]() {
-				unique_lock<mutex> lock(mtx);
-				// cerr << "Task #" << c << endl;
-				task_done.at(c) = true;
-				cv.notify_one();
-			}
-		);
-		t.run();
-	}
-
-	// Get current status
-	ostringstream oss;
-	TaskMaster::print_queue(oss);
-	TaskMaster::print_workers(oss);
-
-	while (true) {
-		size_t tasks_done = 0;
-		for (auto i : task_done) {
-			if (i) {
-				++tasks_done;
-			}
-		}
-		if (tasks_done == count) {
-			return;
-		}
-		// cerr << "Tasks done: " << tasks_done << endl;
-
-		cv.wait(lock);
-	}
-}
-
-void
-test_finish()
-{
-	ostringstream oss;
-	TaskMaster::print_queue(oss);
-	TaskMaster::print_workers(oss);
-	TaskMaster::set_thread_count(0);
-	// cerr << "finish done" << endl;
-}
-
-void
-test_unfinish()
-{
-	TaskMaster::set_thread_count();
-}
-
-
-void
-test_barrier(size_t count)
-{
-	vector<bool> task_done(count, false);
-
-	mutex mtx;
-	condition_variable cv;
-
-	unique_lock<mutex> lock(mtx);
-
-	auto b = make_shared<Barrier>();
-
-	// Run several tasks in parallel
-	for (size_t c = 0; c < count; ++c) {
-		auto bl = b->lock();
-		ostringstream oss;
-		oss << "task #" << c;
-		Task t(
-			oss.str(),
-			[c, &task_done, &mtx, bl]() mutable {
-				// cerr << "Task #" << c << endl;
-				unique_lock<mutex> lock(mtx);
-				task_done.at(c) = true;
-				bl.release();
-			}
-		);
-		t.run();
-	}
-
-	// Get current status
-	ostringstream oss;
-	TaskMaster::print_queue(oss);
-	TaskMaster::print_workers(oss);
-
-	bool done_flag = false;
-
-	Task completed(
-		"Waiting for Barrier",
-		[&mtx, &cv, &done_flag]() {
-			unique_lock<mutex> lock(mtx);
-			// cerr << "Running cv notify" << endl;
-			done_flag = true;
-			cv.notify_all();
-		}
-	);
-	b->insert_task(completed);
-
-	b.reset();
-
-	while (true) {
-		size_t tasks_done = 0;
-		for (auto i : task_done) {
-			if (i) {
-				++tasks_done;
-			}
-		}
-		// cerr << "Tasks done: " << tasks_done << " done_flag " << done_flag << endl;
-		if (tasks_done == count && done_flag) {
-			break;
-		}
-
-		cv.wait(lock);
-	}
-	// cerr << "test_barrier return" << endl;
-}
-
-void
-test_exclusion(size_t count)
-{
-	mutex only_one;
-	Exclusion excl;
-
-	mutex mtx;
-	condition_variable cv;
-
-	unique_lock<mutex> lock(mtx);
-
-	auto b = make_shared<Barrier>();
-
-	// Run several tasks in parallel
-	for (size_t c = 0; c < count; ++c) {
-		auto bl = b->lock();
-		ostringstream oss;
-		oss << "task #" << c;
-		Task t(
-			oss.str(),
-			[c, &only_one, &excl, bl]() mutable {
-				// cerr << "Task #" << c << endl;
-				(void)c;
-				auto lock = excl.try_lock();
-				if (!lock) {
-					excl.insert_task(Task::current_task());
-					return;
-				}
-				bool locked = only_one.try_lock();
-				assert(locked);
-				nanosleep(0.0001);
-				only_one.unlock();
-				bl.release();
-			}
-		);
-		t.run();
-	}
-
-	bool done_flag = false;
-
-	Task completed(
-		"Waiting for Barrier",
-		[&mtx, &cv, &done_flag]() {
-			unique_lock<mutex> lock(mtx);
-			// cerr << "Running cv notify" << endl;
-			done_flag = true;
-			cv.notify_all();
-		}
-	);
-	b->insert_task(completed);
-
-	b.reset();
-
-	while (true) {
-		if (done_flag) {
-			break;
-		}
-
-		cv.wait(lock);
-	}
-}
-
-int
-main(int, char**)
-{
-	// in case of deadlock
-	alarm(9);
-
-	RUN_A_TEST(test_tasks(256));
-	RUN_A_TEST(test_finish());
-	RUN_A_TEST(test_unfinish());
-	RUN_A_TEST(test_barrier(256));
-	RUN_A_TEST(test_finish());
-	RUN_A_TEST(test_unfinish());
-	RUN_A_TEST(test_exclusion(256));
-	RUN_A_TEST(test_finish());
-
-	exit(EXIT_SUCCESS);
-}