Diff of the two buildlogs:

--
--- b1/build.log	2020-08-11 06:07:37.505207916 +0000
+++ b2/build.log	2020-08-11 06:28:03.815336858 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Mon Aug 10 17:55:45 -12 2020
-I: pbuilder-time-stamp: 1597125345
+I: Current time: Tue Sep 14 02:30:48 +14 2021
+I: pbuilder-time-stamp: 1631536248
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz]
 I: copying local configuration
@@ -17,7 +17,7 @@
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
 gpgv: keyblock resource '/var/lib/jenkins/.gnupg/trustedkeys.kbx': General error
-gpgv: Signature made Sat Mar 30 21:58:08 2019 -12
+gpgv: Signature made Sun Mar 31 23:58:08 2019 +14
 gpgv:                using RSA key 53951D95272E0C5B82BE8C4A2CECE9350ECEBE4A
 gpgv: Can't check signature: No public key
 dpkg-source: warning: failed to verify signature on ./thin-provisioning-tools_0.7.6-2.1.dsc
@@ -29,136 +29,170 @@
 dpkg-source: info: applying 0002-fix-FTBFS-against-libaio-0.3.112.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/28406/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/29509/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink-sled9-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
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by 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/29509/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/29509/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:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="0" [2]="3" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.0.3(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=''
-  HOME='/var/lib/jenkins'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=
+  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='28406'
-  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=29509
   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/tmp.VUvscDqjHB/pbuilderrc_NWMH --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.VUvscDqjHB/b1 --logfile b1/build.log thin-provisioning-tools_0.7.6-2.1.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/tmp.VUvscDqjHB/pbuilderrc_5zL9 --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.VUvscDqjHB/b2 --logfile b2/build.log thin-provisioning-tools_0.7.6-2.1.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 codethink-sled12-arm64 4.4.0-186-generic #216-Ubuntu SMP Wed Jul 1 05:35:21 UTC 2020 aarch64 GNU/Linux
+  Linux i-capture-the-hostname 4.4.0-186-generic #216-Ubuntu SMP Wed Jul 1 05:35:21 UTC 2020 aarch64 GNU/Linux
 I: ls -l /bin
   total 4928
-  -rwxr-xr-x 1 root root 1216928 Apr 17  2019 bash
-  -rwxr-xr-x 3 root root   34808 Jul 10  2019 bunzip2
-  -rwxr-xr-x 3 root root   34808 Jul 10  2019 bzcat
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root    2227 Jul 10  2019 bzdiff
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root    4877 Jun 24  2019 bzexe
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root    3641 Jul 10  2019 bzgrep
-  -rwxr-xr-x 3 root root   34808 Jul 10  2019 bzip2
-  -rwxr-xr-x 1 root root   14264 Jul 10  2019 bzip2recover
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzless -> bzmore
-  -rwxr-xr-x 1 root root    1297 Jul 10  2019 bzmore
-  -rwxr-xr-x 1 root root   35576 Feb 28  2019 cat
-  -rwxr-xr-x 1 root root   60256 Feb 28  2019 chgrp
-  -rwxr-xr-x 1 root root   56096 Feb 28  2019 chmod
-  -rwxr-xr-x 1 root root   64368 Feb 28  2019 chown
-  -rwxr-xr-x 1 root root  134632 Feb 28  2019 cp
-  -rwxr-xr-x 1 root root  129536 Jan 17  2019 dash
-  -rwxr-xr-x 1 root root   97136 Feb 28  2019 date
-  -rwxr-xr-x 1 root root   76736 Feb 28  2019 dd
-  -rwxr-xr-x 1 root root   93752 Feb 28  2019 df
-  -rwxr-xr-x 1 root root  138848 Feb 28  2019 dir
-  -rwxr-xr-x 1 root root   75984 Jan  9  2019 dmesg
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 domainname -> hostname
-  -rwxr-xr-x 1 root root   31368 Feb 28  2019 echo
-  -rwxr-xr-x 1 root root      28 Jan  7  2019 egrep
-  -rwxr-xr-x 1 root root   27256 Feb 28  2019 false
-  -rwxr-xr-x 1 root root      28 Jan  7  2019 fgrep
-  -rwxr-xr-x 1 root root   68792 Jan  9  2019 findmnt
-  -rwsr-xr-x 1 root root   34824 Apr 22 07:38 fusermount
-  -rwxr-xr-x 1 root root  174304 Jan  7  2019 grep
-  -rwxr-xr-x 2 root root    2345 Jan  5  2019 gunzip
-  -rwxr-xr-x 1 root root    6375 Jan  5  2019 gzexe
-  -rwxr-xr-x 1 root root   89656 Jan  5  2019 gzip
-  -rwxr-xr-x 1 root root   18440 Sep 26  2018 hostname
-  -rwxr-xr-x 1 root root   64472 Feb 28  2019 ln
-  -rwxr-xr-x 1 root root   52544 Jul 26  2018 login
-  -rwxr-xr-x 1 root root  138848 Feb 28  2019 ls
-  -rwxr-xr-x 1 root root  108552 Jan  9  2019 lsblk
-  -rwxr-xr-x 1 root root   76840 Feb 28  2019 mkdir
-  -rwxr-xr-x 1 root root   64480 Feb 28  2019 mknod
-  -rwxr-xr-x 1 root root   39736 Feb 28  2019 mktemp
-  -rwxr-xr-x 1 root root   38840 Jan  9  2019 more
-  -rwsr-xr-x 1 root root   47112 Jan  9  2019 mount
-  -rwxr-xr-x 1 root root   14344 Jan  9  2019 mountpoint
-  -rwxr-xr-x 1 root root  138736 Feb 28  2019 mv
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root      14 Feb 14  2019 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root   35560 Feb 28  2019 pwd
-  lrwxrwxrwx 1 root root       4 Apr 17  2019 rbash -> bash
-  -rwxr-xr-x 1 root root   43712 Feb 28  2019 readlink
-  -rwxr-xr-x 1 root root   68440 Feb 28  2019 rm
-  -rwxr-xr-x 1 root root   39624 Feb 28  2019 rmdir
-  -rwxr-xr-x 1 root root   19144 Jan 21  2019 run-parts
-  -rwxr-xr-x 1 root root  114016 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root       4 Aug  8 20:26 sh -> dash
-  -rwxr-xr-x 1 root root   31384 Feb 28  2019 sleep
-  -rwxr-xr-x 1 root root   72480 Feb 28  2019 stty
-  -rwsr-xr-x 1 root root   59424 Jan  9  2019 su
-  -rwxr-xr-x 1 root root   31416 Feb 28  2019 sync
-  -rwxr-xr-x 1 root root  449416 Apr 23  2019 tar
-  -rwxr-xr-x 1 root root   10560 Jan 21  2019 tempfile
-  -rwxr-xr-x 1 root root   88968 Feb 28  2019 touch
-  -rwxr-xr-x 1 root root   27256 Feb 28  2019 true
-  -rwxr-xr-x 1 root root   14264 Apr 22 07:38 ulockmgr_server
-  -rwsr-xr-x 1 root root   30728 Jan  9  2019 umount
-  -rwxr-xr-x 1 root root   31384 Feb 28  2019 uname
-  -rwxr-xr-x 2 root root    2345 Jan  5  2019 uncompress
-  -rwxr-xr-x 1 root root  138848 Feb 28  2019 vdir
-  -rwxr-xr-x 1 root root   34824 Jan  9  2019 wdctl
-  -rwxr-xr-x 1 root root     946 Jan 21  2019 which
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root    1983 Jan  5  2019 zcat
-  -rwxr-xr-x 1 root root    1677 Jan  5  2019 zcmp
-  -rwxr-xr-x 1 root root    5879 Jan  5  2019 zdiff
-  -rwxr-xr-x 1 root root      29 Jan  5  2019 zegrep
-  -rwxr-xr-x 1 root root      29 Jan  5  2019 zfgrep
-  -rwxr-xr-x 1 root root    2080 Jan  5  2019 zforce
-  -rwxr-xr-x 1 root root    7584 Jan  5  2019 zgrep
-  -rwxr-xr-x 1 root root    2205 Jan  5  2019 zless
-  -rwxr-xr-x 1 root root    1841 Jan  5  2019 zmore
-  -rwxr-xr-x 1 root root    4552 Jan  5  2019 znew
-I: user script /srv/workspace/pbuilder/28406/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 1216928 Apr 18  2019 bash
+  -rwxr-xr-x 3 root root   34808 Jul 11  2019 bunzip2
+  -rwxr-xr-x 3 root root   34808 Jul 11  2019 bzcat
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root    2227 Jul 11  2019 bzdiff
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root    4877 Jun 25  2019 bzexe
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root    3641 Jul 11  2019 bzgrep
+  -rwxr-xr-x 3 root root   34808 Jul 11  2019 bzip2
+  -rwxr-xr-x 1 root root   14264 Jul 11  2019 bzip2recover
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzless -> bzmore
+  -rwxr-xr-x 1 root root    1297 Jul 11  2019 bzmore
+  -rwxr-xr-x 1 root root   35576 Mar  1  2019 cat
+  -rwxr-xr-x 1 root root   60256 Mar  1  2019 chgrp
+  -rwxr-xr-x 1 root root   56096 Mar  1  2019 chmod
+  -rwxr-xr-x 1 root root   64368 Mar  1  2019 chown
+  -rwxr-xr-x 1 root root  134632 Mar  1  2019 cp
+  -rwxr-xr-x 1 root root  129536 Jan 18  2019 dash
+  -rwxr-xr-x 1 root root   97136 Mar  1  2019 date
+  -rwxr-xr-x 1 root root   76736 Mar  1  2019 dd
+  -rwxr-xr-x 1 root root   93752 Mar  1  2019 df
+  -rwxr-xr-x 1 root root  138848 Mar  1  2019 dir
+  -rwxr-xr-x 1 root root   75984 Jan 10  2019 dmesg
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 domainname -> hostname
+  -rwxr-xr-x 1 root root   31368 Mar  1  2019 echo
+  -rwxr-xr-x 1 root root      28 Jan  8  2019 egrep
+  -rwxr-xr-x 1 root root   27256 Mar  1  2019 false
+  -rwxr-xr-x 1 root root      28 Jan  8  2019 fgrep
+  -rwxr-xr-x 1 root root   68792 Jan 10  2019 findmnt
+  -rwsr-xr-x 1 root root   34824 Apr 23  2020 fusermount
+  -rwxr-xr-x 1 root root  174304 Jan  8  2019 grep
+  -rwxr-xr-x 2 root root    2345 Jan  6  2019 gunzip
+  -rwxr-xr-x 1 root root    6375 Jan  6  2019 gzexe
+  -rwxr-xr-x 1 root root   89656 Jan  6  2019 gzip
+  -rwxr-xr-x 1 root root   18440 Sep 27  2018 hostname
+  -rwxr-xr-x 1 root root   64472 Mar  1  2019 ln
+  -rwxr-xr-x 1 root root   52544 Jul 27  2018 login
+  -rwxr-xr-x 1 root root  138848 Mar  1  2019 ls
+  -rwxr-xr-x 1 root root  108552 Jan 10  2019 lsblk
+  -rwxr-xr-x 1 root root   76840 Mar  1  2019 mkdir
+  -rwxr-xr-x 1 root root   64480 Mar  1  2019 mknod
+  -rwxr-xr-x 1 root root   39736 Mar  1  2019 mktemp
+  -rwxr-xr-x 1 root root   38840 Jan 10  2019 more
+  -rwsr-xr-x 1 root root   47112 Jan 10  2019 mount
+  -rwxr-xr-x 1 root root   14344 Jan 10  2019 mountpoint
+  -rwxr-xr-x 1 root root  138736 Mar  1  2019 mv
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root      14 Feb 15  2019 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root   35560 Mar  1  2019 pwd
+  lrwxrwxrwx 1 root root       4 Apr 18  2019 rbash -> bash
+  -rwxr-xr-x 1 root root   43712 Mar  1  2019 readlink
+  -rwxr-xr-x 1 root root   68440 Mar  1  2019 rm
+  -rwxr-xr-x 1 root root   39624 Mar  1  2019 rmdir
+  -rwxr-xr-x 1 root root   19144 Jan 22  2019 run-parts
+  -rwxr-xr-x 1 root root  114016 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root       4 Sep 14 02:31 sh -> bash
+  lrwxrwxrwx 1 root root       4 Sep 12 04:48 sh.distrib -> dash
+  -rwxr-xr-x 1 root root   31384 Mar  1  2019 sleep
+  -rwxr-xr-x 1 root root   72480 Mar  1  2019 stty
+  -rwsr-xr-x 1 root root   59424 Jan 10  2019 su
+  -rwxr-xr-x 1 root root   31416 Mar  1  2019 sync
+  -rwxr-xr-x 1 root root  449416 Apr 24  2019 tar
+  -rwxr-xr-x 1 root root   10560 Jan 22  2019 tempfile
+  -rwxr-xr-x 1 root root   88968 Mar  1  2019 touch
+  -rwxr-xr-x 1 root root   27256 Mar  1  2019 true
+  -rwxr-xr-x 1 root root   14264 Apr 23  2020 ulockmgr_server
+  -rwsr-xr-x 1 root root   30728 Jan 10  2019 umount
+  -rwxr-xr-x 1 root root   31384 Mar  1  2019 uname
+  -rwxr-xr-x 2 root root    2345 Jan  6  2019 uncompress
+  -rwxr-xr-x 1 root root  138848 Mar  1  2019 vdir
+  -rwxr-xr-x 1 root root   34824 Jan 10  2019 wdctl
+  -rwxr-xr-x 1 root root     946 Jan 22  2019 which
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root    1983 Jan  6  2019 zcat
+  -rwxr-xr-x 1 root root    1677 Jan  6  2019 zcmp
+  -rwxr-xr-x 1 root root    5879 Jan  6  2019 zdiff
+  -rwxr-xr-x 1 root root      29 Jan  6  2019 zegrep
+  -rwxr-xr-x 1 root root      29 Jan  6  2019 zfgrep
+  -rwxr-xr-x 1 root root    2080 Jan  6  2019 zforce
+  -rwxr-xr-x 1 root root    7584 Jan  6  2019 zgrep
+  -rwxr-xr-x 1 root root    2205 Jan  6  2019 zless
+  -rwxr-xr-x 1 root root    1841 Jan  6  2019 zmore
+  -rwxr-xr-x 1 root root    4552 Jan  6  2019 znew
+I: user script /srv/workspace/pbuilder/29509/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -253,7 +287,7 @@
 Get: 43 http://deb.debian.org/debian buster/main arm64 libexpat1 arm64 2.2.6-2+deb10u1 [85.4 kB]
 Get: 44 http://deb.debian.org/debian buster/main arm64 libexpat1-dev arm64 2.2.6-2+deb10u1 [128 kB]
 Get: 45 http://deb.debian.org/debian buster/main arm64 libgtest-dev arm64 1.8.1-3 [218 kB]
-Fetched 29.2 MB in 2s (19.0 MB/s)
+Fetched 29.2 MB in 1s (23.4 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libbsd0:arm64.
 (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 ... 19168 files and directories currently installed.)
@@ -457,7 +491,7 @@
 fakeroot is already the newest version (1.23-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/thin-provisioning-tools-0.7.6/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b
+I: Running cd /build/thin-provisioning-tools-0.7.6/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b
 dpkg-buildpackage: info: source package thin-provisioning-tools
 dpkg-buildpackage: info: source version 0.7.6-2.1
 dpkg-buildpackage: info: source distribution unstable
@@ -579,20 +613,20 @@
 	make -j8
 make[1]: Entering directory '/build/thin-provisioning-tools-0.7.6'
     [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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [CXX] base/base64.cc
+    [CXX] base/application.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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/base64.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [CXX] base/grid_layout.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [CXX] base/grid_layout.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o base/grid_layout.o base/grid_layout.cc
     [DEP] base/error_state.cc
 g++ -MM -MT base/error_state.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  base/error_state.cc > base/error_state.$$; \
@@ -606,16 +640,16 @@
 rm -f base/endian_utils.$$
     [CXX] base/progress_monitor.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o base/progress_monitor.o base/progress_monitor.cc
-    [DEP] base/output_file_requirements.cc
-g++ -MM -MT base/output_file_requirements.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  base/output_file_requirements.cc > base/output_file_requirements.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/output_file_requirements : Makefile ,g' < base/output_file_requirements.$$ > base/output_file_requirements.d; \
-rm -f base/output_file_requirements.$$
     [DEP] base/error_string.cc
 g++ -MM -MT base/error_string.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  base/error_string.cc > base/error_string.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/error_string : Makefile ,g' < base/error_string.$$ > base/error_string.d; \
 rm -f base/error_string.$$
     [CXX] base/rolling_hash.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o base/rolling_hash.o base/rolling_hash.cc
+    [DEP] base/output_file_requirements.cc
+g++ -MM -MT base/output_file_requirements.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  base/output_file_requirements.cc > base/output_file_requirements.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/output_file_requirements : Makefile ,g' < base/output_file_requirements.$$ > base/output_file_requirements.d; \
+rm -f base/output_file_requirements.$$
     [CXX] base/xml_utils.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o base/xml_utils.o base/xml_utils.cc
     [DEP] base/file_utils.cc
@@ -630,52 +664,52 @@
 rm -f base/progress_monitor.$$
     [CXX] block-cache/copier.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] base/grid_layout.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] base/rolling_hash.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
-    [DEP] base/base64.cc
-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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
-    [CXX] block-cache/io_engine.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] base/application.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  base/application.cc > base/application.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/application : Makefile ,g' < base/application.$$ > base/application.d; \
-rm -f base/application.$$
-    [CXX] block-cache/mem_pool.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [DEP] base/grid_layout.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] base/disk_units.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [CXX] block-cache/io_engine.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [CXX] caching/cache_check.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [CXX] caching/cache_dump.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/cache_dump.o caching/cache_dump.cc
-    [CXX] caching/cache_metadata_size.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/cache_metadata_size.o caching/cache_metadata_size.cc
-    [DEP] base/xml_utils.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [DEP] base/application.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  base/application.cc > base/application.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo base/application : Makefile ,g' < base/application.$$ > base/application.d; \
+rm -f base/application.$$
+    [DEP] base/base64.cc
+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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] block-cache/copier.cc
 g++ -MM -MT block-cache/copier.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  block-cache/copier.cc > block-cache/copier.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo block-cache/copier : Makefile ,g' < block-cache/copier.$$ > block-cache/copier.d; \
 rm -f block-cache/copier.$$
