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

[btree_damage_visitor] pass the btree_path to both the damage and value visitors.

Browse Source
This commit is contained in:
Joe Thornber
2013-05-17 12:05:13 +01:00
parent 30c9e0a005
commit d3fa4102c2
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
persistent-data/data-structures/btree_damage_visitor.h
View File

@ -142,7 +142,7 @@ namespace persistent_data {
if (!r) if (!r)
return false; return false;
visit_values(n); visit_values(loc.path, n);
return true; return true;
} }
@ -160,10 +160,11 @@ namespace persistent_data {
} }
private: private:
void visit_values(btree_detail::node_ref<ValueTraits> const &n) { void visit_values(btree_path const &path,
node_ref<ValueTraits> const &n) {
unsigned nr = n.get_nr_entries(); unsigned nr = n.get_nr_entries();
for (unsigned i = 0; i < nr; i++) for (unsigned i = 0; i < nr; i++)
value_visitor_.visit(n.value_at(i)); value_visitor_.visit(path, n.value_at(i));
} }
bool check_internal(node_location const &loc, bool check_internal(node_location const &loc,
@ -379,7 +380,7 @@ namespace persistent_data {
// the damage is coming from // the damage is coming from
damage d(r, build_damage_desc()); damage d(r, build_damage_desc());
clear_damage_desc(); clear_damage_desc();
damage_visitor_.visit(d); damage_visitor_.visit(btree_path(), d);
} }
std::string build_damage_desc() const { std::string build_damage_desc() const {

22
unit-tests/btree_damage_visitor_t.cc
View File

@ -234,14 +234,18 @@ namespace {
return arg.lost_keys_ == keys; return arg.lost_keys_ == keys;
} }
MATCHER(EmptyPath, "") {
return arg == btree_path();
}
class value_visitor_mock { class value_visitor_mock {
public: public:
MOCK_METHOD1(visit, void(thing const &)); MOCK_METHOD2(visit, void(btree_path const &, thing const &));
}; };
class damage_visitor_mock { class damage_visitor_mock {
public: public:
MOCK_METHOD1(visit, void(btree_detail::damage const &)); MOCK_METHOD2(visit, void(btree_path const &, btree_detail::damage const &));
}; };
class DamageTests : public Test { class DamageTests : public Test {
@ -271,15 +275,15 @@ namespace {
//-------------------------------- //--------------------------------
void expect_no_values() { void expect_no_values() {
EXPECT_CALL(value_visitor_, visit(_)).Times(0); EXPECT_CALL(value_visitor_, visit(_, _)).Times(0);
} }
void expect_no_damage() { void expect_no_damage() {
EXPECT_CALL(damage_visitor_, visit(_)).Times(0); EXPECT_CALL(damage_visitor_, visit(_, _)).Times(0);
} }
void expect_damage(unsigned level, range<uint64_t> keys) { void expect_damage(unsigned level, range<uint64_t> keys) {
EXPECT_CALL(damage_visitor_, visit(DamagedKeys(keys))).Times(1); EXPECT_CALL(damage_visitor_, visit(EmptyPath(), DamagedKeys(keys))).Times(1);
} }
//-------------------------------- //--------------------------------
@ -329,7 +333,7 @@ namespace {
void expect_value_range(uint64_t begin, uint64_t end) { void expect_value_range(uint64_t begin, uint64_t end) {
while (begin < end) { while (begin < end) {
EXPECT_CALL(value_visitor_, visit(Eq(thing(begin, begin + 1234)))).Times(1); EXPECT_CALL(value_visitor_, visit(EmptyPath(), Eq(thing(begin, begin + 1234)))).Times(1);
begin++; begin++;
} }
} }
@ -339,7 +343,7 @@ namespace {
} }
void expect_value(unsigned n) { void expect_value(unsigned n) {
EXPECT_CALL(value_visitor_, visit(Eq(thing(n, n + 1234)))).Times(1); EXPECT_CALL(value_visitor_, visit(EmptyPath(), Eq(thing(n, n + 1234)))).Times(1);
} }
btree<1, thing_traits>::ptr tree_; btree<1, thing_traits>::ptr tree_;
@ -387,7 +391,9 @@ namespace {
void expect_sub_tree_values(unsigned sub_tree, unsigned nr_values) { void expect_sub_tree_values(unsigned sub_tree, unsigned nr_values) {
for (unsigned i = 0; i < nr_values; i++) { for (unsigned i = 0; i < nr_values; i++) {
uint64_t key[2] = {sub_tree, i}; uint64_t key[2] = {sub_tree, i};
EXPECT_CALL(value_visitor_, visit(Eq(key_to_value(key)))); btree_path path;
path.push_back(sub_tree);
EXPECT_CALL(value_visitor_, visit(Eq(path), Eq(key_to_value(key))));
} }
} }