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

Merge pull request #5 from denys-duchier/bitset-bug

Browse Source 
use persistent-data::bitset to avoid ambiguity
This commit is contained in:
Joe Thornber 2013-11-17 00:01:32 -08:00
commit e79091fb4f
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caching/cache_check.cc
View File

@ -254,7 +254,7 @@ namespace {
out << "examining discard bitset" << end_message(); out << "examining discard bitset" << end_message();
{ {
nested_output::nest _ = out.push(); nested_output::nest _ = out.push();
bitset discards(tm, sb.discard_root, sb.discard_nr_blocks); persistent_data::bitset discards(tm, sb.discard_root, sb.discard_nr_blocks);
} }
} }
} }

6
caching/metadata.cc
View File

@ -79,7 +79,7 @@ metadata::create_metadata(block_manager<>::ptr bm)
// We can't instantiate the hint array yet, since we don't know the // We can't instantiate the hint array yet, since we don't know the
// hint width. // hint width.
discard_bits_ = bitset::ptr(new bitset(tm_)); discard_bits_ = persistent_data::bitset::ptr(new persistent_data::bitset(tm_));
} }
void void
@ -100,8 +100,8 @@ metadata::open_metadata(block_manager<>::ptr bm)
sb_.hint_root, sb_.cache_blocks)); sb_.hint_root, sb_.cache_blocks));
if (sb_.discard_root) if (sb_.discard_root)
discard_bits_ = bitset::ptr( discard_bits_ = persistent_data::bitset::ptr(
new bitset(tm_, sb_.discard_root, sb_.discard_nr_blocks)); new persistent_data::bitset(tm_, sb_.discard_root, sb_.discard_nr_blocks));
} }
void void

2
caching/metadata.h
View File

@ -38,7 +38,7 @@ namespace caching {
checked_space_map::ptr metadata_sm_; checked_space_map::ptr metadata_sm_;
mapping_array::ptr mappings_; mapping_array::ptr mappings_;
hint_array::ptr hints_; hint_array::ptr hints_;
bitset::ptr discard_bits_; persistent_data::bitset::ptr discard_bits_;
private: private:
void init_superblock(); void init_superblock();

18
persistent-data/data-structures/bitset.cc
View File

@ -198,54 +198,54 @@ namespace persistent_data {
//---------------------------------------------------------------- //----------------------------------------------------------------
bitset::bitset(tm_ptr tm) persistent_data::bitset::bitset(tm_ptr tm)
: impl_(new bitset_impl(tm)) : impl_(new bitset_impl(tm))
{ {
} }
bitset::bitset(tm_ptr tm, block_address root, unsigned nr_bits) persistent_data::bitset::bitset(tm_ptr tm, block_address root, unsigned nr_bits)
: impl_(new bitset_impl(tm, root, nr_bits)) : impl_(new bitset_impl(tm, root, nr_bits))
{ {
} }
block_address block_address
bitset::get_root() const persistent_data::bitset::get_root() const
{ {
return impl_->get_root(); return impl_->get_root();
} }
void void
bitset::grow(unsigned new_nr_bits, bool default_value) persistent_data::bitset::grow(unsigned new_nr_bits, bool default_value)
{ {
impl_->grow(new_nr_bits, default_value); impl_->grow(new_nr_bits, default_value);
} }
void void
bitset::destroy() persistent_data::bitset::destroy()
{ {
impl_->destroy(); impl_->destroy();
} }
bool bool
bitset::get(unsigned n) persistent_data::bitset::get(unsigned n)
{ {
return impl_->get(n); return impl_->get(n);
} }
void void
bitset::set(unsigned n, bool value) persistent_data::bitset::set(unsigned n, bool value)
{ {
impl_->set(n, value); impl_->set(n, value);
} }
void void
bitset::flush() persistent_data::bitset::flush()
{ {
impl_->flush(); impl_->flush();
} }
void void
bitset::walk_bitset(bitset_visitor &v) const persistent_data::bitset::walk_bitset(bitset_visitor &v) const
{ {
impl_->walk_bitset(v); impl_->walk_bitset(v);
} }