+    [CXX] caching/cache_dump.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/cache_dump.o caching/cache_dump.cc
+    [CXX] caching/cache_metadata_size.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/cache_metadata_size.o caching/cache_metadata_size.cc
+    [CXX] caching/cache_repair.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/cache_repair.o caching/cache_repair.cc
     [DEP] block-cache/mem_pool.cc
 g++ -MM -MT block-cache/mem_pool.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  block-cache/mem_pool.cc > block-cache/mem_pool.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo block-cache/mem_pool : Makefile ,g' < block-cache/mem_pool.$$ > block-cache/mem_pool.d; \
 rm -f block-cache/mem_pool.$$
-    [CXX] caching/cache_repair.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/cache_repair.o caching/cache_repair.cc
     [CXX] caching/cache_restore.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [DEP] base/xml_utils.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] block-cache/io_engine.cc
@@ -690,28 +724,28 @@
 rm -f block-cache/block_cache.$$
     [CXX] caching/hint_array.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/hint_array.o caching/hint_array.cc
-    [DEP] caching/cache_dump.cc
-g++ -MM -MT caching/cache_dump.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/cache_dump.cc > caching/cache_dump.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_dump : Makefile ,g' < caching/cache_dump.$$ > caching/cache_dump.d; \
-rm -f caching/cache_dump.$$
-    [CXX] caching/mapping_array.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/mapping_array.o caching/mapping_array.cc
     [DEP] caching/cache_repair.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
