Merge pull request #142 from mingnus/thin-generate-metadata-wip

thin_generate_metadata minor fixes
This commit is contained in:
Joe Thornber 2020-06-24 12:29:31 +01:00 committed by GitHub
commit 8aaea7f45b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 20 deletions

View File

@ -115,8 +115,7 @@ namespace {
class base_io_generator: public io_generator { class base_io_generator: public io_generator {
public: public:
base_io_generator(io_generator_options const &opts); base_io_generator(io_generator_options const &opts);
virtual bool has_next(); virtual bool next(base::io &next_io);
virtual void next(base::io &next_io);
private: private:
offset_generator::ptr offset_generator::ptr
@ -140,19 +139,17 @@ namespace {
io_size_total_(opts.io_size_) { io_size_total_(opts.io_size_) {
} }
bool base_io_generator::has_next() { bool base_io_generator::next(base::io &next_io) {
return io_size_finished_ < io_size_total_;
}
void base_io_generator::next(base::io &next_io) {
if (io_size_finished_ >= io_size_total_) if (io_size_finished_ >= io_size_total_)
throw std::runtime_error(""); return false;
next_io.op_ = op_gen_->next_op(); next_io.op_ = op_gen_->next_op();
next_io.sector_ = offset_gen_->next_offset(); next_io.sector_ = offset_gen_->next_offset();
next_io.size_ = block_size_; next_io.size_ = block_size_;
io_size_finished_ += block_size_; io_size_finished_ += block_size_;
return true;
} }
offset_generator::ptr offset_generator::ptr

View File

@ -42,8 +42,7 @@ namespace base {
public: public:
typedef std::shared_ptr<io_generator> ptr; typedef std::shared_ptr<io_generator> ptr;
virtual bool has_next() = 0; virtual bool next(base::io &next_io) = 0;
virtual void next(base::io &next_io) = 0;
}; };
io_generator::ptr io_generator::ptr

View File

@ -93,10 +93,8 @@ namespace {
io_generator::ptr gen = create_io_generator(opts); io_generator::ptr gen = create_io_generator(opts);
base::io io; base::io io;
while (gen->has_next()) { while (gen->next(io)) {
// TODO: support io.size_ // TODO: support io.size_
gen->next(io);
switch (io.op_) { switch (io.op_) {
case base::REQ_OP_READ: case base::REQ_OP_READ:
process_read(td, pool, io.sector_); process_read(td, pool, io.sector_);
@ -131,10 +129,10 @@ thin_generate_mappings_cmd::usage(std::ostream &out) const
<< " {-h|--help}\n" << " {-h|--help}\n"
<< " {-o|--output} <output device or file>\n" << " {-o|--output} <output device or file>\n"
<< " {--dev-id} <dev-id>\n" << " {--dev-id} <dev-id>\n"
<< " {--offset} <offset>\n" << " {--offset} <offset in sectors>\n"
<< " {--io-size} <io_size>\n" << " {--io-size} <io-size in sectors>\n"
<< " {--rw write|trim|randwrite|randtrim|randtw}\n" << " {--rw write|trim|randwrite|randtrim|randtw}\n"
<< " {--size} <size>\n" << " {--size} <size in sectors>\n"
<< " {-V|--version}" << endl; << " {-V|--version}" << endl;
} }

View File

@ -72,13 +72,16 @@ thin::insert(block_address thin_block, block_address data_block)
{ {
uint64_t key[2] = {dev_, thin_block}; uint64_t key[2] = {dev_, thin_block};
++details_.mapped_blocks_;
changed_ = true;
mapping_tree_detail::block_time bt; mapping_tree_detail::block_time bt;
bt.block_ = data_block; bt.block_ = data_block;
bt.time_ = pool_.get_time(); bt.time_ = pool_.get_time();
return pool_.md_->mappings_->insert(key, bt); bool inserted = pool_.md_->mappings_->insert(key, bt);
changed_ = true;
if (inserted)
++details_.mapped_blocks_;
return inserted;
} }
void void