From 34c039d7dc003c3fdb71285785382d0f679f4648 Mon Sep 17 00:00:00 2001
From: Joe Thornber <ejt@redhat.com>
Date: Wed, 1 Jun 2016 14:46:27 +0100
Subject: [PATCH] [mempool] more tests

---
 block-cache/copier.cc    | 6 +++---
 block-cache/mem_pool.cc  | 6 +++---
 block-cache/mem_pool.h   | 2 +-
 unit-tests/mem_pool_t.cc | 9 ++++-----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/block-cache/copier.cc b/block-cache/copier.cc
index a1e9a5f..192c0a1 100644
--- a/block-cache/copier.cc
+++ b/block-cache/copier.cc
@@ -33,16 +33,16 @@ copier::issue(copy_op const &op)
 			throw runtime_error("couldn't allocate buffer");
 	}
 
-	copy_job job(op, *data);
+	copy_job job(op, data);
 	job.op.read_complete = job.op.write_complete = false;
 	unsigned key = genkey(); // used as context for the io_engine
 
-	cerr << "data = " << &(*data) << "\n";
+	cerr << "data = " << data << "\n";
 	engine_.issue_io(src_handle_,
 			 io_engine::READ,
 			 to_sector(op.src_b),
 			 to_sector(op.src_e),
-			 *data,
+			 data,
 			 key);
 	jobs_.insert(make_pair(key, job));
 }
diff --git a/block-cache/mem_pool.cc b/block-cache/mem_pool.cc
index db5cc9e..03f9455 100644
--- a/block-cache/mem_pool.cc
+++ b/block-cache/mem_pool.cc
@@ -26,15 +26,15 @@ mempool::~mempool()
 	::free(mem_);
 }
 
-boost::optional<void *>
+void *
 mempool::alloc()
 {
 	if (free_.empty())
-		return optional<void *>();
+		return nullptr;
 
 	mempool_detail::alloc_block &b = free_.front();
 	free_.pop_front();
-	return optional<void *>(reinterpret_cast<void *>(&b));
+	return reinterpret_cast<void *>(&b);
 }
 
 void
diff --git a/block-cache/mem_pool.h b/block-cache/mem_pool.h
index 50328d3..276a314 100644
--- a/block-cache/mem_pool.h
+++ b/block-cache/mem_pool.h
@@ -23,7 +23,7 @@ namespace bcache {
 		mempool(size_t block_size, size_t total_mem, size_t alignment = 8);
 		~mempool();
 
-		boost::optional<void *> alloc();
+		void *alloc();
 		void free(void *data);
 
 	private:
diff --git a/unit-tests/mem_pool_t.cc b/unit-tests/mem_pool_t.cc
index b385f74..24fb34c 100644
--- a/unit-tests/mem_pool_t.cc
+++ b/unit-tests/mem_pool_t.cc
@@ -65,7 +65,7 @@ TEST_F(MempoolTests, alignments_observed)
 			if (!md)
 				throw runtime_error("couldn't alloc");
 
-			ASSERT_THAT(aligned(*md, bs), Eq(true));
+			ASSERT_TRUE(aligned(md, bs));
 		}
 	}
 }
@@ -76,7 +76,7 @@ TEST_F(MempoolTests, alloc_free_cycle)
 
 	for (unsigned i = 0; i < 10000; i++) {
 		auto md = mp.alloc();
-		mp.free(*md);
+		mp.free(md);
 	}
 }
 
@@ -86,12 +86,11 @@ TEST_F(MempoolTests, exhaust_pool)
 
 	for (unsigned i = 0; i < 100; i++) {
 		auto md = mp.alloc();
-
-		ASSERT_THAT(*md, NEq(0));
+		ASSERT_NE(md, nullptr);
 	}
 
 	auto md = mp.alloc();
-	ASSERT(*md, Eq(0));
+	ASSERT_EQ(md, nullptr);
 }
 
 //----------------------------------------------------------------