-    [DEP] caching/cache_metadata_size.cc
-g++ -MM -MT caching/cache_metadata_size.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/cache_metadata_size.cc > caching/cache_metadata_size.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_metadata_size : Makefile ,g' < caching/cache_metadata_size.$$ > caching/cache_metadata_size.d; \
-rm -f caching/cache_metadata_size.$$
+    [DEP] caching/cache_dump.cc
+g++ -MM -MT caching/cache_dump.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/cache_dump.cc > caching/cache_dump.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_dump : Makefile ,g' < caching/cache_dump.$$ > caching/cache_dump.d; \
+rm -f caching/cache_dump.$$
     [DEP] caching/commands.cc
 g++ -MM -MT caching/commands.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/commands.cc > caching/commands.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/commands : Makefile ,g' < caching/commands.$$ > caching/commands.d; \
 rm -f caching/commands.$$
+    [CXX] caching/mapping_array.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/mapping_array.o caching/mapping_array.cc
     [CXX] caching/metadata.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/metadata.o caching/metadata.cc
     [CXX] caching/metadata_dump.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/metadata_dump.o caching/metadata_dump.cc
+    [DEP] caching/cache_metadata_size.cc
+g++ -MM -MT caching/cache_metadata_size.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/cache_metadata_size.cc > caching/cache_metadata_size.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_metadata_size : Makefile ,g' < caching/cache_metadata_size.$$ > caching/cache_metadata_size.d; \
+rm -f caching/cache_metadata_size.$$
     [CXX] caching/restore_emitter.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] caching/cache_check.cc
@@ -720,52 +754,52 @@
 rm -f caching/cache_check.$$
     [CXX] caching/superblock.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/superblock.o caching/superblock.cc
-    [DEP] caching/cache_restore.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/cache_restore.cc > caching/cache_restore.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_restore : Makefile ,g' < caching/cache_restore.$$ > caching/cache_restore.d; \
-rm -f caching/cache_restore.$$
     [DEP] caching/metadata_dump.cc
 g++ -MM -MT caching/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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/metadata_dump.cc > caching/metadata_dump.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/metadata_dump : Makefile ,g' < caching/metadata_dump.$$ > caching/metadata_dump.d; \
 rm -f caching/metadata_dump.$$
     [CXX] caching/xml_format.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o caching/xml_format.o caching/xml_format.cc
+    [DEP] caching/cache_restore.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/cache_restore.cc > caching/cache_restore.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/cache_restore : Makefile ,g' < caching/cache_restore.$$ > caching/cache_restore.d; \
+rm -f caching/cache_restore.$$
     [CXX] era/commands.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o era/commands.o era/commands.cc
-    [DEP] caching/cache_writeback.cc
-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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
-    [CXX] era/era_array.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [DEP] caching/metadata.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] era/commands.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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_array.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [CXX] era/era_check.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] caching/metadata.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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_detail.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] caching/mapping_array.cc
-g++ -MM -MT caching/mapping_array.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/mapping_array.cc > caching/mapping_array.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/mapping_array : Makefile ,g' < caching/mapping_array.$$ > caching/mapping_array.d; \
-rm -f caching/mapping_array.$$
+    [DEP] caching/cache_writeback.cc
+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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] caching/restore_emitter.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/restore_emitter.cc > caching/restore_emitter.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/restore_emitter : Makefile ,g' < caching/restore_emitter.$$ > caching/restore_emitter.d; \
 rm -f caching/restore_emitter.$$
-    [CXX] era/era_dump.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [CXX] era/era_detail.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] caching/superblock.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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_dump.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [CXX] era/era_invalidate.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [DEP] caching/mapping_array.cc
+g++ -MM -MT caching/mapping_array.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/mapping_array.cc > caching/mapping_array.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/mapping_array : Makefile ,g' < caching/mapping_array.$$ > caching/mapping_array.d; \
+rm -f caching/mapping_array.$$
     [CXX] era/era_restore.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o era/era_restore.o era/era_restore.cc
     [DEP] era/era_detail.cc
@@ -778,30 +812,30 @@
 g++ -MM -MT caching/hint_array.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  caching/hint_array.cc > caching/hint_array.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo caching/hint_array : Makefile ,g' < caching/hint_array.$$ > caching/hint_array.d; \
 rm -f caching/hint_array.$$
-    [DEP] era/era_dump.cc
-g++ -MM -MT era/era_dump.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  era/era_dump.cc > era/era_dump.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/era_dump : Makefile ,g' < era/era_dump.$$ > era/era_dump.d; \
-rm -f era/era_dump.$$
     [CXX] era/metadata_dump.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o era/metadata_dump.o era/metadata_dump.cc
-    [CXX] era/restore_emitter.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o era/restore_emitter.o era/restore_emitter.cc
     [DEP] caching/xml_format.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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/restore_emitter.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o era/restore_emitter.o era/restore_emitter.cc
+    [DEP] era/era_dump.cc
+g++ -MM -MT era/era_dump.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  era/era_dump.cc > era/era_dump.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/era_dump : Makefile ,g' < era/era_dump.$$ > era/era_dump.d; \
+rm -f era/era_dump.$$
     [CXX] era/superblock.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o era/superblock.o era/superblock.cc
-    [DEP] era/era_array.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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/writeset_tree.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] era/era_check.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  era/era_check.cc > era/era_check.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/era_check : Makefile ,g' < era/era_check.$$ > era/era_check.d; \
 rm -f era/era_check.$$
+    [CXX] era/writeset_tree.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [DEP] era/era_array.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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/xml_format.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o era/xml_format.o era/xml_format.cc
     [DEP] era/era_restore.cc
@@ -810,140 +844,140 @@
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o main.o main.cc
-    [DEP] era/era_invalidate.cc
-g++ -MM -MT era/era_invalidate.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  era/era_invalidate.cc > era/era_invalidate.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/era_invalidate : Makefile ,g' < era/era_invalidate.$$ > era/era_invalidate.d; \
-rm -f era/era_invalidate.$$
     [DEP] era/metadata_dump.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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] persistent-data/checksum.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] persistent-data/checksum.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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/bloom_filter.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] era/metadata.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  era/metadata.cc > era/metadata.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/metadata : Makefile ,g' < era/metadata.$$ > era/metadata.d; \
-rm -f era/metadata.$$
+    [CXX] persistent-data/data-structures/bitset.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [DEP] era/era_invalidate.cc
+g++ -MM -MT era/era_invalidate.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  era/era_invalidate.cc > era/era_invalidate.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/era_invalidate : Makefile ,g' < era/era_invalidate.$$ > era/era_invalidate.d; \
+rm -f era/era_invalidate.$$
     [DEP] main.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [CXX] persistent-data/data-structures/btree_node_checker.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o persistent-data/data-structures/btree_node_checker.o persistent-data/data-structures/btree_node_checker.cc
     [DEP] era/superblock.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [DEP] era/metadata.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  era/metadata.cc > era/metadata.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/metadata : Makefile ,g' < era/metadata.$$ > era/metadata.d; \
+rm -f era/metadata.$$
+    [CXX] persistent-data/data-structures/btree_node_checker.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o persistent-data/data-structures/btree_node_checker.o persistent-data/data-structures/btree_node_checker.cc
     [CXX] persistent-data/error_set.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] era/xml_format.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
-    [DEP] persistent-data/data-structures/bloom_filter.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/data-structures/bloom_filter : Makefile ,g' < persistent-data/data-structures/bloom_filter.$$ > persistent-data/data-structures/bloom_filter.d; \
-rm -f persistent-data/data-structures/bloom_filter.$$
     [DEP] persistent-data/data-structures/btree.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [DEP] persistent-data/data-structures/bloom_filter.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/data-structures/bloom_filter : Makefile ,g' < persistent-data/data-structures/bloom_filter.$$ > persistent-data/data-structures/bloom_filter.d; \
+rm -f persistent-data/data-structures/bloom_filter.$$
     [CXX] persistent-data/file_utils.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] persistent-data/data-structures/btree_node_checker.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/data-structures/btree_node_checker : Makefile ,g' < persistent-data/data-structures/btree_node_checker.$$ > persistent-data/data-structures/btree_node_checker.d; \
-rm -f persistent-data/data-structures/btree_node_checker.$$
+    [DEP] era/xml_format.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] era/writeset_tree.cc
 g++ -MM -MT era/writeset_tree.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  era/writeset_tree.cc > era/writeset_tree.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo era/writeset_tree : Makefile ,g' < era/writeset_tree.$$ > era/writeset_tree.d; \
 rm -f era/writeset_tree.$$
-    [CXX] persistent-data/space-maps/disk.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] era/restore_emitter.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [CXX] persistent-data/space-maps/disk.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [CXX] persistent-data/space-maps/recursive.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] persistent-data/hex_dump.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [CXX] persistent-data/space_map.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [CXX] persistent-data/transaction_manager.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o persistent-data/transaction_manager.o persistent-data/transaction_manager.cc
+    [DEP] persistent-data/data-structures/btree_node_checker.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/data-structures/btree_node_checker : Makefile ,g' < persistent-data/data-structures/btree_node_checker.$$ > persistent-data/data-structures/btree_node_checker.d; \
+rm -f persistent-data/data-structures/btree_node_checker.$$
     [DEP] persistent-data/error_set.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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/transaction_manager.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o persistent-data/transaction_manager.o persistent-data/transaction_manager.cc
     [CXX] persistent-data/validators.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] persistent-data/file_utils.cc
-g++ -MM -MT persistent-data/file_utils.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  persistent-data/file_utils.cc > persistent-data/file_utils.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/file_utils : Makefile ,g' < persistent-data/file_utils.$$ > persistent-data/file_utils.d; \
-rm -f persistent-data/file_utils.$$
-    [CXX] thin-provisioning/commands.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] persistent-data/space_map.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
-    [CXX] thin-provisioning/cache_stream.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/cache_stream.o thin-provisioning/cache_stream.cc
-    [DEP] persistent-data/space-maps/careful_alloc.cc
-g++ -MM -MT persistent-data/space-maps/careful_alloc.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  persistent-data/space-maps/careful_alloc.cc > persistent-data/space-maps/careful_alloc.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/space-maps/careful_alloc : Makefile ,g' < persistent-data/space-maps/careful_alloc.$$ > persistent-data/space-maps/careful_alloc.d; \
-rm -f persistent-data/space-maps/careful_alloc.$$
+    [CXX] thin-provisioning/commands.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [DEP] persistent-data/file_utils.cc
+g++ -MM -MT persistent-data/file_utils.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  persistent-data/file_utils.cc > persistent-data/file_utils.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/file_utils : Makefile ,g' < persistent-data/file_utils.$$ > persistent-data/file_utils.d; \
+rm -f persistent-data/file_utils.$$
     [DEP] persistent-data/validators.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  persistent-data/validators.cc > persistent-data/validators.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/validators : Makefile ,g' < persistent-data/validators.$$ > persistent-data/validators.d; \
 rm -f persistent-data/validators.$$
