Initial code drop for merging block_cache

Makefile.in

@@ -41,6 +41,8 @@ PROGRAMS=\
 all: $(PROGRAMS)
 
 SOURCE=\
+	block-cache/block_cache.cc \
+	\
 	base/base64.cc \
 	base/endian_utils.cc \
 	base/error_state.cc \
@@ -65,7 +67,6 @@ SOURCE=\
 	persistent-data/error_set.cc \
 	persistent-data/file_utils.cc \
 	persistent-data/hex_dump.cc \
-	persistent-data/lock_tracker.cc \
 	persistent-data/transaction_manager.cc \
 	\
 	persistent-data/data-structures/bitset.cc \
@@ -115,7 +116,7 @@ CXXFLAGS+=-g -Wall -fno-strict-aliasing
 CXXFLAGS+=@CXXOPTIMISE_FLAG@
 CXXFLAGS+=@CXXDEBUG_FLAG@
 INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
-LIBS:=-lstdc++
+LIBS:=-lstdc++ -laio
 LIBEXPAT:=-lexpat
 INSTALL:=@INSTALL@
 PREFIX:=@prefix@
@@ -168,6 +169,8 @@ THIN_DUMP_SOURCE=$(SOURCE)
 THIN_REPAIR_SOURCE=$(SOURCE)
 THIN_RESTORE_SOURCE=$(SOURCE)
 THIN_CHECK_SOURCE=\
+	block-cache/block_cache.cc \
+	\
 	base/error_state.cc \
 	base/endian_utils.cc \
 	\
@@ -175,7 +178,6 @@ THIN_CHECK_SOURCE=\
 	persistent-data/error_set.cc \
 	persistent-data/file_utils.cc \
 	persistent-data/hex_dump.cc \
-	persistent-data/lock_tracker.cc \
 	persistent-data/data-structures/btree.cc \
 	persistent-data/space_map.cc \
 	persistent-data/space-maps/disk.cc \
@@ -190,6 +192,8 @@ THIN_CHECK_SOURCE=\
 	thin-provisioning/superblock.cc
 
 THIN_DELTA_SOURCE=\
+	block-cache/block_cache.cc \
+	\
 	base/error_state.cc \
 	base/endian_utils.cc \
 	\
@@ -197,7 +201,6 @@ THIN_DELTA_SOURCE=\
 	persistent-data/error_set.cc \
 	persistent-data/file_utils.cc \
 	persistent-data/hex_dump.cc \
-	persistent-data/lock_tracker.cc \
 	persistent-data/data-structures/btree.cc \
 	persistent-data/space_map.cc \
 	persistent-data/space-maps/disk.cc \
@@ -212,13 +215,14 @@ THIN_DELTA_SOURCE=\
 	thin-provisioning/superblock.cc
 
 THIN_RMAP_SOURCE=\
+	block-cache/block_cache.cc \
+	\
 	base/endian_utils.cc \
 	\
 	persistent-data/checksum.cc \
 	persistent-data/error_set.cc \
 	persistent-data/file_utils.cc \
 	persistent-data/hex_dump.cc \
-	persistent-data/lock_tracker.cc \
 	persistent-data/data-structures/btree.cc \
 	persistent-data/space_map.cc \
 	persistent-data/space-maps/disk.cc \
@@ -276,6 +280,8 @@ thin_metadata_size: thin-provisioning/thin_metadata_size.o
 # Cache tools
 
 CACHE_CHECK_SOURCE=\
+	block-cache/block_cache.cc \
+	\
 	base/base64.cc \
 	base/error_state.cc \
 	base/endian_utils.cc \
@@ -284,7 +290,6 @@ CACHE_CHECK_SOURCE=\
 	persistent-data/error_set.cc \
 	persistent-data/file_utils.cc \
 	persistent-data/hex_dump.cc \
-	persistent-data/lock_tracker.cc \
 	persistent-data/data-structures/btree.cc \
 	persistent-data/data-structures/bitset.cc \
 	persistent-data/space_map.cc \
@@ -336,6 +341,8 @@ cache_metadata_size: caching/cache_metadata_size.o
 # Era tools
 
 ERA_CHECK_SOURCE=\
+	block-cache/block_cache.cc \
+	\
 	base/base64.cc \
 	base/error_state.cc \
 	base/endian_utils.cc \
@@ -350,7 +357,6 @@ ERA_CHECK_SOURCE=\
 	persistent-data/error_set.cc \
 	persistent-data/file_utils.cc \
 	persistent-data/hex_dump.cc \
-	persistent-data/lock_tracker.cc \
 	persistent-data/data-structures/btree.cc \
 	persistent-data/data-structures/bitset.cc \
 	persistent-data/space_map.cc \
@@ -366,6 +372,8 @@ era_check: $(ERA_CHECK_OBJECTS) era/era_check.o
 	$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS) $(LIBEXPAT)
 
 ERA_DUMP_SOURCE=\
+	block-cache/block_cache.cc \
+	\
 	base/base64.cc \
 	base/error_state.cc \
 	base/endian_utils.cc \
@@ -382,7 +390,6 @@ ERA_DUMP_SOURCE=\
 	persistent-data/error_set.cc \
 	persistent-data/file_utils.cc \
 	persistent-data/hex_dump.cc \
-	persistent-data/lock_tracker.cc \
 	persistent-data/data-structures/btree.cc \
 	persistent-data/data-structures/bitset.cc \
 	persistent-data/space_map.cc \
@@ -398,6 +405,8 @@ era_dump: $(ERA_DUMP_OBJECTS)  era/era_dump.o
 	$(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
 
 ERA_INVALIDATE_SOURCE=\
+	block-cache/block_cache.cc \
+	\
 	base/base64.cc \
 	base/error_state.cc \
 	base/endian_utils.cc \
@@ -414,7 +423,6 @@ ERA_INVALIDATE_SOURCE=\
 	persistent-data/error_set.cc \
 	persistent-data/file_utils.cc \
 	persistent-data/hex_dump.cc \
-	persistent-data/lock_tracker.cc \
 	persistent-data/data-structures/btree.cc \
 	persistent-data/data-structures/bitset.cc \
 	persistent-data/space_map.cc \