Diff of the two buildlogs:

--
--- b1/build.log	2023-04-29 12:40:41.711991206 +0000
+++ b2/build.log	2023-04-29 13:11:21.271226382 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Fri May 31 06:41:26 -12 2024
-I: pbuilder-time-stamp: 1717180886
+I: Current time: Sun Apr 30 02:40:46 +14 2023
+I: pbuilder-time-stamp: 1682772046
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz]
 I: copying local configuration
@@ -16,7 +16,7 @@
 I: copying [./thin-provisioning-tools_0.9.0.orig.tar.xz]
 I: copying [./thin-provisioning-tools_0.9.0-2.debian.tar.xz]
 I: Extracting source
-gpgv: Signature made Fri Feb 18 04:58:33 2022 -12
+gpgv: Signature made Sat Feb 19 06:58:33 2022 +14
 gpgv:                using RSA key 4771CC37ADE3752D6BAA3C4B6D9388858A69FE51
 gpgv:                issuer "waldi@debian.org"
 gpgv: Can't check signature: No public key
@@ -28,52 +28,84 @@
 dpkg-source: info: applying debian-changes
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/822/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/30624/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink12-arm64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Apr 30 02:41 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/30624/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/30624/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='arm64'
-  DEBIAN_FRONTEND='noninteractive'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="15" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.2.15(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=arm64
+  DEBIAN_FRONTEND=noninteractive
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=8'
-  DISTRIBUTION='bookworm'
-  HOME='/var/lib/jenkins'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=bookworm
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/var/lib/jenkins
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='822'
-  PS1='# '
-  PS2='> '
+  LANG=C
+  LANGUAGE=nl_BE:nl
+  LC_ALL=C
+  MACHTYPE=aarch64-unknown-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=30624
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.VQcbv1mU/pbuilderrc_xKuW --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.VQcbv1mU/b1 --logfile b1/build.log thin-provisioning-tools_0.9.0-2.dsc'
-  SUDO_GID='117'
-  SUDO_UID='110'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  USERNAME='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://192.168.101.16:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.VQcbv1mU/pbuilderrc_npez --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.VQcbv1mU/b2 --logfile b2/build.log --extrapackages usrmerge thin-provisioning-tools_0.9.0-2.dsc'
+  SUDO_GID=117
+  SUDO_UID=110
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  USERNAME=root
+  _='I: set'
+  http_proxy=http://192.168.101.16:3128
 I: uname -a
-  Linux codethink9-arm64 4.15.0-210-generic #221-Ubuntu SMP Tue Apr 18 08:32:48 UTC 2023 aarch64 GNU/Linux
+  Linux i-capture-the-hostname 4.15.0-210-generic #221-Ubuntu SMP Tue Apr 18 08:32:48 UTC 2023 aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Apr 26  2023 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/822/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Apr 28 00:25 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/30624/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -171,7 +203,7 @@
 Get: 46 http://deb.debian.org/debian bookworm/main arm64 libexpat1 arm64 2.5.0-1 [84.8 kB]
 Get: 47 http://deb.debian.org/debian bookworm/main arm64 libexpat1-dev arm64 2.5.0-1 [135 kB]
 Get: 48 http://deb.debian.org/debian bookworm/main arm64 libgtest-dev arm64 1.12.1-0.2 [231 kB]
-Fetched 41.4 MB in 2s (22.6 MB/s)
+Fetched 41.4 MB in 2s (21.5 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package readline-common.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19616 files and directories currently installed.)
@@ -378,8 +410,17 @@
 Writing extended state information...
 Building tag database...
  -> Finished parsing the build-deps
+Reading package lists...
+Building dependency tree...
+Reading state information...
+usrmerge is already the newest version (35).
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/thin-provisioning-tools-0.9.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../thin-provisioning-tools_0.9.0-2_source.changes
+I: user script /srv/workspace/pbuilder/30624/tmp/hooks/A99_set_merged_usr starting
+Re-configuring usrmerge...
+I: user script /srv/workspace/pbuilder/30624/tmp/hooks/A99_set_merged_usr finished
+hostname: Temporary failure in name resolution
+I: Running cd /build/thin-provisioning-tools-0.9.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../thin-provisioning-tools_0.9.0-2_source.changes
 dpkg-buildpackage: info: source package thin-provisioning-tools
 dpkg-buildpackage: info: source version 0.9.0-2
 dpkg-buildpackage: info: source distribution unstable
@@ -512,16 +553,16 @@
 	make -j8
 make[1]: Entering directory '/build/thin-provisioning-tools-0.9.0'
     [CXX] base/output_file_requirements.cc
-    [CXX] base/application.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o base/output_file_requirements.o base/output_file_requirements.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o base/application.o base/application.cc
+    [CXX] base/application.cc
     [CXX] base/base64.cc
-    [CXX] base/disk_units.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o base/application.o base/application.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o base/base64.o base/base64.cc
+    [CXX] base/disk_units.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o base/disk_units.o base/disk_units.cc
     [CXX] base/endian_utils.cc
-    [CXX] base/error_state.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o base/endian_utils.o base/endian_utils.cc
+    [CXX] base/error_state.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o base/error_state.o base/error_state.cc
     [CXX] base/error_string.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o base/error_string.o base/error_string.cc
@@ -562,24 +603,24 @@
 rm -f base/io_generator.$$
     [CXX] block-cache/block_cache.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o block-cache/block_cache.o block-cache/block_cache.cc
-g++ -MM -MT base/disk_units.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/disk_units.cc > base/disk_units.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/disk_units : Makefile ,g' < base/disk_units.$$ > base/disk_units.d; \
-rm -f base/disk_units.$$
 g++ -MM -MT base/base64.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/base64.cc > base/base64.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/base64 : Makefile ,g' < base/base64.$$ > base/base64.d; \
 rm -f base/base64.$$
+g++ -MM -MT base/disk_units.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/disk_units.cc > base/disk_units.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/disk_units : Makefile ,g' < base/disk_units.$$ > base/disk_units.d; \
+rm -f base/disk_units.$$
 g++ -MM -MT base/rolling_hash.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/rolling_hash.cc > base/rolling_hash.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/rolling_hash : Makefile ,g' < base/rolling_hash.$$ > base/rolling_hash.d; \
 rm -f base/rolling_hash.$$
-g++ -MM -MT base/grid_layout.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/grid_layout.cc > base/grid_layout.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/grid_layout : Makefile ,g' < base/grid_layout.$$ > base/grid_layout.d; \
-rm -f base/grid_layout.$$
     [CXX] block-cache/copier.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o block-cache/copier.o block-cache/copier.cc
     [CXX] block-cache/io_engine.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o block-cache/io_engine.o block-cache/io_engine.cc
     [CXX] block-cache/mem_pool.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o block-cache/mem_pool.o block-cache/mem_pool.cc
+g++ -MM -MT base/grid_layout.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/grid_layout.cc > base/grid_layout.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/grid_layout : Makefile ,g' < base/grid_layout.$$ > base/grid_layout.d; \
+rm -f base/grid_layout.$$
     [CXX] caching/cache_check.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o caching/cache_check.o caching/cache_check.cc
 g++ -MM -MT base/application.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/application.cc > base/application.$$; \
@@ -602,12 +643,12 @@
 rm -f block-cache/copier.$$
     [CXX] caching/cache_restore.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o caching/cache_restore.o caching/cache_restore.cc
-g++ -MM -MT base/xml_utils.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/xml_utils.cc > base/xml_utils.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/xml_utils : Makefile ,g' < base/xml_utils.$$ > base/xml_utils.d; \
-rm -f base/xml_utils.$$
 g++ -MM -MT block-cache/io_engine.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P block-cache/io_engine.cc > block-cache/io_engine.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo block-cache/io_engine : Makefile ,g' < block-cache/io_engine.$$ > block-cache/io_engine.d; \
 rm -f block-cache/io_engine.$$
+g++ -MM -MT base/xml_utils.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P base/xml_utils.cc > base/xml_utils.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/xml_utils : Makefile ,g' < base/xml_utils.$$ > base/xml_utils.d; \
+rm -f base/xml_utils.$$
     [CXX] caching/cache_writeback.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o caching/cache_writeback.o caching/cache_writeback.cc
     [CXX] caching/commands.cc
@@ -635,11 +676,11 @@
 g++ -MM -MT caching/cache_repair.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/cache_repair.cc > caching/cache_repair.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_repair : Makefile ,g' < caching/cache_repair.$$ > caching/cache_repair.d; \
 rm -f caching/cache_repair.$$
+    [CXX] caching/restore_emitter.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o caching/restore_emitter.o caching/restore_emitter.cc
 g++ -MM -MT caching/cache_check.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/cache_check.cc > caching/cache_check.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_check : Makefile ,g' < caching/cache_check.$$ > caching/cache_check.d; \
 rm -f caching/cache_check.$$
-    [CXX] caching/restore_emitter.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o caching/restore_emitter.o caching/restore_emitter.cc
     [CXX] caching/superblock.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o caching/superblock.o caching/superblock.cc
 g++ -MM -MT caching/cache_restore.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/cache_restore.cc > caching/cache_restore.$$; \
@@ -657,24 +698,24 @@
 rm -f caching/mapping_array.$$
     [CXX] era/era_array.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o era/era_array.o era/era_array.cc
-g++ -MM -MT caching/metadata.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/metadata.cc > caching/metadata.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/metadata : Makefile ,g' < caching/metadata.$$ > caching/metadata.d; \
-rm -f caching/metadata.$$
-g++ -MM -MT caching/superblock.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/superblock.cc > caching/superblock.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/superblock : Makefile ,g' < caching/superblock.$$ > caching/superblock.d; \
-rm -f caching/superblock.$$
 g++ -MM -MT caching/cache_writeback.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/cache_writeback.cc > caching/cache_writeback.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_writeback : Makefile ,g' < caching/cache_writeback.$$ > caching/cache_writeback.d; \
 rm -f caching/cache_writeback.$$
-g++ -MM -MT era/commands.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/commands.cc > era/commands.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/commands : Makefile ,g' < era/commands.$$ > era/commands.d; \
-rm -f era/commands.$$
+g++ -MM -MT caching/metadata.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/metadata.cc > caching/metadata.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/metadata : Makefile ,g' < caching/metadata.$$ > caching/metadata.d; \
+rm -f caching/metadata.$$
     [CXX] era/era_check.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o era/era_check.o era/era_check.cc
     [CXX] era/era_detail.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o era/era_detail.o era/era_detail.cc
+g++ -MM -MT era/commands.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/commands.cc > era/commands.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/commands : Makefile ,g' < era/commands.$$ > era/commands.d; \
+rm -f era/commands.$$
     [CXX] era/era_dump.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o era/era_dump.o era/era_dump.cc
+g++ -MM -MT caching/superblock.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/superblock.cc > caching/superblock.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/superblock : Makefile ,g' < caching/superblock.$$ > caching/superblock.d; \
+rm -f caching/superblock.$$
     [CXX] era/era_invalidate.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o era/era_invalidate.o era/era_invalidate.cc
 g++ -MM -MT caching/restore_emitter.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/restore_emitter.cc > caching/restore_emitter.$$; \
@@ -700,11 +741,11 @@
 g++ -MM -MT caching/xml_format.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P caching/xml_format.cc > caching/xml_format.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/xml_format : Makefile ,g' < caching/xml_format.$$ > caching/xml_format.d; \
 rm -f caching/xml_format.$$
+    [CXX] era/superblock.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o era/superblock.o era/superblock.cc
 g++ -MM -MT era/era_array.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/era_array.cc > era/era_array.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/era_array : Makefile ,g' < era/era_array.$$ > era/era_array.d; \
 rm -f era/era_array.$$
-    [CXX] era/superblock.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o era/superblock.o era/superblock.cc
     [CXX] era/writeset_tree.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o era/writeset_tree.o era/writeset_tree.cc
 g++ -MM -MT era/era_check.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/era_check.cc > era/era_check.$$; \
@@ -715,11 +756,11 @@
 g++ -MM -MT era/metadata_dump.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/metadata_dump.cc > era/metadata_dump.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/metadata_dump : Makefile ,g' < era/metadata_dump.$$ > era/metadata_dump.d; \
 rm -f era/metadata_dump.$$
+    [CXX] main.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o main.o main.cc
 g++ -MM -MT era/era_restore.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/era_restore.cc > era/era_restore.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/era_restore : Makefile ,g' < era/era_restore.$$ > era/era_restore.d; \
 rm -f era/era_restore.$$
-    [CXX] main.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o main.o main.cc
     [CXX] persistent-data/block.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/block.o persistent-data/block.cc
 g++ -MM -MT era/metadata.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/metadata.cc > era/metadata.$$; \
@@ -732,26 +773,26 @@
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/checksum.o persistent-data/checksum.cc
     [CXX] persistent-data/data-structures/bitset.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/data-structures/bitset.o persistent-data/data-structures/bitset.cc
-g++ -MM -MT persistent-data/checksum.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/checksum.cc > persistent-data/checksum.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/checksum : Makefile ,g' < persistent-data/checksum.$$ > persistent-data/checksum.d; \
-rm -f persistent-data/checksum.$$
 g++ -MM -MT main.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P main.cc > main.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo main : Makefile ,g' < main.$$ > main.d; \
 rm -f main.$$
+g++ -MM -MT era/superblock.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/superblock.cc > era/superblock.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/superblock : Makefile ,g' < era/superblock.$$ > era/superblock.d; \
+rm -f era/superblock.$$
     [CXX] persistent-data/data-structures/bloom_filter.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/data-structures/bloom_filter.o persistent-data/data-structures/bloom_filter.cc
     [CXX] persistent-data/data-structures/btree.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/data-structures/btree.o persistent-data/data-structures/btree.cc
-g++ -MM -MT era/superblock.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/superblock.cc > era/superblock.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/superblock : Makefile ,g' < era/superblock.$$ > era/superblock.d; \
-rm -f era/superblock.$$
+g++ -MM -MT persistent-data/checksum.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/checksum.cc > persistent-data/checksum.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/checksum : Makefile ,g' < persistent-data/checksum.$$ > persistent-data/checksum.d; \
+rm -f persistent-data/checksum.$$
     [CXX] persistent-data/data-structures/btree_damage_visitor.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/data-structures/btree_damage_visitor.o persistent-data/data-structures/btree_damage_visitor.cc
 In file included from /usr/include/boost/bind.hpp:30,
                  from persistent-data/block.cc:25:
 /usr/include/boost/bind.hpp:36:1: note: '#pragma message: The practice of declaring the Bind placeholders (_1, _2, ...) in the global namespace is deprecated. Please use <boost/bind/bind.hpp> + using namespace boost::placeholders, or define BOOST_BIND_GLOBAL_PLACEHOLDERS to retain the current behavior.'
    36 | BOOST_PRAGMA_MESSAGE(
       | ^~~~~~~~~~~~~~~~~~~~
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/data-structures/btree_damage_visitor.o persistent-data/data-structures/btree_damage_visitor.cc
 g++ -MM -MT persistent-data/block.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/block.cc > persistent-data/block.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/block : Makefile ,g' < persistent-data/block.$$ > persistent-data/block.d; \
 rm -f persistent-data/block.$$
@@ -762,19 +803,19 @@
 rm -f era/writeset_tree.$$
     [CXX] persistent-data/error_set.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/error_set.o persistent-data/error_set.cc
-g++ -MM -MT era/xml_format.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/xml_format.cc > era/xml_format.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/xml_format : Makefile ,g' < era/xml_format.$$ > era/xml_format.d; \
-rm -f era/xml_format.$$
 g++ -MM -MT era/restore_emitter.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/restore_emitter.cc > era/restore_emitter.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/restore_emitter : Makefile ,g' < era/restore_emitter.$$ > era/restore_emitter.d; \
 rm -f era/restore_emitter.$$
+g++ -MM -MT era/xml_format.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P era/xml_format.cc > era/xml_format.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/xml_format : Makefile ,g' < era/xml_format.$$ > era/xml_format.d; \
+rm -f era/xml_format.$$
     [CXX] persistent-data/file_utils.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/file_utils.o persistent-data/file_utils.cc
-    [CXX] persistent-data/hex_dump.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/hex_dump.o persistent-data/hex_dump.cc
 g++ -MM -MT persistent-data/data-structures/btree.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/data-structures/btree.cc > persistent-data/data-structures/btree.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/data-structures/btree : Makefile ,g' < persistent-data/data-structures/btree.$$ > persistent-data/data-structures/btree.d; \
 rm -f persistent-data/data-structures/btree.$$
+    [CXX] persistent-data/hex_dump.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/hex_dump.o persistent-data/hex_dump.cc
     [CXX] persistent-data/space-maps/careful_alloc.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/space-maps/careful_alloc.o persistent-data/space-maps/careful_alloc.cc
 g++ -MM -MT persistent-data/data-structures/bloom_filter.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/data-structures/bloom_filter.cc > persistent-data/data-structures/bloom_filter.$$; \
@@ -787,14 +828,14 @@
 rm -f persistent-data/data-structures/btree_damage_visitor.$$
     [CXX] persistent-data/space-maps/disk.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/space-maps/disk.o persistent-data/space-maps/disk.cc
+g++ -MM -MT persistent-data/error_set.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/error_set.cc > persistent-data/error_set.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/error_set : Makefile ,g' < persistent-data/error_set.$$ > persistent-data/error_set.d; \
+rm -f persistent-data/error_set.$$
 g++ -MM -MT persistent-data/hex_dump.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/hex_dump.cc > persistent-data/hex_dump.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/hex_dump : Makefile ,g' < persistent-data/hex_dump.$$ > persistent-data/hex_dump.d; \
 rm -f persistent-data/hex_dump.$$
     [CXX] persistent-data/space-maps/recursive.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/space-maps/recursive.o persistent-data/space-maps/recursive.cc
-g++ -MM -MT persistent-data/error_set.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/error_set.cc > persistent-data/error_set.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/error_set : Makefile ,g' < persistent-data/error_set.$$ > persistent-data/error_set.d; \
-rm -f persistent-data/error_set.$$
     [CXX] persistent-data/space_map.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/space_map.o persistent-data/space_map.cc
 g++ -MM -MT persistent-data/data-structures/btree_node_checker.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/data-structures/btree_node_checker.cc > persistent-data/data-structures/btree_node_checker.$$; \
@@ -807,12 +848,12 @@
 rm -f persistent-data/file_utils.$$
     [CXX] persistent-data/validators.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o persistent-data/validators.o persistent-data/validators.cc
-g++ -MM -MT persistent-data/space-maps/core.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/space-maps/core.cc > persistent-data/space-maps/core.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/space-maps/core : Makefile ,g' < persistent-data/space-maps/core.$$ > persistent-data/space-maps/core.d; \
-rm -f persistent-data/space-maps/core.$$
 g++ -MM -MT persistent-data/space_map.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/space_map.cc > persistent-data/space_map.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/space_map : Makefile ,g' < persistent-data/space_map.$$ > persistent-data/space_map.d; \
 rm -f persistent-data/space_map.$$
+g++ -MM -MT persistent-data/space-maps/core.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/space-maps/core.cc > persistent-data/space-maps/core.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/space-maps/core : Makefile ,g' < persistent-data/space-maps/core.$$ > persistent-data/space-maps/core.d; \
+rm -f persistent-data/space-maps/core.$$
     [CXX] thin-provisioning/commands.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/commands.o thin-provisioning/commands.cc
     [CXX] thin-provisioning/cache_stream.cc
@@ -822,12 +863,12 @@
 rm -f persistent-data/space-maps/careful_alloc.$$
     [CXX] thin-provisioning/chunk_stream.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/chunk_stream.o thin-provisioning/chunk_stream.cc
-g++ -MM -MT persistent-data/data-structures/bitset.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/data-structures/bitset.cc > persistent-data/data-structures/bitset.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/data-structures/bitset : Makefile ,g' < persistent-data/data-structures/bitset.$$ > persistent-data/data-structures/bitset.d; \
-rm -f persistent-data/data-structures/bitset.$$
 g++ -MM -MT persistent-data/transaction_manager.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/transaction_manager.cc > persistent-data/transaction_manager.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/transaction_manager : Makefile ,g' < persistent-data/transaction_manager.$$ > persistent-data/transaction_manager.d; \
 rm -f persistent-data/transaction_manager.$$
+g++ -MM -MT persistent-data/data-structures/bitset.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/data-structures/bitset.cc > persistent-data/data-structures/bitset.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/data-structures/bitset : Makefile ,g' < persistent-data/data-structures/bitset.$$ > persistent-data/data-structures/bitset.d; \
+rm -f persistent-data/data-structures/bitset.$$
     [CXX] thin-provisioning/device_tree.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/device_tree.o thin-provisioning/device_tree.cc
 g++ -MM -MT persistent-data/validators.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P persistent-data/validators.cc > persistent-data/validators.$$; \
@@ -842,12 +883,12 @@
 rm -f persistent-data/space-maps/recursive.$$
     [CXX] thin-provisioning/mapping_tree.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/mapping_tree.o thin-provisioning/mapping_tree.cc
-g++ -MM -MT thin-provisioning/chunk_stream.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/chunk_stream.cc > thin-provisioning/chunk_stream.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/chunk_stream : Makefile ,g' < thin-provisioning/chunk_stream.$$ > thin-provisioning/chunk_stream.d; \
-rm -f thin-provisioning/chunk_stream.$$
 g++ -MM -MT thin-provisioning/commands.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/commands.cc > thin-provisioning/commands.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/commands : Makefile ,g' < thin-provisioning/commands.$$ > thin-provisioning/commands.d; \
 rm -f thin-provisioning/commands.$$
+g++ -MM -MT thin-provisioning/chunk_stream.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/chunk_stream.cc > thin-provisioning/chunk_stream.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/chunk_stream : Makefile ,g' < thin-provisioning/chunk_stream.$$ > thin-provisioning/chunk_stream.d; \
+rm -f thin-provisioning/chunk_stream.$$
     [CXX] thin-provisioning/metadata.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/metadata.o thin-provisioning/metadata.cc
     [CXX] thin-provisioning/metadata_checker.cc
@@ -860,11 +901,11 @@
 g++ -MM -MT thin-provisioning/human_readable_format.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/human_readable_format.cc > thin-provisioning/human_readable_format.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/human_readable_format : Makefile ,g' < thin-provisioning/human_readable_format.$$ > thin-provisioning/human_readable_format.d; \
 rm -f thin-provisioning/human_readable_format.$$
+    [CXX] thin-provisioning/metadata_dumper.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/metadata_dumper.o thin-provisioning/metadata_dumper.cc
 g++ -MM -MT thin-provisioning/fixed_chunk_stream.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/fixed_chunk_stream.cc > thin-provisioning/fixed_chunk_stream.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/fixed_chunk_stream : Makefile ,g' < thin-provisioning/fixed_chunk_stream.$$ > thin-provisioning/fixed_chunk_stream.d; \
 rm -f thin-provisioning/fixed_chunk_stream.$$
-    [CXX] thin-provisioning/metadata_dumper.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/metadata_dumper.o thin-provisioning/metadata_dumper.cc
     [CXX] thin-provisioning/override_emitter.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/override_emitter.o thin-provisioning/override_emitter.cc
 g++ -MM -MT thin-provisioning/device_tree.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/device_tree.cc > thin-provisioning/device_tree.$$; \
@@ -910,11 +951,11 @@
 g++ -MM -MT thin-provisioning/superblock.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/superblock.cc > thin-provisioning/superblock.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/superblock : Makefile ,g' < thin-provisioning/superblock.$$ > thin-provisioning/superblock.d; \
 rm -f thin-provisioning/superblock.$$
-    [CXX] thin-provisioning/thin_metadata_size.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/thin_metadata_size.o thin-provisioning/thin_metadata_size.cc
 g++ -MM -MT thin-provisioning/pool_stream.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/pool_stream.cc > thin-provisioning/pool_stream.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/pool_stream : Makefile ,g' < thin-provisioning/pool_stream.$$ > thin-provisioning/pool_stream.d; \
 rm -f thin-provisioning/pool_stream.$$
+    [CXX] thin-provisioning/thin_metadata_size.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/thin_metadata_size.o thin-provisioning/thin_metadata_size.cc
     [CXX] thin-provisioning/thin_pool.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/thin_pool.o thin-provisioning/thin_pool.cc
 g++ -MM -MT thin-provisioning/thin_check.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_check.cc > thin-provisioning/thin_check.$$; \
@@ -942,14 +983,14 @@
 rm -f thin-provisioning/metadata_dumper.$$
     [CXX] thin-provisioning/xml_format.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/xml_format.o thin-provisioning/xml_format.cc
+g++ -MM -MT thin-provisioning/thin_restore.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_restore.cc > thin-provisioning/thin_restore.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_restore : Makefile ,g' < thin-provisioning/thin_restore.$$ > thin-provisioning/thin_restore.d; \
+rm -f thin-provisioning/thin_restore.$$
 g++ -MM -MT thin-provisioning/thin_repair.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_repair.cc > thin-provisioning/thin_repair.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_repair : Makefile ,g' < thin-provisioning/thin_repair.$$ > thin-provisioning/thin_repair.d; \
 rm -f thin-provisioning/thin_repair.$$
     [CXX] thin-provisioning/shared_library_emitter.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P -o thin-provisioning/shared_library_emitter.o thin-provisioning/shared_library_emitter.cc
-g++ -MM -MT thin-provisioning/thin_restore.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_restore.cc > thin-provisioning/thin_restore.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_restore : Makefile ,g' < thin-provisioning/thin_restore.$$ > thin-provisioning/thin_restore.d; \
-rm -f thin-provisioning/thin_restore.$$
     [CC] ft-lib/bcache.c
 gcc -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -o ft-lib/bcache.o ft-lib/bcache.c
 gcc -MM -MT ft-lib/bcache.c -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 ft-lib/bcache.c > ft-lib/bcache.$$; \
@@ -957,14 +998,14 @@
 rm -f ft-lib/bcache.$$
     [CC] ft-lib/crc32c.c
 gcc -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -o ft-lib/crc32c.o ft-lib/crc32c.c
+g++ -MM -MT thin-provisioning/thin_trim.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_trim.cc > thin-provisioning/thin_trim.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_trim : Makefile ,g' < thin-provisioning/thin_trim.$$ > thin-provisioning/thin_trim.d; \
+rm -f thin-provisioning/thin_trim.$$
 gcc -MM -MT ft-lib/crc32c.c -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 ft-lib/crc32c.c > ft-lib/crc32c.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo ft-lib/crc32c : Makefile ,g' < ft-lib/crc32c.$$ > ft-lib/crc32c.d; \
 rm -f ft-lib/crc32c.$$
     [CC] ft-lib/dm-ioctl.c
 gcc -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -o ft-lib/dm-ioctl.o ft-lib/dm-ioctl.c
-g++ -MM -MT thin-provisioning/thin_trim.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_trim.cc > thin-provisioning/thin_trim.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_trim : Makefile ,g' < thin-provisioning/thin_trim.$$ > thin-provisioning/thin_trim.d; \
-rm -f thin-provisioning/thin_trim.$$
 In function 'free_ctl',
     inlined from 'realloc_ctl' at ft-lib/dm-ioctl.c:75:2,
     inlined from 'dm_list_devices' at ft-lib/dm-ioctl.c:269:9:
@@ -1034,12 +1075,12 @@
 g++ -MM -MT thin-provisioning/thin_delta.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_delta.cc > thin-provisioning/thin_delta.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_delta : Makefile ,g' < thin-provisioning/thin_delta.$$ > thin-provisioning/thin_delta.d; \
 rm -f thin-provisioning/thin_delta.$$
-g++ -MM -MT thin-provisioning/thin_ls.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_ls.cc > thin-provisioning/thin_ls.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_ls : Makefile ,g' < thin-provisioning/thin_ls.$$ > thin-provisioning/thin_ls.d; \
-rm -f thin-provisioning/thin_ls.$$
 g++ -MM -MT thin-provisioning/thin_rmap.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_rmap.cc > thin-provisioning/thin_rmap.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_rmap : Makefile ,g' < thin-provisioning/thin_rmap.$$ > thin-provisioning/thin_rmap.d; \
 rm -f thin-provisioning/thin_rmap.$$
+g++ -MM -MT thin-provisioning/thin_ls.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/thin_ls.cc > thin-provisioning/thin_ls.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_ls : Makefile ,g' < thin-provisioning/thin_ls.$$ > thin-provisioning/thin_ls.d; \
+rm -f thin-provisioning/thin_ls.$$
 g++ -MM -MT thin-provisioning/xml_format.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.9.0=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -DSTRERROR_R_CHAR_P thin-provisioning/xml_format.cc > thin-provisioning/xml_format.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/xml_format : Makefile ,g' < thin-provisioning/xml_format.$$ > thin-provisioning/xml_format.d; \
 rm -f thin-provisioning/xml_format.$$
@@ -1222,37 +1263,37 @@
 [----------] Global test environment set-up.
 [----------] 7 tests from ArrayBlockTests
 [ RUN      ] ArrayBlockTests.can_create_an_empty_array
-[       OK ] ArrayBlockTests.can_create_an_empty_array (85 ms)
+[       OK ] ArrayBlockTests.can_create_an_empty_array (104 ms)
 [ RUN      ] ArrayBlockTests.read_only_array_blocks_are_possible
-[       OK ] ArrayBlockTests.read_only_array_blocks_are_possible (123 ms)
+[       OK ] ArrayBlockTests.read_only_array_blocks_are_possible (115 ms)
 [ RUN      ] ArrayBlockTests.updating_reopened_array_block
-[       OK ] ArrayBlockTests.updating_reopened_array_block (112 ms)
+[       OK ] ArrayBlockTests.updating_reopened_array_block (127 ms)
 [ RUN      ] ArrayBlockTests.growing
-[       OK ] ArrayBlockTests.growing (119 ms)
+[       OK ] ArrayBlockTests.growing (135 ms)
 [ RUN      ] ArrayBlockTests.grow_does_not_touch_existing_values
-[       OK ] ArrayBlockTests.grow_does_not_touch_existing_values (95 ms)
+[       OK ] ArrayBlockTests.grow_does_not_touch_existing_values (119 ms)
 [ RUN      ] ArrayBlockTests.shrinking
-[       OK ] ArrayBlockTests.shrinking (139 ms)
+[       OK ] ArrayBlockTests.shrinking (87 ms)
 [ RUN      ] ArrayBlockTests.ref_counting
-[       OK ] ArrayBlockTests.ref_counting (120 ms)
-[----------] 7 tests from ArrayBlockTests (797 ms total)
+[       OK ] ArrayBlockTests.ref_counting (171 ms)
+[----------] 7 tests from ArrayBlockTests (864 ms total)
 
 [----------] 7 tests from ArrayTests
 [ RUN      ] ArrayTests.can_create_an_empty_array
-[       OK ] ArrayTests.can_create_an_empty_array (128 ms)
+[       OK ] ArrayTests.can_create_an_empty_array (96 ms)
 [ RUN      ] ArrayTests.get_elements
-[       OK ] ArrayTests.get_elements (112 ms)
+[       OK ] ArrayTests.get_elements (135 ms)
 [ RUN      ] ArrayTests.set_elements
-[       OK ] ArrayTests.set_elements (144 ms)
+[       OK ] ArrayTests.set_elements (147 ms)
 [ RUN      ] ArrayTests.grow
-[       OK ] ArrayTests.grow (235 ms)
+[       OK ] ArrayTests.grow (279 ms)
 [ RUN      ] ArrayTests.reopen_array
-[       OK ] ArrayTests.reopen_array (103 ms)
+[       OK ] ArrayTests.reopen_array (139 ms)
 [ RUN      ] ArrayTests.visit_values
-[       OK ] ArrayTests.visit_values (143 ms)
+[       OK ] ArrayTests.visit_values (112 ms)
 [ RUN      ] ArrayTests.visit_values_with_too_few_entries
-[       OK ] ArrayTests.visit_values_with_too_few_entries (91 ms)
-[----------] 7 tests from ArrayTests (960 ms total)
+[       OK ] ArrayTests.visit_values_with_too_few_entries (127 ms)
+[----------] 7 tests from ArrayTests (1040 ms total)
 
 [----------] 9 tests from Base64Tests
 [ RUN      ] Base64Tests.encoding_an_empty_string
@@ -1272,8 +1313,8 @@
 [ RUN      ] Base64Tests.encode_decode_cycle
 [       OK ] Base64Tests.encode_decode_cycle (0 ms)
 [ RUN      ] Base64Tests.random_data
-[       OK ] Base64Tests.random_data (461 ms)
-[----------] 9 tests from Base64Tests (462 ms total)
+[       OK ] Base64Tests.random_data (877 ms)
+[----------] 9 tests from Base64Tests (878 ms total)
 
 [----------] 1 test from BCacheTests
 [ RUN      ] BCacheTests.cleaned_on_demand
@@ -1284,138 +1325,138 @@
 [ RUN      ] BlockTests.bad_path
 [       OK ] BlockTests.bad_path (0 ms)
 [ RUN      ] BlockTests.out_of_range_access
-[       OK ] BlockTests.out_of_range_access (104 ms)
+[       OK ] BlockTests.out_of_range_access (139 ms)
 [ RUN      ] BlockTests.read_lock_all_blocks
-[       OK ] BlockTests.read_lock_all_blocks (150 ms)
+[       OK ] BlockTests.read_lock_all_blocks (123 ms)
 [ RUN      ] BlockTests.write_lock_all_blocks
-[       OK ] BlockTests.write_lock_all_blocks (103 ms)
+[       OK ] BlockTests.write_lock_all_blocks (95 ms)
 [ RUN      ] BlockTests.writes_persist
-[       OK ] BlockTests.writes_persist (143 ms)
+[       OK ] BlockTests.writes_persist (135 ms)
 [ RUN      ] BlockTests.write_lock_zero_zeroes
-[       OK ] BlockTests.write_lock_zero_zeroes (135 ms)
+[       OK ] BlockTests.write_lock_zero_zeroes (99 ms)
 [ RUN      ] BlockTests.read_validator_works
-[       OK ] BlockTests.read_validator_works (112 ms)
+[       OK ] BlockTests.read_validator_works (99 ms)
 [ RUN      ] BlockTests.write_validator_works
-[       OK ] BlockTests.write_validator_works (95 ms)
+[       OK ] BlockTests.write_validator_works (107 ms)
 [ RUN      ] BlockTests.cannot_have_two_superblocks
-[       OK ] BlockTests.cannot_have_two_superblocks (124 ms)
+[       OK ] BlockTests.cannot_have_two_superblocks (140 ms)
 [ RUN      ] BlockTests.can_have_subsequent_superblocks
-[       OK ] BlockTests.can_have_subsequent_superblocks (124 ms)
+[       OK ] BlockTests.can_have_subsequent_superblocks (155 ms)
 [ RUN      ] BlockTests.superblocks_can_change_address
-[       OK ] BlockTests.superblocks_can_change_address (122 ms)
+[       OK ] BlockTests.superblocks_can_change_address (127 ms)
 [ RUN      ] BlockTests.superblock_must_be_last
-[       OK ] BlockTests.superblock_must_be_last (132 ms)
+[       OK ] BlockTests.superblock_must_be_last (115 ms)
 [ RUN      ] BlockTests.references_can_be_copied
-[       OK ] BlockTests.references_can_be_copied (119 ms)
+[       OK ] BlockTests.references_can_be_copied (155 ms)
 [ RUN      ] BlockTests.no_concurrent_write_locks
-[       OK ] BlockTests.no_concurrent_write_locks (128 ms)
+[       OK ] BlockTests.no_concurrent_write_locks (111 ms)
 [ RUN      ] BlockTests.concurrent_read_locks
-[       OK ] BlockTests.concurrent_read_locks (115 ms)
+[       OK ] BlockTests.concurrent_read_locks (167 ms)
 [ RUN      ] BlockTests.read_then_write
-[       OK ] BlockTests.read_then_write (98 ms)
+[       OK ] BlockTests.read_then_write (115 ms)
 [ RUN      ] BlockTests.write_then_read
-[       OK ] BlockTests.write_then_read (97 ms)
-[----------] 17 tests from BlockTests (1912 ms total)
+[       OK ] BlockTests.write_then_read (107 ms)
+[----------] 17 tests from BlockTests (2004 ms total)
 
 [----------] 14 tests from ValidatorTests
 [ RUN      ] ValidatorTests.check_on_read_lock
-[       OK ] ValidatorTests.check_on_read_lock (103 ms)
+[       OK ] ValidatorTests.check_on_read_lock (143 ms)
 [ RUN      ] ValidatorTests.check_only_called_once_on_read_lock
-[       OK ] ValidatorTests.check_only_called_once_on_read_lock (95 ms)
+[       OK ] ValidatorTests.check_only_called_once_on_read_lock (104 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_read_lock
-[       OK ] ValidatorTests.validator_can_be_changed_by_read_lock (120 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_read_lock (148 ms)
 [ RUN      ] ValidatorTests.check_and_prepare_on_write_lock
-[       OK ] ValidatorTests.check_and_prepare_on_write_lock (82 ms)
+[       OK ] ValidatorTests.check_and_prepare_on_write_lock (110 ms)
 [ RUN      ] ValidatorTests.check_only_called_once_on_write_lock
-[       OK ] ValidatorTests.check_only_called_once_on_write_lock (91 ms)
+[       OK ] ValidatorTests.check_only_called_once_on_write_lock (143 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_write_lock
-[       OK ] ValidatorTests.validator_can_be_changed_by_write_lock (159 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_write_lock (119 ms)
 [ RUN      ] ValidatorTests.no_check_but_prepare_on_write_lock_zero
-[       OK ] ValidatorTests.no_check_but_prepare_on_write_lock_zero (95 ms)
+[       OK ] ValidatorTests.no_check_but_prepare_on_write_lock_zero (171 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_write_lock_zero
-[       OK ] ValidatorTests.validator_can_be_changed_by_write_lock_zero (130 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_write_lock_zero (160 ms)
 [ RUN      ] ValidatorTests.check_and_prepare_on_superblock_lock
-[       OK ] ValidatorTests.check_and_prepare_on_superblock_lock (89 ms)
+[       OK ] ValidatorTests.check_and_prepare_on_superblock_lock (160 ms)
 [ RUN      ] ValidatorTests.check_only_called_once_on_superblock_lock
-[       OK ] ValidatorTests.check_only_called_once_on_superblock_lock (103 ms)
+[       OK ] ValidatorTests.check_only_called_once_on_superblock_lock (167 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_superblock_lock
-[       OK ] ValidatorTests.validator_can_be_changed_by_superblock_lock (123 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_superblock_lock (127 ms)
 [ RUN      ] ValidatorTests.no_check_but_prepare_on_superblock_lock_zero
-[       OK ] ValidatorTests.no_check_but_prepare_on_superblock_lock_zero (116 ms)
+[       OK ] ValidatorTests.no_check_but_prepare_on_superblock_lock_zero (139 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_superblock_zero
-[       OK ] ValidatorTests.validator_can_be_changed_by_superblock_zero (127 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_superblock_zero (147 ms)
 [ RUN      ] ValidatorTests.validator_check_failure_gets_passed_up
-[       OK ] ValidatorTests.validator_check_failure_gets_passed_up (147 ms)
-[----------] 14 tests from ValidatorTests (1591 ms total)
+[       OK ] ValidatorTests.validator_check_failure_gets_passed_up (136 ms)
+[----------] 14 tests from ValidatorTests (1983 ms total)
 
 [----------] 9 tests from BitsetTests
 [ RUN      ] BitsetTests.create_empty_bitset
-[       OK ] BitsetTests.create_empty_bitset (88 ms)
+[       OK ] BitsetTests.create_empty_bitset (164 ms)
 [ RUN      ] BitsetTests.grow_default_false
-[       OK ] BitsetTests.grow_default_false (196 ms)
+[       OK ] BitsetTests.grow_default_false (231 ms)
 [ RUN      ] BitsetTests.grow_default_true
-[       OK ] BitsetTests.grow_default_true (171 ms)
+[       OK ] BitsetTests.grow_default_true (247 ms)
 [ RUN      ] BitsetTests.grow_throws_if_actualy_asked_to_shrink
-[       OK ] BitsetTests.grow_throws_if_actualy_asked_to_shrink (104 ms)
+[       OK ] BitsetTests.grow_throws_if_actualy_asked_to_shrink (147 ms)
 [ RUN      ] BitsetTests.multiple_grow_calls
-[       OK ] BitsetTests.multiple_grow_calls (279 ms)
+[       OK ] BitsetTests.multiple_grow_calls (375 ms)
 [ RUN      ] BitsetTests.set_out_of_bounds_throws
-[       OK ] BitsetTests.set_out_of_bounds_throws (151 ms)
+[       OK ] BitsetTests.set_out_of_bounds_throws (103 ms)
 [ RUN      ] BitsetTests.set_works
-[       OK ] BitsetTests.set_works (248 ms)
+[       OK ] BitsetTests.set_works (267 ms)
 [ RUN      ] BitsetTests.reopen_works
-[       OK ] BitsetTests.reopen_works (203 ms)
+[       OK ] BitsetTests.reopen_works (351 ms)
 [ RUN      ] BitsetTests.walk_bitset
-[       OK ] BitsetTests.walk_bitset (159 ms)
-[----------] 9 tests from BitsetTests (1604 ms total)
+[       OK ] BitsetTests.walk_bitset (279 ms)
+[----------] 9 tests from BitsetTests (2172 ms total)
 
 [----------] 4 tests from BtreeTests
 [ RUN      ] BtreeTests.empty_btree_contains_nothing
-[       OK ] BtreeTests.empty_btree_contains_nothing (104 ms)
+[       OK ] BtreeTests.empty_btree_contains_nothing (103 ms)
 [ RUN      ] BtreeTests.insert_works
-[       OK ] BtreeTests.insert_works (467 ms)
+[       OK ] BtreeTests.insert_works (664 ms)
 [ RUN      ] BtreeTests.insert_does_not_insert_imaginary_values
-[       OK ] BtreeTests.insert_does_not_insert_imaginary_values (103 ms)
+[       OK ] BtreeTests.insert_does_not_insert_imaginary_values (147 ms)
 [ RUN      ] BtreeTests.clone
-[       OK ] BtreeTests.clone (163 ms)
-[----------] 4 tests from BtreeTests (839 ms total)
+[       OK ] BtreeTests.clone (260 ms)
+[----------] 4 tests from BtreeTests (1176 ms total)
 
 [----------] 2 tests from BTreeCounterTests
 [ RUN      ] BTreeCounterTests.count_empty_tree
-[       OK ] BTreeCounterTests.count_empty_tree (111 ms)
+[       OK ] BTreeCounterTests.count_empty_tree (148 ms)
 [ RUN      ] BTreeCounterTests.count_populated_tree
-[       OK ] BTreeCounterTests.count_populated_tree (155 ms)
-[----------] 2 tests from BTreeCounterTests (267 ms total)
+[       OK ] BTreeCounterTests.count_populated_tree (138 ms)
+[----------] 2 tests from BTreeCounterTests (287 ms total)
 
 [----------] 8 tests from BTreeDamageVisitorTests
 [ RUN      ] BTreeDamageVisitorTests.an_empty_tree
 [       OK ] BTreeDamageVisitorTests.an_empty_tree (120 ms)
 [ RUN      ] BTreeDamageVisitorTests.tree_with_a_trashed_root
-[       OK ] BTreeDamageVisitorTests.tree_with_a_trashed_root (144 ms)
+[       OK ] BTreeDamageVisitorTests.tree_with_a_trashed_root (107 ms)
 [ RUN      ] BTreeDamageVisitorTests.populated_tree_with_no_damage
-[       OK ] BTreeDamageVisitorTests.populated_tree_with_no_damage (62400 ms)
+[       OK ] BTreeDamageVisitorTests.populated_tree_with_no_damage (95300 ms)
 [ RUN      ] BTreeDamageVisitorTests.populated_tree_with_a_damaged_leaf_node
-[       OK ] BTreeDamageVisitorTests.populated_tree_with_a_damaged_leaf_node (61602 ms)
+[       OK ] BTreeDamageVisitorTests.populated_tree_with_a_damaged_leaf_node (75067 ms)
 [ RUN      ] BTreeDamageVisitorTests.populated_tree_with_a_sequence_of_damaged_leaf_nodes
-[       OK ] BTreeDamageVisitorTests.populated_tree_with_a_sequence_of_damaged_leaf_nodes (60752 ms)
+[       OK ] BTreeDamageVisitorTests.populated_tree_with_a_sequence_of_damaged_leaf_nodes (86044 ms)
 [ RUN      ] BTreeDamageVisitorTests.damaged_first_leaf
-[       OK ] BTreeDamageVisitorTests.damaged_first_leaf (62079 ms)
+[       OK ] BTreeDamageVisitorTests.damaged_first_leaf (73335 ms)
 [ RUN      ] BTreeDamageVisitorTests.damaged_last_leaf
-[       OK ] BTreeDamageVisitorTests.damaged_last_leaf (61291 ms)
+[       OK ] BTreeDamageVisitorTests.damaged_last_leaf (70275 ms)
 [ RUN      ] BTreeDamageVisitorTests.damaged_internal
-[       OK ] BTreeDamageVisitorTests.damaged_internal (200 ms)
-[----------] 8 tests from BTreeDamageVisitorTests (308592 ms total)
+[       OK ] BTreeDamageVisitorTests.damaged_internal (229 ms)
+[----------] 8 tests from BTreeDamageVisitorTests (400481 ms total)
 
 [----------] 4 tests from BTreeDamageVisitor2Tests
 [ RUN      ] BTreeDamageVisitor2Tests.empty_tree
-[       OK ] BTreeDamageVisitor2Tests.empty_tree (151 ms)
+[       OK ] BTreeDamageVisitor2Tests.empty_tree (154 ms)
 [ RUN      ] BTreeDamageVisitor2Tests.tree_with_a_trashed_root
-[       OK ] BTreeDamageVisitor2Tests.tree_with_a_trashed_root (167 ms)
+[       OK ] BTreeDamageVisitor2Tests.tree_with_a_trashed_root (139 ms)
 [ RUN      ] BTreeDamageVisitor2Tests.populated_tree_with_no_damage
-[       OK ] BTreeDamageVisitor2Tests.populated_tree_with_no_damage (116 ms)
+[       OK ] BTreeDamageVisitor2Tests.populated_tree_with_no_damage (124 ms)
 [ RUN      ] BTreeDamageVisitor2Tests.damaged_leaf
-[       OK ] BTreeDamageVisitor2Tests.damaged_leaf (62063 ms)
-[----------] 4 tests from BTreeDamageVisitor2Tests (62499 ms total)
+[       OK ] BTreeDamageVisitor2Tests.damaged_leaf (80039 ms)
+[----------] 4 tests from BTreeDamageVisitor2Tests (80458 ms total)
 
 [----------] 14 tests from CacheSuperblockTests
 [ RUN      ] CacheSuperblockTests.default_constructed_superblock_is_valid
@@ -1462,12 +1503,12 @@
 [ RUN      ] CopierTests.unsuccessful_write
 [       OK ] CopierTests.unsuccessful_write (0 ms)
 [ RUN      ] CopierTests.copy_the_same_block_many_times
-[       OK ] CopierTests.copy_the_same_block_many_times (8061 ms)
+[       OK ] CopierTests.copy_the_same_block_many_times (10335 ms)
 [ RUN      ] CopierTests.copy_different_blocks
-[       OK ] CopierTests.copy_different_blocks (750 ms)
+[       OK ] CopierTests.copy_different_blocks (1111 ms)
 [ RUN      ] CopierTests.wait_can_timeout
-[       OK ] CopierTests.wait_can_timeout (0 ms)
-[----------] 9 tests from CopierTests (8815 ms total)
+[       OK ] CopierTests.wait_can_timeout (8 ms)
+[----------] 9 tests from CopierTests (11458 ms total)
 
 [----------] 10 tests from DamageTrackerTests
 [ RUN      ] DamageTrackerTests.good_leaf
@@ -1506,24 +1547,24 @@
 
 [----------] 9 tests from IOEngineTests
 [ RUN      ] IOEngineTests.empty_test
-[       OK ] IOEngineTests.empty_test (134 ms)
+[       OK ] IOEngineTests.empty_test (154 ms)
 [ RUN      ] IOEngineTests.open_and_close
-[       OK ] IOEngineTests.open_and_close (135 ms)
+[       OK ] IOEngineTests.open_and_close (111 ms)
 [ RUN      ] IOEngineTests.you_can_read_a_read_only_handle
-[       OK ] IOEngineTests.you_can_read_a_read_only_handle (127 ms)
+[       OK ] IOEngineTests.you_can_read_a_read_only_handle (140 ms)
 [ RUN      ] IOEngineTests.you_cannot_write_to_a_read_only_handle
-[       OK ] IOEngineTests.you_cannot_write_to_a_read_only_handle (115 ms)
+[       OK ] IOEngineTests.you_cannot_write_to_a_read_only_handle (99 ms)
 [ RUN      ] IOEngineTests.you_can_write_to_a_read_write_handle
-[       OK ] IOEngineTests.you_can_write_to_a_read_write_handle (167 ms)
+[       OK ] IOEngineTests.you_can_write_to_a_read_write_handle (115 ms)
 [ RUN      ] IOEngineTests.final_block_read_succeeds
-[       OK ] IOEngineTests.final_block_read_succeeds (139 ms)
+[       OK ] IOEngineTests.final_block_read_succeeds (131 ms)
 [ RUN      ] IOEngineTests.out_of_bounds_read_fails
 [       OK ] IOEngineTests.out_of_bounds_read_fails (123 ms)
 [ RUN      ] IOEngineTests.out_of_bounds_write_succeeds
-[       OK ] IOEngineTests.out_of_bounds_write_succeeds (119 ms)
+[       OK ] IOEngineTests.out_of_bounds_write_succeeds (91 ms)
 [ RUN      ] IOEngineTests.succeed_with_timeout
-[       OK ] IOEngineTests.succeed_with_timeout (147 ms)
-[----------] 9 tests from IOEngineTests (1214 ms total)
+[       OK ] IOEngineTests.succeed_with_timeout (131 ms)
+[----------] 9 tests from IOEngineTests (1102 ms total)
 
 [----------] 6 tests from MempoolTests
 [ RUN      ] MempoolTests.empty_test
@@ -1563,12 +1604,12 @@
 [ RUN      ] RollingHashTests.ctr
 [       OK ] RollingHashTests.ctr (0 ms)
 [ RUN      ] RollingHashTests.hash_changes
-[       OK ] RollingHashTests.hash_changes (75 ms)
+[       OK ] RollingHashTests.hash_changes (65 ms)
 [ RUN      ] RollingHashTests.hash_repeats
-[       OK ] RollingHashTests.hash_repeats (0 ms)
+[       OK ] RollingHashTests.hash_repeats (16 ms)
 [ RUN      ] RollingHashTests.reset_is_deterministic
 [       OK ] RollingHashTests.reset_is_deterministic (0 ms)
-[----------] 4 tests from RollingHashTests (76 ms total)
+[----------] 4 tests from RollingHashTests (82 ms total)
 
 [----------] 2 tests from ContentBasedHashTests
 [ RUN      ] ContentBasedHashTests.ctr
@@ -9767,8 +9808,8 @@
 8190: 2
 8191: 4
 min: 2048, max: 8192
-[       OK ] ContentBasedHashTests.chunk_limits_respected (7314 ms)
-[----------] 2 tests from ContentBasedHashTests (7314 ms total)
+[       OK ] ContentBasedHashTests.chunk_limits_respected (8798 ms)
+[----------] 2 tests from ContentBasedHashTests (8799 ms total)
 
 [----------] 22 tests from RunSetTests
 [ RUN      ] RunSetTests.create
@@ -9815,7 +9856,7 @@
 [       OK ] RunSetTests.negate_double (0 ms)
 [ RUN      ] RunSetTests.negate_negate
 [       OK ] RunSetTests.negate_negate (0 ms)
-[----------] 22 tests from RunSetTests (22 ms total)
+[----------] 22 tests from RunSetTests (23 ms total)
 
 [----------] 2 tests from SequenceGeneratorTests
 [ RUN      ] SequenceGeneratorTests.create_with_valid_params
@@ -9837,34 +9878,34 @@
 [ RUN      ] RandomSequenceGeneratorTests.random_sequence_unaligned
 [       OK ] RandomSequenceGeneratorTests.random_sequence_unaligned (0 ms)
 [ RUN      ] RandomSequenceGeneratorTests.random_sequence_with_span
-[       OK ] RandomSequenceGeneratorTests.random_sequence_with_span (20 ms)
-[----------] 3 tests from RandomSequenceGeneratorTests (21 ms total)
+[       OK ] RandomSequenceGeneratorTests.random_sequence_with_span (34 ms)
+[----------] 3 tests from RandomSequenceGeneratorTests (34 ms total)
 
 [----------] 5 tests from SpaceMapTests
 [ RUN      ] SpaceMapTests.test_sm_core
-[       OK ] SpaceMapTests.test_sm_core (235 ms)
+[       OK ] SpaceMapTests.test_sm_core (247 ms)
 [ RUN      ] SpaceMapTests.test_sm_careful_alloc
-[       OK ] SpaceMapTests.test_sm_careful_alloc (303 ms)
+[       OK ] SpaceMapTests.test_sm_careful_alloc (359 ms)
 [ RUN      ] SpaceMapTests.test_sm_recursive
-[       OK ] SpaceMapTests.test_sm_recursive (359 ms)
+[       OK ] SpaceMapTests.test_sm_recursive (413 ms)
 [ RUN      ] SpaceMapTests.test_sm_disk
-[       OK ] SpaceMapTests.test_sm_disk (1055 ms)
+[       OK ] SpaceMapTests.test_sm_disk (1298 ms)
 [ RUN      ] SpaceMapTests.test_sm_metadata
-[       OK ] SpaceMapTests.test_sm_metadata (2116 ms)
-[----------] 5 tests from SpaceMapTests (4071 ms total)
+[       OK ] SpaceMapTests.test_sm_metadata (2475 ms)
+[----------] 5 tests from SpaceMapTests (4795 ms total)
 
 [----------] 5 tests from MetadataSpaceMapTests
 [ RUN      ] MetadataSpaceMapTests.test_metadata_and_disk
-[       OK ] MetadataSpaceMapTests.test_metadata_and_disk (115 ms)
+[       OK ] MetadataSpaceMapTests.test_metadata_and_disk (147 ms)
 [ RUN      ] MetadataSpaceMapTests.test_allocate_blocks
-[       OK ] MetadataSpaceMapTests.test_allocate_blocks (388 ms)
+[       OK ] MetadataSpaceMapTests.test_allocate_blocks (407 ms)
 [ RUN      ] MetadataSpaceMapTests.test_multiple_shadows_by_dec
-[       OK ] MetadataSpaceMapTests.test_multiple_shadows_by_dec (407 ms)
+[       OK ] MetadataSpaceMapTests.test_multiple_shadows_by_dec (447 ms)
 [ RUN      ] MetadataSpaceMapTests.test_multiple_shadows_by_inc
-[       OK ] MetadataSpaceMapTests.test_multiple_shadows_by_inc (415 ms)
+[       OK ] MetadataSpaceMapTests.test_multiple_shadows_by_inc (445 ms)
 [ RUN      ] MetadataSpaceMapTests.test_intended_in_place_modification
-[       OK ] MetadataSpaceMapTests.test_intended_in_place_modification (491 ms)
-[----------] 5 tests from MetadataSpaceMapTests (1819 ms total)
+[       OK ] MetadataSpaceMapTests.test_intended_in_place_modification (518 ms)
+[----------] 5 tests from MetadataSpaceMapTests (1967 ms total)
 
 [----------] 1 test from RegularSpanItTests
 [ RUN      ] RegularSpanItTests.regular_span_iterator
@@ -9896,15 +9937,15 @@
 [ RUN      ] TransactionManagerTests.commit_succeeds
 [       OK ] TransactionManagerTests.commit_succeeds (109 ms)
 [ RUN      ] TransactionManagerTests.shadowing
-[       OK ] TransactionManagerTests.shadowing (103 ms)
+[       OK ] TransactionManagerTests.shadowing (108 ms)
 [ RUN      ] TransactionManagerTests.multiple_shadowing
-[       OK ] TransactionManagerTests.multiple_shadowing (127 ms)
+[       OK ] TransactionManagerTests.multiple_shadowing (117 ms)
 [ RUN      ] TransactionManagerTests.shadow_free_block_fails
-[       OK ] TransactionManagerTests.shadow_free_block_fails (100 ms)
-[----------] 4 tests from TransactionManagerTests (442 ms total)
+[       OK ] TransactionManagerTests.shadow_free_block_fails (101 ms)
+[----------] 4 tests from TransactionManagerTests (438 ms total)
 
 [----------] Global test environment tear-down
-[==========] 200 tests from 30 test suites ran. (403457 ms total)
+[==========] 200 tests from 30 test suites ran. (520181 ms total)
 [  PASSED  ] 200 tests.
 make[2]: Leaving directory '/build/thin-provisioning-tools-0.9.0'
 make[1]: Leaving directory '/build/thin-provisioning-tools-0.9.0'
@@ -9916,38 +9957,38 @@
     [txt2man] man8/cache_check.txt
 bin/txt2man -p -t cache_check man8/cache_check.txt > man8/cache_check.8
     [txt2man] man8/cache_dump.txt
-bin/txt2man -p -t cache_dump man8/cache_dump.txt > man8/cache_dump.8
     [txt2man] man8/cache_metadata_size.txt
-    [txt2man] man8/cache_repair.txt
+bin/txt2man -p -t cache_dump man8/cache_dump.txt > man8/cache_dump.8
 bin/txt2man -p -t cache_metadata_size man8/cache_metadata_size.txt > man8/cache_metadata_size.8
-bin/txt2man -p -t cache_repair man8/cache_repair.txt > man8/cache_repair.8
+    [txt2man] man8/cache_repair.txt
     [txt2man] man8/cache_restore.txt
+bin/txt2man -p -t cache_repair man8/cache_repair.txt > man8/cache_repair.8
 bin/txt2man -p -t cache_restore man8/cache_restore.txt > man8/cache_restore.8
+    [txt2man] man8/cache_writeback.txt
     [txt2man] man8/thin_check.txt
+bin/txt2man -p -t cache_writeback man8/cache_writeback.txt > man8/cache_writeback.8
 bin/txt2man -p -t thin_check man8/thin_check.txt > man8/thin_check.8
     [txt2man] man8/thin_delta.txt
-    [txt2man] man8/cache_writeback.txt
-bin/txt2man -p -t thin_delta man8/thin_delta.txt > man8/thin_delta.8
-bin/txt2man -p -t cache_writeback man8/cache_writeback.txt > man8/cache_writeback.8
     [txt2man] man8/thin_dump.txt
+bin/txt2man -p -t thin_delta man8/thin_delta.txt > man8/thin_delta.8
 bin/txt2man -p -t thin_dump man8/thin_dump.txt > man8/thin_dump.8
     [txt2man] man8/thin_ls.txt
 bin/txt2man -p -t thin_ls man8/thin_ls.txt > man8/thin_ls.8
     [txt2man] man8/thin_repair.txt
-    [txt2man] man8/thin_restore.txt
 bin/txt2man -p -t thin_repair man8/thin_repair.txt > man8/thin_repair.8
-bin/txt2man -p -t thin_restore man8/thin_restore.txt > man8/thin_restore.8
+    [txt2man] man8/thin_restore.txt
     [txt2man] man8/thin_rmap.txt
-    [txt2man] man8/thin_metadata_size.txt
+bin/txt2man -p -t thin_restore man8/thin_restore.txt > man8/thin_restore.8
 bin/txt2man -p -t thin_rmap man8/thin_rmap.txt > man8/thin_rmap.8
+    [txt2man] man8/thin_metadata_size.txt
 bin/txt2man -p -t thin_metadata_size man8/thin_metadata_size.txt > man8/thin_metadata_size.8
     [txt2man] man8/thin_trim.txt
-bin/txt2man -p -t thin_trim man8/thin_trim.txt > man8/thin_trim.8
     [txt2man] man8/era_check.txt
+bin/txt2man -p -t thin_trim man8/thin_trim.txt > man8/thin_trim.8
 bin/txt2man -p -t era_check man8/era_check.txt > man8/era_check.8
     [txt2man] man8/era_dump.txt
-bin/txt2man -p -t era_dump man8/era_dump.txt > man8/era_dump.8
     [txt2man] man8/era_invalidate.txt
+bin/txt2man -p -t era_dump man8/era_dump.txt > man8/era_dump.8
 bin/txt2man -p -t era_invalidate man8/era_invalidate.txt > man8/era_invalidate.8
     [txt2man] man8/era_restore.txt
 bin/txt2man -p -t era_restore man8/era_restore.txt > man8/era_restore.8
@@ -10012,8 +10053,8 @@
    dh_gencontrol
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'thin-provisioning-tools-dbgsym' in '../thin-provisioning-tools-dbgsym_0.9.0-2_arm64.deb'.
 dpkg-deb: building package 'thin-provisioning-tools' in '../thin-provisioning-tools_0.9.0-2_arm64.deb'.
+dpkg-deb: building package 'thin-provisioning-tools-dbgsym' in '../thin-provisioning-tools-dbgsym_0.9.0-2_arm64.deb'.
  dpkg-genbuildinfo --build=binary -O../thin-provisioning-tools_0.9.0-2_arm64.buildinfo
  dpkg-genchanges --build=binary -O../thin-provisioning-tools_0.9.0-2_arm64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -10021,12 +10062,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/30624/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/30624/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/822 and its subdirectories
-I: Current time: Fri May 31 07:03:40 -12 2024
-I: pbuilder-time-stamp: 1717182220
+I: removing directory /srv/workspace/pbuilder/30624 and its subdirectories
+I: Current time: Sun Apr 30 03:11:19 +14 2023
+I: pbuilder-time-stamp: 1682773879