+    [CXX] thin-provisioning/cache_stream.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/cache_stream.o thin-provisioning/cache_stream.cc
     [CXX] thin-provisioning/chunk_stream.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] persistent-data/transaction_manager.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [DEP] persistent-data/space-maps/careful_alloc.cc
+g++ -MM -MT persistent-data/space-maps/careful_alloc.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  persistent-data/space-maps/careful_alloc.cc > persistent-data/space-maps/careful_alloc.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/space-maps/careful_alloc : Makefile ,g' < persistent-data/space-maps/careful_alloc.$$ > persistent-data/space-maps/careful_alloc.d; \
+rm -f persistent-data/space-maps/careful_alloc.$$
     [CXX] thin-provisioning/device_tree.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [CXX] thin-provisioning/fixed_chunk_stream.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/fixed_chunk_stream.o thin-provisioning/fixed_chunk_stream.cc
-    [DEP] thin-provisioning/commands.cc
-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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
-    [CXX] thin-provisioning/human_readable_format.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/human_readable_format.o thin-provisioning/human_readable_format.cc
     [DEP] thin-provisioning/chunk_stream.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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/human_readable_format.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/human_readable_format.o thin-provisioning/human_readable_format.cc
+    [DEP] thin-provisioning/commands.cc
+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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [CXX] thin-provisioning/mapping_tree.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
-    [DEP] thin-provisioning/cache_stream.cc
-g++ -MM -MT thin-provisioning/cache_stream.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/cache_stream.cc > thin-provisioning/cache_stream.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/cache_stream : Makefile ,g' < thin-provisioning/cache_stream.$$ > thin-provisioning/cache_stream.d; \
-rm -f thin-provisioning/cache_stream.$$
     [DEP] thin-provisioning/fixed_chunk_stream.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [DEP] thin-provisioning/cache_stream.cc
+g++ -MM -MT thin-provisioning/cache_stream.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/cache_stream.cc > thin-provisioning/cache_stream.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/cache_stream : Makefile ,g' < thin-provisioning/cache_stream.$$ > thin-provisioning/cache_stream.d; \
+rm -f thin-provisioning/cache_stream.$$
     [CXX] thin-provisioning/metadata.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
@@ -953,8 +987,8 @@
 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/metadata_counter.cc
-    [DEP] thin-provisioning/human_readable_format.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/metadata_counter.o thin-provisioning/metadata_counter.cc
+    [DEP] thin-provisioning/human_readable_format.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
@@ -964,54 +998,54 @@
 g++ -MM -MT persistent-data/space-maps/recursive.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  persistent-data/space-maps/recursive.cc > persistent-data/space-maps/recursive.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/space-maps/recursive : Makefile ,g' < persistent-data/space-maps/recursive.$$ > persistent-data/space-maps/recursive.d; \
 rm -f persistent-data/space-maps/recursive.$$
-    [CXX] thin-provisioning/pool_stream.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/pool_stream.o thin-provisioning/pool_stream.cc
     [DEP] thin-provisioning/metadata_checker.cc
 g++ -MM -MT thin-provisioning/metadata_checker.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/metadata_checker.cc > thin-provisioning/metadata_checker.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/metadata_checker : Makefile ,g' < thin-provisioning/metadata_checker.$$ > thin-provisioning/metadata_checker.d; \
 rm -f thin-provisioning/metadata_checker.$$
+    [CXX] thin-provisioning/pool_stream.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/pool_stream.o thin-provisioning/pool_stream.cc
     [CXX] thin-provisioning/restore_emitter.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/restore_emitter.o thin-provisioning/restore_emitter.cc
-    [DEP] persistent-data/space-maps/disk.cc
-g++ -MM -MT persistent-data/space-maps/disk.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  persistent-data/space-maps/disk.cc > persistent-data/space-maps/disk.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/space-maps/disk : Makefile ,g' < persistent-data/space-maps/disk.$$ > persistent-data/space-maps/disk.d; \
-rm -f persistent-data/space-maps/disk.$$
     [DEP] thin-provisioning/device_tree.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/device_tree : Makefile ,g' < thin-provisioning/device_tree.$$ > thin-provisioning/device_tree.d; \
 rm -f thin-provisioning/device_tree.$$
     [CXX] thin-provisioning/rmap_visitor.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/rmap_visitor.o thin-provisioning/rmap_visitor.cc
+    [DEP] thin-provisioning/metadata_dumper.cc
+g++ -MM -MT thin-provisioning/metadata_dumper.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/metadata_dumper.cc > thin-provisioning/metadata_dumper.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/metadata_dumper : Makefile ,g' < thin-provisioning/metadata_dumper.$$ > thin-provisioning/metadata_dumper.d; \
+rm -f thin-provisioning/metadata_dumper.$$
     [CXX] thin-provisioning/superblock.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/superblock.o thin-provisioning/superblock.cc
     [DEP] thin-provisioning/metadata.cc
 g++ -MM -MT thin-provisioning/metadata.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/metadata.cc > thin-provisioning/metadata.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/metadata : Makefile ,g' < thin-provisioning/metadata.$$ > thin-provisioning/metadata.d; \
 rm -f thin-provisioning/metadata.$$
+    [DEP] persistent-data/space-maps/disk.cc
+g++ -MM -MT persistent-data/space-maps/disk.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  persistent-data/space-maps/disk.cc > persistent-data/space-maps/disk.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo persistent-data/space-maps/disk : Makefile ,g' < persistent-data/space-maps/disk.$$ > persistent-data/space-maps/disk.d; \
+rm -f persistent-data/space-maps/disk.$$
     [CXX] thin-provisioning/thin_check.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_check.o thin-provisioning/thin_check.cc
-    [DEP] thin-provisioning/metadata_dumper.cc
-g++ -MM -MT thin-provisioning/metadata_dumper.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/metadata_dumper.cc > thin-provisioning/metadata_dumper.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/metadata_dumper : Makefile ,g' < thin-provisioning/metadata_dumper.$$ > thin-provisioning/metadata_dumper.d; \
-rm -f thin-provisioning/metadata_dumper.$$
     [CXX] thin-provisioning/thin_delta.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_delta.o thin-provisioning/thin_delta.cc
     [DEP] thin-provisioning/metadata_counter.cc
 g++ -MM -MT thin-provisioning/metadata_counter.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/metadata_counter.cc > thin-provisioning/metadata_counter.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/metadata_counter : Makefile ,g' < thin-provisioning/metadata_counter.$$ > thin-provisioning/metadata_counter.d; \
 rm -f thin-provisioning/metadata_counter.$$
-    [CXX] thin-provisioning/thin_dump.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_dump.o thin-provisioning/thin_dump.cc
-    [DEP] thin-provisioning/superblock.cc
-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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] thin-provisioning/rmap_visitor.cc
 g++ -MM -MT thin-provisioning/rmap_visitor.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/rmap_visitor.cc > thin-provisioning/rmap_visitor.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/rmap_visitor : Makefile ,g' < thin-provisioning/rmap_visitor.$$ > thin-provisioning/rmap_visitor.d; \
 rm -f thin-provisioning/rmap_visitor.$$
+    [CXX] thin-provisioning/thin_dump.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_dump.o thin-provisioning/thin_dump.cc
     [CXX] thin-provisioning/thin_ls.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_ls.o thin-provisioning/thin_ls.cc
+    [DEP] thin-provisioning/superblock.cc
+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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
     [DEP] thin-provisioning/pool_stream.cc
@@ -1026,6 +1060,18 @@
 rm -f thin-provisioning/thin_metadata_size.$$
     [CXX] thin-provisioning/thin_repair.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_repair.o thin-provisioning/thin_repair.cc
+    [DEP] thin-provisioning/restore_emitter.cc
+g++ -MM -MT thin-provisioning/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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/restore_emitter.cc > thin-provisioning/restore_emitter.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/restore_emitter : Makefile ,g' < thin-provisioning/restore_emitter.$$ > thin-provisioning/restore_emitter.d; \
+rm -f thin-provisioning/restore_emitter.$$
+    [DEP] thin-provisioning/thin_dump.cc
+g++ -MM -MT thin-provisioning/thin_dump.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/thin_dump.cc > thin-provisioning/thin_dump.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_dump : Makefile ,g' < thin-provisioning/thin_dump.$$ > thin-provisioning/thin_dump.d; \
+rm -f thin-provisioning/thin_dump.$$
+    [CXX] thin-provisioning/thin_restore.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_restore.o thin-provisioning/thin_restore.cc
+    [CXX] thin-provisioning/thin_rmap.cc
+g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_rmap.o thin-provisioning/thin_rmap.cc
 In file included from ./persistent-data/data-structures/btree.h:420,
                  from ./persistent-data/data-structures/btree_counter.h:4,
                  from thin-provisioning/thin_check.cc:32:
@@ -1036,22 +1082,10 @@
 thin-provisioning/thin_check.cc:335:8: note: '*((void*)& fs +16)' was declared here
   flags fs;
         ^~
-    [DEP] thin-provisioning/restore_emitter.cc
-g++ -MM -MT thin-provisioning/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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/restore_emitter.cc > thin-provisioning/restore_emitter.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/restore_emitter : Makefile ,g' < thin-provisioning/restore_emitter.$$ > thin-provisioning/restore_emitter.d; \
-rm -f thin-provisioning/restore_emitter.$$
-    [CXX] thin-provisioning/thin_restore.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_restore.o thin-provisioning/thin_restore.cc
-    [DEP] thin-provisioning/thin_dump.cc
-g++ -MM -MT thin-provisioning/thin_dump.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/thin_dump.cc > thin-provisioning/thin_dump.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_dump : Makefile ,g' < thin-provisioning/thin_dump.$$ > thin-provisioning/thin_dump.d; \
-rm -f thin-provisioning/thin_dump.$$
     [DEP] thin-provisioning/mapping_tree.cc
 g++ -MM -MT thin-provisioning/mapping_tree.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/mapping_tree.cc > thin-provisioning/mapping_tree.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/mapping_tree : Makefile ,g' < thin-provisioning/mapping_tree.$$ > thin-provisioning/mapping_tree.d; \
 rm -f thin-provisioning/mapping_tree.$$
