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

[block_manager] Allow people to change the validator for a block

Browse Source
This commit is contained in:
Joe Thornber 2013-04-26 14:14:28 +01:00
parent 0b4c359a63
commit 53ac7b8119
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistent-data/block.h
View File

@ -119,6 +119,8 @@ namespace persistent_data {
void flush(); void flush();
void change_validator(typename block_manager<BlockSize>::validator::ptr v);
typename block_io<BlockSize>::ptr io_; typename block_io<BlockSize>::ptr io_;
block_address location_; block_address location_;
std::auto_ptr<buffer<BlockSize> > data_; std::auto_ptr<buffer<BlockSize> > data_;

19
persistent-data/block.tcc
View File

@ -235,6 +235,19 @@ block_manager<BlockSize>::block::flush()
} }
} }
template <uint32_t BlockSize>
void
block_manager<BlockSize>::block::change_validator(typename block_manager<BlockSize>::validator::ptr v)
{
if (v.get() != validator_.get()) {
if (dirty_)
validator_->prepare(*data_, location_);
validator_ = v;
validator_->check(*data_, location_);
}
}
//---------------------------------------------------------------- //----------------------------------------------------------------
template <uint32_t BlockSize> template <uint32_t BlockSize>
@ -341,9 +354,9 @@ block_manager<BlockSize>::read_lock(block_address location,
boost::optional<typename 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(); typename block::ptr cb = *cached_block;
cb->check_read_lockable();
// FIXME: a different validator may now be set. cb->change_validator(v);
return read_ref(*this, *cached_block); return read_ref(*this, *cached_block);
} }