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

include ref_count tree in ref counts

Browse Source
This commit is contained in:
Joe Thornber 2011-08-25 16:27:58 +01:00
parent 3f5e95809f
commit 240e782a07
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
btree.h
View File

@ -331,7 +331,7 @@ namespace persistent_data {
}; };
// Walks the tree in depth first order // Walks the tree in depth first order
void visit(typename visitor::ptr visitor); void visit(typename visitor::ptr visitor) const;
private: private:
template <typename ValueTraits2> template <typename ValueTraits2>
@ -357,7 +357,7 @@ namespace persistent_data {
void walk_tree(typename visitor::ptr visitor, void walk_tree(typename visitor::ptr visitor,
unsigned level, bool is_root, unsigned level, bool is_root,
block_address b); block_address b) const;
typename persistent_data::transaction_manager<BlockSize>::ptr tm_; typename persistent_data::transaction_manager<BlockSize>::ptr tm_;
bool destroy_; bool destroy_;

4
btree.tcc
View File

@ -613,7 +613,7 @@ insert_location(btree_detail::shadow_spine<BlockSize> &spine,
template <unsigned Levels, typename ValueTraits, uint32_t BlockSize> template <unsigned Levels, typename ValueTraits, uint32_t BlockSize>
void void
btree<Levels, ValueTraits, BlockSize>::visit(typename visitor::ptr visitor) btree<Levels, ValueTraits, BlockSize>::visit(typename visitor::ptr visitor) const
{ {
walk_tree(visitor, 0, true, root_); walk_tree(visitor, 0, true, root_);
} }
@ -623,7 +623,7 @@ void
btree<Levels, ValueTraits, BlockSize>:: btree<Levels, ValueTraits, BlockSize>::
walk_tree(typename visitor::ptr visitor, walk_tree(typename visitor::ptr visitor,
unsigned level, bool is_root, unsigned level, bool is_root,
block_address b) block_address b) const
{ {
using namespace btree_detail; using namespace btree_detail;

26
space_map_disk.h
View File

@ -112,6 +112,16 @@ namespace persistent_data {
} }
}; };
template <uint32_t BlockSize>
class ref_count_validator : public btree_validator<1, ref_count_traits, BlockSize> {
public:
typedef boost::shared_ptr<ref_count_validator> ptr;
ref_count_validator(block_counter &counter)
: btree_validator<1, ref_count_traits, BlockSize>(counter) {
}
};
template <uint32_t BlockSize> template <uint32_t BlockSize>
class sm_disk_base : public persistent_space_map { class sm_disk_base : public persistent_space_map {
public: public:
@ -233,6 +243,12 @@ namespace persistent_data {
nr_blocks_ = nr_blocks; nr_blocks_ = nr_blocks;
} }
virtual void check(block_counter &counter) const {
typename ref_count_validator<BlockSize>::ptr v(new ref_count_validator<BlockSize>(counter));
counter.inc(ref_counts_.get_root());
ref_counts_.visit(v);
}
protected: protected:
typename transaction_manager<BlockSize>::ptr get_tm() const { typename transaction_manager<BlockSize>::ptr get_tm() const {
return tm_; return tm_;
@ -342,8 +358,11 @@ namespace persistent_data {
::memcpy(dest, &d, sizeof(d)); ::memcpy(dest, &d, sizeof(d));
} }
void check(block_counter &counter) { void check(block_counter &counter) const {
sm_disk_base<BlockSize>::check(counter);
typename bitmap_tree_validator<BlockSize>::ptr v(new bitmap_tree_validator<BlockSize>(counter)); typename bitmap_tree_validator<BlockSize>::ptr v(new bitmap_tree_validator<BlockSize>(counter));
counter.inc(bitmaps_.get_root());
bitmaps_.visit(v); bitmaps_.visit(v);
} }
@ -407,9 +426,10 @@ namespace persistent_data {
::memcpy(dest, &d, sizeof(d)); ::memcpy(dest, &d, sizeof(d));
} }
void check(block_counter &counter) { void check(block_counter &counter) const {
counter.inc(bitmap_root_); sm_disk_base<BlockSize>::check(counter);
counter.inc(bitmap_root_);
for (unsigned i = 0; i < entries_.size(); i++) for (unsigned i = 0; i < entries_.size(); i++)
counter.inc(entries_[i].blocknr_); counter.inc(entries_[i].blocknr_);
} }