-    [CXX] thin-provisioning/thin_rmap.cc
-g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_rmap.o thin-provisioning/thin_rmap.cc
     [CXX] thin-provisioning/thin_trim.cc
 g++ -c -I. -I. -I./thin-provisioning -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -o thin-provisioning/thin_trim.o thin-provisioning/thin_trim.cc
     [DEP] thin-provisioning/thin_check.cc
@@ -1066,22 +1100,26 @@
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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
+    [DEP] thin-provisioning/shared_library_emitter.cc
+g++ -MM -MT thin-provisioning/shared_library_emitter.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/shared_library_emitter.cc > thin-provisioning/shared_library_emitter.$$; \
+sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/shared_library_emitter : Makefile ,g' < thin-provisioning/shared_library_emitter.$$ > thin-provisioning/shared_library_emitter.d; \
+rm -f thin-provisioning/shared_library_emitter.$$
     [DEP] thin-provisioning/thin_restore.cc
-    [DEP] thin-provisioning/thin_trim.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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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_trim.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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 -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -Wdate-time -D_FORTIFY_SOURCE=2  -c -o ft-lib/bcache.o ft-lib/bcache.c
 gcc -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -Wdate-time -D_FORTIFY_SOURCE=2  -c -o ft-lib/crc32c.o ft-lib/crc32c.c
 gcc -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -Wdate-time -D_FORTIFY_SOURCE=2  -c -o ft-lib/dm-ioctl.o ft-lib/dm-ioctl.c
-    [DEP] thin-provisioning/shared_library_emitter.cc
-g++ -MM -MT thin-provisioning/shared_library_emitter.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/shared_library_emitter.cc > thin-provisioning/shared_library_emitter.$$; \
-sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/shared_library_emitter : Makefile ,g' < thin-provisioning/shared_library_emitter.$$ > thin-provisioning/shared_library_emitter.d; \
-rm -f thin-provisioning/shared_library_emitter.$$
 gcc -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -shared -o lib/libft.so ft-lib/bcache.o ft-lib/crc32c.o ft-lib/dm-ioctl.o -laio
+    [DEP] thin-provisioning/thin_trim.cc
+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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [DEP] thin-provisioning/thin_ls.cc
+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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] thin-provisioning/thin_delta.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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; \
@@ -1090,18 +1128,14 @@
 g++ -MM -MT thin-provisioning/thin_pool.o -I. -I. -I./thin-provisioning -I. -Igoogletest/googlemock/include -Igoogletest/googletest/include -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  thin-provisioning/thin_pool.cc > thin-provisioning/thin_pool.$$; \
 sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo thin-provisioning/thin_pool : Makefile ,g' < thin-provisioning/thin_pool.$$ > thin-provisioning/thin_pool.d; \
 rm -f thin-provisioning/thin_pool.$$
-    [DEP] thin-provisioning/xml_format.cc
-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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
-    [DEP] thin-provisioning/thin_ls.cc
-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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [DEP] thin-provisioning/thin_rmap.cc
 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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
+    [DEP] thin-provisioning/xml_format.cc
+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.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -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.$$
     [LD]  bin/pdata_tools
 g++ -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -g -Wall -fPIC -fno-strict-aliasing -g -O2 -ffile-prefix-map=/build/thin-provisioning-tools-0.7.6=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -DSTRERROR_R_CHAR_P  -Wl,-z,relro -o bin/pdata_tools base/output_file_requirements.o base/application.o base/base64.o base/disk_units.o base/endian_utils.o base/error_state.o base/error_string.o base/grid_layout.o base/file_utils.o base/progress_monitor.o base/rolling_hash.o base/xml_utils.o block-cache/block_cache.o block-cache/copier.o block-cache/io_engine.o block-cache/mem_pool.o caching/cache_check.o caching/cache_dump.o caching/cache_metadata_size.o caching/cache_repair.o caching/cache_restore.o caching/cache_writeback.o caching/commands.o caching/hint_array.o caching/mapping_array.o caching/metadata.o caching/metadata_dump.o caching/restore_emitter.o caching/superblock.o caching/xml_format.o era/commands.o era/era_array.o era/era_check.o era/era_detail.o era/era_dump.o era/era_invalidate.o era/era_restore.o era/metadata.o era/metadata_dump.o era/restore_emitter.o era/superblock.o era/writeset_tree.o era/xml_format.o main.o persistent-data/checksum.o persistent-data/data-structures/bitset.o persistent-data/data-structures/bloom_filter.o persistent-data/data-structures/btree.o persistent-data/data-structures/btree_node_checker.o persistent-data/error_set.o persistent-data/file_utils.o persistent-data/hex_dump.o persistent-data/space-maps/careful_alloc.o persistent-data/space-maps/disk.o persistent-data/space-maps/recursive.o persistent-data/space_map.o persistent-data/transaction_manager.o persistent-data/validators.o thin-provisioning/commands.o thin-provisioning/cache_stream.o thin-provisioning/chunk_stream.o thin-provisioning/device_tree.o thin-provisioning/fixed_chunk_stream.o thin-provisioning/human_readable_format.o thin-provisioning/mapping_tree.o thin-provisioning/metadata.o thin-provisioning/metadata_checker.o thin-provisioning/metadata_counter.o thin-provisioning/metadata_dumper.o thin-provisioning/pool_stream.o thin-provisioning/restore_emitter.o thin-provisioning/rmap_visitor.o thin-provisioning/superblock.o thin-provisioning/thin_check.o thin-provisioning/thin_delta.o thin-provisioning/thin_dump.o thin-provisioning/thin_ls.o thin-provisioning/thin_metadata_size.o thin-provisioning/thin_pool.o thin-provisioning/thin_repair.o thin-provisioning/thin_restore.o thin-provisioning/thin_rmap.o thin-provisioning/thin_trim.o thin-provisioning/xml_format.o thin-provisioning/shared_library_emitter.o -laio -lexpat -ldl 
 make[1]: Leaving directory '/build/thin-provisioning-tools-0.7.6'
@@ -1283,37 +1317,37 @@
 [----------] Global test environment set-up.
 [----------] 7 tests from ArrayBlockTests
 [ RUN      ] ArrayBlockTests.can_create_an_empty_array
-[       OK ] ArrayBlockTests.can_create_an_empty_array (66 ms)
+[       OK ] ArrayBlockTests.can_create_an_empty_array (105 ms)
 [ RUN      ] ArrayBlockTests.read_only_array_blocks_are_possible
-[       OK ] ArrayBlockTests.read_only_array_blocks_are_possible (48 ms)
+[       OK ] ArrayBlockTests.read_only_array_blocks_are_possible (108 ms)
 [ RUN      ] ArrayBlockTests.updating_reopened_array_block
-[       OK ] ArrayBlockTests.updating_reopened_array_block (44 ms)
+[       OK ] ArrayBlockTests.updating_reopened_array_block (140 ms)
 [ RUN      ] ArrayBlockTests.growing
-[       OK ] ArrayBlockTests.growing (60 ms)
+[       OK ] ArrayBlockTests.growing (128 ms)
 [ RUN      ] ArrayBlockTests.grow_does_not_touch_existing_values
-[       OK ] ArrayBlockTests.grow_does_not_touch_existing_values (36 ms)
+[       OK ] ArrayBlockTests.grow_does_not_touch_existing_values (104 ms)
 [ RUN      ] ArrayBlockTests.shrinking
-[       OK ] ArrayBlockTests.shrinking (56 ms)
+[       OK ] ArrayBlockTests.shrinking (124 ms)
 [ RUN      ] ArrayBlockTests.ref_counting
-[       OK ] ArrayBlockTests.ref_counting (44 ms)
-[----------] 7 tests from ArrayBlockTests (354 ms total)
+[       OK ] ArrayBlockTests.ref_counting (92 ms)
+[----------] 7 tests from ArrayBlockTests (801 ms total)
 
 [----------] 7 tests from ArrayTests
 [ RUN      ] ArrayTests.can_create_an_empty_array
-[       OK ] ArrayTests.can_create_an_empty_array (40 ms)
+[       OK ] ArrayTests.can_create_an_empty_array (100 ms)
 [ RUN      ] ArrayTests.get_elements
-[       OK ] ArrayTests.get_elements (104 ms)
+[       OK ] ArrayTests.get_elements (132 ms)
 [ RUN      ] ArrayTests.set_elements
-[       OK ] ArrayTests.set_elements (112 ms)
+[       OK ] ArrayTests.set_elements (152 ms)
 [ RUN      ] ArrayTests.grow
-[       OK ] ArrayTests.grow (460 ms)
+[       OK ] ArrayTests.grow (524 ms)
 [ RUN      ] ArrayTests.reopen_array
-[       OK ] ArrayTests.reopen_array (104 ms)
+[       OK ] ArrayTests.reopen_array (140 ms)
 [ RUN      ] ArrayTests.visit_values
-[       OK ] ArrayTests.visit_values (140 ms)
+[       OK ] ArrayTests.visit_values (156 ms)
 [ RUN      ] ArrayTests.visit_values_with_too_few_entries
-[       OK ] ArrayTests.visit_values_with_too_few_entries (136 ms)
-[----------] 7 tests from ArrayTests (1096 ms total)
+[       OK ] ArrayTests.visit_values_with_too_few_entries (171 ms)
+[----------] 7 tests from ArrayTests (1377 ms total)
 
 [----------] 9 tests from Base64Tests
 [ RUN      ] Base64Tests.encoding_an_empty_string
@@ -1329,160 +1363,160 @@
 [ RUN      ] Base64Tests.longer_encodings
 [       OK ] Base64Tests.longer_encodings (0 ms)
 [ RUN      ] Base64Tests.decoding_fails_with_bad_size_input
