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

[io_generator] Simplify the class interface

Browse Source
This commit is contained in:
Ming-Hung Tsai 2020-06-20 00:04:01 +08:00
parent fe754d81a4
commit 084ac4b950
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
base/io_generator.cc
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

3
base/io_generator.h
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

4
thin-provisioning/thin_generate_mappings.cc
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_);