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

Remove the typedef block_ptr and change code to use block::ptr instead

Browse Source
This commit is contained in:
Joe Thornber 2013-01-10 11:02:06 +00:00
parent 3e39e8bfeb
commit 1cc6737c26
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
persistent-data/block.h
View File

@ -157,12 +157,11 @@ namespace persistent_data {
block_type bt_; block_type bt_;
bool dirty_; bool dirty_;
}; };
typedef typename block::ptr block_ptr; // FIXME: remove
class read_ref { class read_ref {
public: public:
read_ref(block_manager<BlockSize> const &bm, read_ref(block_manager<BlockSize> const &bm,
block_ptr b); typename block::ptr b);
read_ref(read_ref const &rhs); read_ref(read_ref const &rhs);
virtual ~read_ref(); virtual ~read_ref();
@ -173,7 +172,7 @@ namespace persistent_data {
protected: protected:
block_manager<BlockSize> const *bm_; block_manager<BlockSize> const *bm_;
block_ptr block_; typename block::ptr block_;
unsigned *holders_; unsigned *holders_;
}; };
@ -227,7 +226,7 @@ namespace persistent_data {
private: private:
void check(block_address b) const; void check(block_address b) const;
void write_block(block_ptr b) const; void write_block(typename block::ptr b) const;
enum lock_type { enum lock_type {
READ_LOCK, READ_LOCK,

26
persistent-data/block.tcc
View File

@ -153,7 +153,7 @@ block_manager<BlockSize>::block::flush()
template <uint32_t BlockSize> template <uint32_t BlockSize>
block_manager<BlockSize>::read_ref::read_ref(block_manager<BlockSize> const &bm, block_manager<BlockSize>::read_ref::read_ref(block_manager<BlockSize> const &bm,
block_ptr b) typename block::ptr b)
: bm_(&bm), : bm_(&bm),
block_(b), block_(b),
holders_(new unsigned) holders_(new unsigned)
@ -218,7 +218,7 @@ block_manager<BlockSize>::read_ref::data() const
template <uint32_t BlockSize> template <uint32_t BlockSize>
block_manager<BlockSize>::write_ref::write_ref(block_manager<BlockSize> const &bm, block_manager<BlockSize>::write_ref::write_ref(block_manager<BlockSize> const &bm,
block_ptr b) typename block::ptr b)
: read_ref(bm, b) : read_ref(bm, b)
{ {
b->dirty_ = true; b->dirty_ = true;
@ -252,14 +252,14 @@ block_manager<BlockSize>::read_lock(block_address location,
tracker_.read_lock(location); tracker_.read_lock(location);
try { try {
check(location); check(location);
boost::optional<block_ptr> cached_block = cache_.get(location); boost::optional<typename block::ptr> cached_block = cache_.get(location);
if (cached_block) { if (cached_block) {
(*cached_block)->check_read_lockable(); (*cached_block)->check_read_lockable();
return read_ref(*this, *cached_block); return read_ref(*this, *cached_block);
} }
block_ptr b(new block(io_, location, BT_NORMAL, v)); typename block::ptr b(new block(io_, location, BT_NORMAL, v));
cache_.insert(b); cache_.insert(b);
return read_ref(*this, b); return read_ref(*this, b);
@ -278,14 +278,14 @@ block_manager<BlockSize>::write_lock(block_address location,
try { try {
check(location); check(location);
boost::optional<block_ptr> cached_block = cache_.get(location); boost::optional<typename block::ptr> cached_block = cache_.get(location);
if (cached_block) { if (cached_block) {
(*cached_block)->check_write_lockable(); (*cached_block)->check_write_lockable();
return write_ref(*this, *cached_block); return write_ref(*this, *cached_block);
} }
block_ptr b(new block(io_, location, BT_NORMAL, v)); typename block::ptr b(new block(io_, location, BT_NORMAL, v));
cache_.insert(b); cache_.insert(b);
return write_ref(*this, b); return write_ref(*this, b);
@ -305,14 +305,14 @@ block_manager<BlockSize>::write_lock_zero(block_address location,
try { try {
check(location); check(location);
boost::optional<block_ptr> cached_block = cache_.get(location); boost::optional<typename block::ptr> cached_block = cache_.get(location);
if (cached_block) { if (cached_block) {
(*cached_block)->check_write_lockable(); (*cached_block)->check_write_lockable();
memset((*cached_block)->data_->raw(), 0, BlockSize); memset((*cached_block)->data_->raw(), 0, BlockSize);
return write_ref(*this, *cached_block); return write_ref(*this, *cached_block);
} }
block_ptr b(new block(io_, location, BT_NORMAL, v, true)); typename block::ptr b(new block(io_, location, BT_NORMAL, v, true));
cache_.insert(b); cache_.insert(b);
return write_ref(*this, b); return write_ref(*this, b);
@ -331,7 +331,7 @@ block_manager<BlockSize>::superblock(block_address location,
try { try {
check(location); check(location);
boost::optional<block_ptr> cached_block = cache_.get(location); boost::optional<typename block::ptr> cached_block = cache_.get(location);
if (cached_block) { if (cached_block) {
(*cached_block)->check_write_lockable(); (*cached_block)->check_write_lockable();
@ -340,7 +340,7 @@ block_manager<BlockSize>::superblock(block_address location,
return write_ref(*this, *cached_block); return write_ref(*this, *cached_block);
} }
block_ptr b(new block(io_, location, BT_SUPERBLOCK, v)); typename block::ptr b(new block(io_, location, BT_SUPERBLOCK, v));
cache_.insert(b); cache_.insert(b);
return write_ref(*this, b); return write_ref(*this, b);
@ -359,7 +359,7 @@ block_manager<BlockSize>::superblock_zero(block_address location,
try { try {
check(location); check(location);
boost::optional<block_ptr> cached_block = cache_.get(location); boost::optional<typename block::ptr> cached_block = cache_.get(location);
if (cached_block) { if (cached_block) {
(*cached_block)->check_write_lockable(); (*cached_block)->check_write_lockable();
@ -368,7 +368,7 @@ block_manager<BlockSize>::superblock_zero(block_address location,
return write_ref(*this, *cached_block); return write_ref(*this, *cached_block);
} }
block_ptr b(new block(io_, location, BT_SUPERBLOCK, typename block::ptr b(new block(io_, location, BT_SUPERBLOCK,
mk_validator(new noop_validator), true)); mk_validator(new noop_validator), true));
b->validator_ = v; b->validator_ = v;
cache_.insert(b); cache_.insert(b);
@ -397,7 +397,7 @@ block_manager<BlockSize>::get_nr_blocks() const
template <uint32_t BlockSize> template <uint32_t BlockSize>
void void
block_manager<BlockSize>::write_block(block_ptr b) const block_manager<BlockSize>::write_block(typename block::ptr b) const
{ {
b->flush(); b->flush();
} }