-[       OK ] Base64Tests.decoding_fails_with_bad_size_input (1 ms)
+[       OK ] Base64Tests.decoding_fails_with_bad_size_input (0 ms)
 [ RUN      ] Base64Tests.encode_decode_cycle
 [       OK ] Base64Tests.encode_decode_cycle (0 ms)
 [ RUN      ] Base64Tests.random_data
-[       OK ] Base64Tests.random_data (3557 ms)
-[----------] 9 tests from Base64Tests (3558 ms total)
+[       OK ] Base64Tests.random_data (3679 ms)
+[----------] 9 tests from Base64Tests (3679 ms total)
 
 [----------] 1 test from BCacheTests
 [ RUN      ] BCacheTests.cleaned_on_demand
-[       OK ] BCacheTests.cleaned_on_demand (62 ms)
-[----------] 1 test from BCacheTests (62 ms total)
+[       OK ] BCacheTests.cleaned_on_demand (104 ms)
+[----------] 1 test from BCacheTests (104 ms total)
 
 [----------] 18 tests from BlockTests
 [ RUN      ] BlockTests.bad_path
 [       OK ] BlockTests.bad_path (0 ms)
 [ RUN      ] BlockTests.out_of_range_access
-[       OK ] BlockTests.out_of_range_access (68 ms)
+[       OK ] BlockTests.out_of_range_access (148 ms)
 [ RUN      ] BlockTests.read_lock_all_blocks
-[       OK ] BlockTests.read_lock_all_blocks (32 ms)
+[       OK ] BlockTests.read_lock_all_blocks (148 ms)
 [ RUN      ] BlockTests.write_lock_all_blocks
-[       OK ] BlockTests.write_lock_all_blocks (52 ms)
+[       OK ] BlockTests.write_lock_all_blocks (144 ms)
 [ RUN      ] BlockTests.writes_persist
-[       OK ] BlockTests.writes_persist (1628 ms)
+[       OK ] BlockTests.writes_persist (1857 ms)
 [ RUN      ] BlockTests.write_lock_zero_zeroes
-[       OK ] BlockTests.write_lock_zero_zeroes (68 ms)
+[       OK ] BlockTests.write_lock_zero_zeroes (179 ms)
 [ RUN      ] BlockTests.different_block_sizes
-[       OK ] BlockTests.different_block_sizes (400 ms)
+[       OK ] BlockTests.different_block_sizes (580 ms)
 [ RUN      ] BlockTests.read_validator_works
-[       OK ] BlockTests.read_validator_works (48 ms)
+[       OK ] BlockTests.read_validator_works (112 ms)
 [ RUN      ] BlockTests.write_validator_works
-[       OK ] BlockTests.write_validator_works (80 ms)
+[       OK ] BlockTests.write_validator_works (124 ms)
 [ RUN      ] BlockTests.cannot_have_two_superblocks
-[       OK ] BlockTests.cannot_have_two_superblocks (44 ms)
+[       OK ] BlockTests.cannot_have_two_superblocks (104 ms)
 [ RUN      ] BlockTests.can_have_subsequent_superblocks
-[       OK ] BlockTests.can_have_subsequent_superblocks (36 ms)
+[       OK ] BlockTests.can_have_subsequent_superblocks (116 ms)
 [ RUN      ] BlockTests.superblocks_can_change_address
-[       OK ] BlockTests.superblocks_can_change_address (44 ms)
+[       OK ] BlockTests.superblocks_can_change_address (132 ms)
 [ RUN      ] BlockTests.superblock_must_be_last
-[       OK ] BlockTests.superblock_must_be_last (60 ms)
+[       OK ] BlockTests.superblock_must_be_last (120 ms)
 [ RUN      ] BlockTests.references_can_be_copied
-[       OK ] BlockTests.references_can_be_copied (40 ms)
+[       OK ] BlockTests.references_can_be_copied (156 ms)
 [ RUN      ] BlockTests.no_concurrent_write_locks
-[       OK ] BlockTests.no_concurrent_write_locks (60 ms)
+[       OK ] BlockTests.no_concurrent_write_locks (116 ms)
 [ RUN      ] BlockTests.concurrent_read_locks
-[       OK ] BlockTests.concurrent_read_locks (52 ms)
+[       OK ] BlockTests.concurrent_read_locks (140 ms)
 [ RUN      ] BlockTests.read_then_write
-[       OK ] BlockTests.read_then_write (48 ms)
+[       OK ] BlockTests.read_then_write (120 ms)
 [ RUN      ] BlockTests.write_then_read
-[       OK ] BlockTests.write_then_read (36 ms)
-[----------] 18 tests from BlockTests (2796 ms total)
+[       OK ] BlockTests.write_then_read (120 ms)
+[----------] 18 tests from BlockTests (4416 ms total)
 
 [----------] 14 tests from ValidatorTests
 [ RUN      ] ValidatorTests.check_on_read_lock
-[       OK ] ValidatorTests.check_on_read_lock (32 ms)
+[       OK ] ValidatorTests.check_on_read_lock (120 ms)
 [ RUN      ] ValidatorTests.check_only_called_once_on_read_lock
