emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[block_manager] Hard code block size to 4k.

Browse Source 
We're never going to use anything other than 4k, and by hard coding it we
avoid making block_manager a template.
This commit is contained in:
Joe Thornber
2020-04-30 14:30:01 +01:00
parent 3e5de399a7
commit e801cc607b
57 changed files with 390 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
persistent-data/data-structures/array.h
View File

@ -216,11 +216,11 @@ namespace persistent_data {
unsigned entries_per_block_;
};
typedef block_manager<>::write_ref write_ref;
typedef block_manager<>::read_ref read_ref;
typedef block_manager::write_ref write_ref;
typedef block_manager::read_ref read_ref;
typedef array_block<ValueTraits, block_manager<>::write_ref> wblock;
typedef array_block<ValueTraits, block_manager<>::read_ref> rblock;
typedef array_block<ValueTraits, block_manager::write_ref> wblock;
typedef array_block<ValueTraits, block_manager::read_ref> rblock;
typedef boost::shared_ptr<array<ValueTraits> > ptr;
typedef typename ValueTraits::value_type value_type;

12
persistent-data/data-structures/btree.h
View File

@ -152,7 +152,7 @@ namespace persistent_data {
//
template <typename ValueTraits>
node_ref<ValueTraits>
to_node(typename block_manager<>::read_ref &b)
to_node(typename block_manager::read_ref &b)
{
// FIXME: this should return a const read_ref somehow.
return node_ref<ValueTraits>(
@ -163,7 +163,7 @@ namespace persistent_data {
template <typename ValueTraits>
node_ref<ValueTraits>
to_node(typename block_manager<>::write_ref &b)
to_node(typename block_manager::write_ref &b)
{
return node_ref<ValueTraits>(
b.get_location(),
@ -188,7 +188,7 @@ namespace persistent_data {
private:
transaction_manager &tm_;
bcache::validator::ptr validator_;
std::list<block_manager<>::read_ref> spine_;
std::list<block_manager::read_ref> spine_;
};
class shadow_spine : private boost::noncopyable {
@ -252,7 +252,7 @@ namespace persistent_data {
private:
transaction_manager &tm_;
bcache::validator::ptr validator_;
std::list<block_manager<>::write_ref> spine_;
std::list<block_manager::write_ref> spine_;
maybe_block root_;
};
@ -304,8 +304,8 @@ namespace persistent_data {
typedef typename ValueTraits::value_type value_type;
typedef boost::optional<value_type> maybe_value;
typedef boost::optional<std::pair<unsigned, value_type> > maybe_pair;
typedef typename block_manager<>::read_ref read_ref;
typedef typename block_manager<>::write_ref write_ref;
typedef typename block_manager::read_ref read_ref;
typedef typename block_manager::write_ref write_ref;
typedef typename btree_detail::node_ref<ValueTraits> leaf_node;
typedef typename btree_detail::node_ref<block_traits> internal_node;