-[       OK ] ValidatorTests.check_only_called_once_on_read_lock (32 ms)
+[       OK ] ValidatorTests.check_only_called_once_on_read_lock (95 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_read_lock
-[       OK ] ValidatorTests.validator_can_be_changed_by_read_lock (40 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_read_lock (96 ms)
 [ RUN      ] ValidatorTests.check_and_prepare_on_write_lock
-[       OK ] ValidatorTests.check_and_prepare_on_write_lock (40 ms)
+[       OK ] ValidatorTests.check_and_prepare_on_write_lock (128 ms)
 [ RUN      ] ValidatorTests.check_only_called_once_on_write_lock
-[       OK ] ValidatorTests.check_only_called_once_on_write_lock (36 ms)
+[       OK ] ValidatorTests.check_only_called_once_on_write_lock (152 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_write_lock
-[       OK ] ValidatorTests.validator_can_be_changed_by_write_lock (36 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_write_lock (128 ms)
 [ RUN      ] ValidatorTests.no_check_but_prepare_on_write_lock_zero
-[       OK ] ValidatorTests.no_check_but_prepare_on_write_lock_zero (40 ms)
+[       OK ] ValidatorTests.no_check_but_prepare_on_write_lock_zero (116 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_write_lock_zero
-[       OK ] ValidatorTests.validator_can_be_changed_by_write_lock_zero (40 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_write_lock_zero (100 ms)
 [ RUN      ] ValidatorTests.check_and_prepare_on_superblock_lock
-[       OK ] ValidatorTests.check_and_prepare_on_superblock_lock (32 ms)
+[       OK ] ValidatorTests.check_and_prepare_on_superblock_lock (112 ms)
 [ RUN      ] ValidatorTests.check_only_called_once_on_superblock_lock
-[       OK ] ValidatorTests.check_only_called_once_on_superblock_lock (40 ms)
+[       OK ] ValidatorTests.check_only_called_once_on_superblock_lock (120 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_superblock_lock
-[       OK ] ValidatorTests.validator_can_be_changed_by_superblock_lock (48 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_superblock_lock (112 ms)
 [ RUN      ] ValidatorTests.no_check_but_prepare_on_superblock_lock_zero
-[       OK ] ValidatorTests.no_check_but_prepare_on_superblock_lock_zero (44 ms)
+[       OK ] ValidatorTests.no_check_but_prepare_on_superblock_lock_zero (108 ms)
 [ RUN      ] ValidatorTests.validator_can_be_changed_by_superblock_zero
-[       OK ] ValidatorTests.validator_can_be_changed_by_superblock_zero (40 ms)
+[       OK ] ValidatorTests.validator_can_be_changed_by_superblock_zero (112 ms)
 [ RUN      ] ValidatorTests.validator_check_failure_gets_passed_up
-[       OK ] ValidatorTests.validator_check_failure_gets_passed_up (32 ms)
-[----------] 14 tests from ValidatorTests (532 ms total)
+[       OK ] ValidatorTests.validator_check_failure_gets_passed_up (104 ms)
+[----------] 14 tests from ValidatorTests (1604 ms total)
 
 [----------] 9 tests from BitsetTests
 [ RUN      ] BitsetTests.create_empty_bitset
-[       OK ] BitsetTests.create_empty_bitset (36 ms)
+[       OK ] BitsetTests.create_empty_bitset (112 ms)
 [ RUN      ] BitsetTests.grow_default_false
-[       OK ] BitsetTests.grow_default_false (128 ms)
+[       OK ] BitsetTests.grow_default_false (204 ms)
 [ RUN      ] BitsetTests.grow_default_true
-[       OK ] BitsetTests.grow_default_true (116 ms)
+[       OK ] BitsetTests.grow_default_true (196 ms)
 [ RUN      ] BitsetTests.grow_throws_if_actualy_asked_to_shrink
-[       OK ] BitsetTests.grow_throws_if_actualy_asked_to_shrink (44 ms)
+[       OK ] BitsetTests.grow_throws_if_actualy_asked_to_shrink (123 ms)
 [ RUN      ] BitsetTests.multiple_grow_calls
-[       OK ] BitsetTests.multiple_grow_calls (1124 ms)
+[       OK ] BitsetTests.multiple_grow_calls (1264 ms)
 [ RUN      ] BitsetTests.set_out_of_bounds_throws
-[       OK ] BitsetTests.set_out_of_bounds_throws (40 ms)
+[       OK ] BitsetTests.set_out_of_bounds_throws (149 ms)
 [ RUN      ] BitsetTests.set_works
-[       OK ] BitsetTests.set_works (620 ms)
+[       OK ] BitsetTests.set_works (760 ms)
 [ RUN      ] BitsetTests.reopen_works
-[       OK ] BitsetTests.reopen_works (620 ms)
+[       OK ] BitsetTests.reopen_works (747 ms)
 [ RUN      ] BitsetTests.walk_bitset
-[       OK ] BitsetTests.walk_bitset (1816 ms)
-[----------] 9 tests from BitsetTests (4544 ms total)
+[       OK ] BitsetTests.walk_bitset (1988 ms)
+[----------] 9 tests from BitsetTests (5544 ms total)
 
 [----------] 4 tests from BtreeTests
 [ RUN      ] BtreeTests.empty_btree_contains_nothing
-[       OK ] BtreeTests.empty_btree_contains_nothing (32 ms)
+[       OK ] BtreeTests.empty_btree_contains_nothing (84 ms)
 [ RUN      ] BtreeTests.insert_works
-[       OK ] BtreeTests.insert_works (908 ms)
+[       OK ] BtreeTests.insert_works (1096 ms)
 [ RUN      ] BtreeTests.insert_does_not_insert_imaginary_values
-[       OK ] BtreeTests.insert_does_not_insert_imaginary_values (36 ms)
+[       OK ] BtreeTests.insert_does_not_insert_imaginary_values (100 ms)
 [ RUN      ] BtreeTests.clone
-[       OK ] BtreeTests.clone (120 ms)
-[----------] 4 tests from BtreeTests (1096 ms total)
+[       OK ] BtreeTests.clone (188 ms)
+[----------] 4 tests from BtreeTests (1468 ms total)
 
 [----------] 2 tests from BTreeCounterTests
 [ RUN      ] BTreeCounterTests.count_empty_tree
-[       OK ] BTreeCounterTests.count_empty_tree (64 ms)
+[       OK ] BTreeCounterTests.count_empty_tree (156 ms)
 [ RUN      ] BTreeCounterTests.count_populated_tree
-[       OK ] BTreeCounterTests.count_populated_tree (80 ms)
-[----------] 2 tests from BTreeCounterTests (144 ms total)
+[       OK ] BTreeCounterTests.count_populated_tree (165 ms)
+[----------] 2 tests from BTreeCounterTests (321 ms total)
 
 [----------] 8 tests from BTreeDamageVisitorTests
 [ RUN      ] BTreeDamageVisitorTests.an_empty_tree
-[       OK ] BTreeDamageVisitorTests.an_empty_tree (56 ms)
+[       OK ] BTreeDamageVisitorTests.an_empty_tree (104 ms)
 [ RUN      ] BTreeDamageVisitorTests.tree_with_a_trashed_root
-[       OK ] BTreeDamageVisitorTests.tree_with_a_trashed_root (76 ms)
+[       OK ] BTreeDamageVisitorTests.tree_with_a_trashed_root (128 ms)
 [ RUN      ] BTreeDamageVisitorTests.populated_tree_with_no_damage
-[       OK ] BTreeDamageVisitorTests.populated_tree_with_no_damage (47572 ms)
+[       OK ] BTreeDamageVisitorTests.populated_tree_with_no_damage (65659 ms)
 [ RUN      ] BTreeDamageVisitorTests.populated_tree_with_a_damaged_leaf_node
-[       OK ] BTreeDamageVisitorTests.populated_tree_with_a_damaged_leaf_node (40384 ms)
+[       OK ] BTreeDamageVisitorTests.populated_tree_with_a_damaged_leaf_node (65431 ms)
 [ RUN      ] BTreeDamageVisitorTests.populated_tree_with_a_sequence_of_damaged_leaf_nodes
-[       OK ] BTreeDamageVisitorTests.populated_tree_with_a_sequence_of_damaged_leaf_nodes (36668 ms)
+[       OK ] BTreeDamageVisitorTests.populated_tree_with_a_sequence_of_damaged_leaf_nodes (65000 ms)
 [ RUN      ] BTreeDamageVisitorTests.damaged_first_leaf
-[       OK ] BTreeDamageVisitorTests.damaged_first_leaf (37452 ms)
+[       OK ] BTreeDamageVisitorTests.damaged_first_leaf (65635 ms)
 [ RUN      ] BTreeDamageVisitorTests.damaged_last_leaf
-[       OK ] BTreeDamageVisitorTests.damaged_last_leaf (44176 ms)
+[       OK ] BTreeDamageVisitorTests.damaged_last_leaf (65011 ms)
 [ RUN      ] BTreeDamageVisitorTests.damaged_internal
-[       OK ] BTreeDamageVisitorTests.damaged_internal (108 ms)
-[----------] 8 tests from BTreeDamageVisitorTests (206492 ms total)
+[       OK ] BTreeDamageVisitorTests.damaged_internal (236 ms)
+[----------] 8 tests from BTreeDamageVisitorTests (327208 ms total)
 
 [----------] 4 tests from BTreeDamageVisitor2Tests
 [ RUN      ] BTreeDamageVisitor2Tests.empty_tree
-[       OK ] BTreeDamageVisitor2Tests.empty_tree (60 ms)
+[       OK ] BTreeDamageVisitor2Tests.empty_tree (151 ms)
 [ RUN      ] BTreeDamageVisitor2Tests.tree_with_a_trashed_root
-[       OK ] BTreeDamageVisitor2Tests.tree_with_a_trashed_root (52 ms)
+[       OK ] BTreeDamageVisitor2Tests.tree_with_a_trashed_root (144 ms)
 [ RUN      ] BTreeDamageVisitor2Tests.populated_tree_with_no_damage
-[       OK ] BTreeDamageVisitor2Tests.populated_tree_with_no_damage (48 ms)
+[       OK ] BTreeDamageVisitor2Tests.populated_tree_with_no_damage (112 ms)
 [ RUN      ] BTreeDamageVisitor2Tests.damaged_leaf
-[       OK ] BTreeDamageVisitor2Tests.damaged_leaf (41300 ms)
-[----------] 4 tests from BTreeDamageVisitor2Tests (41460 ms total)
+[       OK ] BTreeDamageVisitor2Tests.damaged_leaf (66492 ms)
+[----------] 4 tests from BTreeDamageVisitor2Tests (66900 ms total)
 
 [----------] 14 tests from CacheSuperblockTests
 [ RUN      ] CacheSuperblockTests.default_constructed_superblock_is_valid
-[       OK ] CacheSuperblockTests.default_constructed_superblock_is_valid (1 ms)
+[       OK ] CacheSuperblockTests.default_constructed_superblock_is_valid (0 ms)
 [ RUN      ] CacheSuperblockTests.clean_shutdown_flag_is_valid
 [       OK ] CacheSuperblockTests.clean_shutdown_flag_is_valid (0 ms)
 [ RUN      ] CacheSuperblockTests.unhandled_flags_gets_set_correctly_and_is_invalid
@@ -1508,29 +1542,29 @@
 [ RUN      ] CacheSuperblockTests.valid_incompat_flags_are_checked
 [       OK ] CacheSuperblockTests.valid_incompat_flags_are_checked (0 ms)
 [ RUN      ] CacheSuperblockTests.invalid_incompat_flags_checked
-[       OK ] CacheSuperblockTests.invalid_incompat_flags_checked (0 ms)
+[       OK ] CacheSuperblockTests.invalid_incompat_flags_checked (1 ms)
 [----------] 14 tests from CacheSuperblockTests (1 ms total)
 
 [----------] 9 tests from CopierTests
 [ RUN      ] CopierTests.empty_test
-[       OK ] CopierTests.empty_test (1 ms)
+[       OK ] CopierTests.empty_test (0 ms)
 [ RUN      ] CopierTests.successful_copy
 [       OK ] CopierTests.successful_copy (0 ms)
 [ RUN      ] CopierTests.unsuccessful_issue_read
 [       OK ] CopierTests.unsuccessful_issue_read (0 ms)
 [ RUN      ] CopierTests.unsuccessful_read
-[       OK ] CopierTests.unsuccessful_read (0 ms)
+[       OK ] CopierTests.unsuccessful_read (1 ms)
 [ RUN      ] CopierTests.unsuccessful_issue_write
 [       OK ] CopierTests.unsuccessful_issue_write (0 ms)
 [ RUN      ] CopierTests.unsuccessful_write
-[       OK ] CopierTests.unsuccessful_write (1 ms)
+[       OK ] CopierTests.unsuccessful_write (0 ms)
 [ RUN      ] CopierTests.copy_the_same_block_many_times
-[       OK ] CopierTests.copy_the_same_block_many_times (6416 ms)
+[       OK ] CopierTests.copy_the_same_block_many_times (8146 ms)
 [ RUN      ] CopierTests.copy_different_blocks
-[       OK ] CopierTests.copy_different_blocks (617 ms)
+[       OK ] CopierTests.copy_different_blocks (776 ms)
 [ RUN      ] CopierTests.wait_can_timeout
-[       OK ] CopierTests.wait_can_timeout (0 ms)
-[----------] 9 tests from CopierTests (7035 ms total)
+[       OK ] CopierTests.wait_can_timeout (1 ms)
+[----------] 9 tests from CopierTests (8924 ms total)
 
 [----------] 10 tests from DamageTrackerTests
 [ RUN      ] DamageTrackerTests.good_leaf
@@ -1569,39 +1603,39 @@
 
 [----------] 9 tests from IOEngineTests
 [ RUN      ] IOEngineTests.empty_test
-[       OK ] IOEngineTests.empty_test (87 ms)
+[       OK ] IOEngineTests.empty_test (114 ms)
 [ RUN      ] IOEngineTests.open_and_close
-[       OK ] IOEngineTests.open_and_close (64 ms)
+[       OK ] IOEngineTests.open_and_close (160 ms)
 [ RUN      ] IOEngineTests.you_can_read_a_read_only_handle
-[       OK ] IOEngineTests.you_can_read_a_read_only_handle (84 ms)
+[       OK ] IOEngineTests.you_can_read_a_read_only_handle (132 ms)
 [ RUN      ] IOEngineTests.you_cannot_write_to_a_read_only_handle
-[       OK ] IOEngineTests.you_cannot_write_to_a_read_only_handle (64 ms)
+[       OK ] IOEngineTests.you_cannot_write_to_a_read_only_handle (144 ms)
 [ RUN      ] IOEngineTests.you_can_write_to_a_read_write_handle
-[       OK ] IOEngineTests.you_can_write_to_a_read_write_handle (76 ms)
+[       OK ] IOEngineTests.you_can_write_to_a_read_write_handle (164 ms)
 [ RUN      ] IOEngineTests.final_block_read_succeeds
-[       OK ] IOEngineTests.final_block_read_succeeds (68 ms)
+[       OK ] IOEngineTests.final_block_read_succeeds (132 ms)
 [ RUN      ] IOEngineTests.out_of_bounds_read_fails
-[       OK ] IOEngineTests.out_of_bounds_read_fails (76 ms)
+[       OK ] IOEngineTests.out_of_bounds_read_fails (140 ms)
 [ RUN      ] IOEngineTests.out_of_bounds_write_succeeds
-[       OK ] IOEngineTests.out_of_bounds_write_succeeds (64 ms)
+[       OK ] IOEngineTests.out_of_bounds_write_succeeds (124 ms)
 [ RUN      ] IOEngineTests.succeed_with_timeout
-[       OK ] IOEngineTests.succeed_with_timeout (56 ms)
-[----------] 9 tests from IOEngineTests (639 ms total)
+[       OK ] IOEngineTests.succeed_with_timeout (132 ms)
+[----------] 9 tests from IOEngineTests (1242 ms total)
 
 [----------] 6 tests from MempoolTests
 [ RUN      ] MempoolTests.empty_test
 [       OK ] MempoolTests.empty_test (0 ms)
 [ RUN      ] MempoolTests.create_destroy_cycle
-[       OK ] MempoolTests.create_destroy_cycle (2 ms)
+[       OK ] MempoolTests.create_destroy_cycle (3 ms)
 [ RUN      ] MempoolTests.alignments_observed
-[       OK ] MempoolTests.alignments_observed (1 ms)
+[       OK ] MempoolTests.alignments_observed (0 ms)
 [ RUN      ] MempoolTests.alloc_free_cycle
-[       OK ] MempoolTests.alloc_free_cycle (0 ms)
+[       OK ] MempoolTests.alloc_free_cycle (1 ms)
 [ RUN      ] MempoolTests.exhaust_pool
 [       OK ] MempoolTests.exhaust_pool (0 ms)
 [ RUN      ] MempoolTests.data_can_be_written
 [       OK ] MempoolTests.data_can_be_written (0 ms)
-[----------] 6 tests from MempoolTests (3 ms total)
+[----------] 6 tests from MempoolTests (4 ms total)
 
 [----------] 8 tests from RMapVisitorTests
 [ RUN      ] RMapVisitorTests.no_mapped_blocks
@@ -1609,7 +1643,7 @@
 [ RUN      ] RMapVisitorTests.no_rmap_regions
 [       OK ] RMapVisitorTests.no_rmap_regions (0 ms)
 [ RUN      ] RMapVisitorTests.region_exactly_covers_thin
-[       OK ] RMapVisitorTests.region_exactly_covers_thin (0 ms)
+[       OK ] RMapVisitorTests.region_exactly_covers_thin (1 ms)
 [ RUN      ] RMapVisitorTests.region_smaller_than_a_thin
 [       OK ] RMapVisitorTests.region_smaller_than_a_thin (0 ms)
 [ RUN      ] RMapVisitorTests.region_overlaps_two_thins
@@ -1619,19 +1653,19 @@
 [ RUN      ] RMapVisitorTests.overlapping_regions
 [       OK ] RMapVisitorTests.overlapping_regions (0 ms)
 [ RUN      ] RMapVisitorTests.rmap_is_sorted
-[       OK ] RMapVisitorTests.rmap_is_sorted (0 ms)
-[----------] 8 tests from RMapVisitorTests (1 ms total)
+[       OK ] RMapVisitorTests.rmap_is_sorted (1 ms)
+[----------] 8 tests from RMapVisitorTests (2 ms total)
 
 [----------] 4 tests from RollingHashTests
 [ RUN      ] RollingHashTests.ctr
 [       OK ] RollingHashTests.ctr (0 ms)
 [ RUN      ] RollingHashTests.hash_changes
-[       OK ] RollingHashTests.hash_changes (33 ms)
+[       OK ] RollingHashTests.hash_changes (39 ms)
 [ RUN      ] RollingHashTests.hash_repeats
-[       OK ] RollingHashTests.hash_repeats (1 ms)
+[       OK ] RollingHashTests.hash_repeats (0 ms)
 [ RUN      ] RollingHashTests.reset_is_deterministic
 [       OK ] RollingHashTests.reset_is_deterministic (0 ms)
-[----------] 4 tests from RollingHashTests (34 ms total)
+[----------] 4 tests from RollingHashTests (39 ms total)
 
 [----------] 2 tests from ContentBasedHashTests
 [ RUN      ] ContentBasedHashTests.ctr
@@ -9830,8 +9864,8 @@
 8190: 2
 8191: 4
 min: 2048, max: 8192
-[       OK ] ContentBasedHashTests.chunk_limits_respected (6848 ms)
-[----------] 2 tests from ContentBasedHashTests (6849 ms total)
+[       OK ] ContentBasedHashTests.chunk_limits_respected (7086 ms)
+[----------] 2 tests from ContentBasedHashTests (7086 ms total)
 
 [----------] 22 tests from RunSetTests
 [ RUN      ] RunSetTests.create
@@ -9843,7 +9877,7 @@
 [ RUN      ] RunSetTests.add_adjacent_single_other_way_round
 [       OK ] RunSetTests.add_adjacent_single_other_way_round (0 ms)
 [ RUN      ] RunSetTests.many_single_blocks
-[       OK ] RunSetTests.many_single_blocks (9 ms)
+[       OK ] RunSetTests.many_single_blocks (10 ms)
 [ RUN      ] RunSetTests.add_runs
 [       OK ] RunSetTests.add_runs (0 ms)
 [ RUN      ] RunSetTests.member_empty_set
@@ -9857,7 +9891,7 @@
 [ RUN      ] RunSetTests.iterate_overlapping_runs
 [       OK ] RunSetTests.iterate_overlapping_runs (0 ms)
 [ RUN      ] RunSetTests.iterate_overlapping_runs_other_way
-[       OK ] RunSetTests.iterate_overlapping_runs_other_way (0 ms)
+[       OK ] RunSetTests.iterate_overlapping_runs_other_way (1 ms)
 [ RUN      ] RunSetTests.iterate_covered_runs
 [       OK ] RunSetTests.iterate_covered_runs (0 ms)
 [ RUN      ] RunSetTests.iterate_covered_runs2
@@ -9878,22 +9912,22 @@
 [       OK ] RunSetTests.negate_double (0 ms)
 [ RUN      ] RunSetTests.negate_negate
 [       OK ] RunSetTests.negate_negate (0 ms)
-[----------] 22 tests from RunSetTests (10 ms total)
+[----------] 22 tests from RunSetTests (11 ms total)
 
 [----------] 6 tests from SpaceMapTests
 [ RUN      ] SpaceMapTests.test_sm_core
-[       OK ] SpaceMapTests.test_sm_core (103 ms)
+[       OK ] SpaceMapTests.test_sm_core (169 ms)
 [ RUN      ] SpaceMapTests.test_sm_careful_alloc
-[       OK ] SpaceMapTests.test_sm_careful_alloc (112 ms)
+[       OK ] SpaceMapTests.test_sm_careful_alloc (132 ms)
 [ RUN      ] SpaceMapTests.test_sm_recursive
 [       OK ] SpaceMapTests.test_sm_recursive (120 ms)
 [ RUN      ] SpaceMapTests.test_sm_disk
-[       OK ] SpaceMapTests.test_sm_disk (148 ms)
+[       OK ] SpaceMapTests.test_sm_disk (196 ms)
 [ RUN      ] SpaceMapTests.test_sm_metadata
-[       OK ] SpaceMapTests.test_sm_metadata (196 ms)
+[       OK ] SpaceMapTests.test_sm_metadata (263 ms)
 [ RUN      ] SpaceMapTests.test_metadata_and_disk
-[       OK ] SpaceMapTests.test_metadata_and_disk (140 ms)
-[----------] 6 tests from SpaceMapTests (819 ms total)
+[       OK ] SpaceMapTests.test_metadata_and_disk (269 ms)
+[----------] 6 tests from SpaceMapTests (1149 ms total)
 
 [----------] 1 test from RegularSpanItTests
 [ RUN      ] RegularSpanItTests.regular_span_iterator
@@ -9923,17 +9957,17 @@
 
 [----------] 4 tests from TransactionManagerTests
 [ RUN      ] TransactionManagerTests.commit_succeeds
-[       OK ] TransactionManagerTests.commit_succeeds (83 ms)
+[       OK ] TransactionManagerTests.commit_succeeds (111 ms)
 [ RUN      ] TransactionManagerTests.shadowing
-[       OK ] TransactionManagerTests.shadowing (80 ms)
+[       OK ] TransactionManagerTests.shadowing (100 ms)
 [ RUN      ] TransactionManagerTests.multiple_shadowing
-[       OK ] TransactionManagerTests.multiple_shadowing (92 ms)
+[       OK ] TransactionManagerTests.multiple_shadowing (108 ms)
 [ RUN      ] TransactionManagerTests.shadow_free_block_fails
-[       OK ] TransactionManagerTests.shadow_free_block_fails (80 ms)
-[----------] 4 tests from TransactionManagerTests (335 ms total)
+[       OK ] TransactionManagerTests.shadow_free_block_fails (124 ms)
+[----------] 4 tests from TransactionManagerTests (443 ms total)
 
 [----------] Global test environment tear-down
-[==========] 190 tests from 26 test cases ran. (277862 ms total)
+[==========] 190 tests from 26 test cases ran. (432325 ms total)
 [  PASSED  ] 190 tests.
 make[2]: Leaving directory '/build/thin-provisioning-tools-0.7.6'
 make[1]: Leaving directory '/build/thin-provisioning-tools-0.7.6'
@@ -10050,12 +10084,14 @@
  dpkg-source --after-build .
 dpkg-buildpackage: info: binary-only upload (no source included)
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/29509/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/29509/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/28406 and its subdirectories
-I: Current time: Mon Aug 10 18:07:36 -12 2020
-I: pbuilder-time-stamp: 1597126056
+I: removing directory /srv/workspace/pbuilder/29509 and its subdirectories
+I: Current time: Tue Sep 14 02:51:01 +14 2021
+I: pbuilder-time-stamp: 1631537461