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

[thin_rmap] rmap_visitor now sorts the rmap into ascending data_block order.

Browse Source
This commit is contained in:
Joe Thornber 2013-05-24 14:01:03 +01:00
parent 8fab2e37af
commit 82324d1d27
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
thin-provisioning/rmap_visitor.cc
View File

@ -1,5 +1,6 @@
#include "thin-provisioning/rmap_visitor.h" #include "thin-provisioning/rmap_visitor.h"
#include <algorithm>
#include <iostream> #include <iostream>
using namespace thin_provisioning; using namespace thin_provisioning;
@ -33,6 +34,12 @@ rmap_visitor::complete()
{ {
if (current_rmap_) if (current_rmap_)
push_current(); push_current();
auto cmp_data_begin = [] (rmap_region const &lhs, rmap_region const &rhs) {
return lhs.data_begin < rhs.data_begin;
};
std::sort(rmap_.begin(), rmap_.end(), cmp_data_begin);
} }
vector<rmap_visitor::rmap_region> const & vector<rmap_visitor::rmap_region> const &

23
unit-tests/rmap_visitor_t.cc
View File

@ -38,6 +38,14 @@ namespace {
visit(thin_dev, b, thin_dev * blocks_per_thin + b); visit(thin_dev, b, thin_dev * blocks_per_thin + b);
} }
void reverse_linear_thins(unsigned nr_thins, unsigned blocks_per_thin) {
for (uint32_t thin_dev = 0; thin_dev < nr_thins; thin_dev++)
for (block_address b = 0; b < blocks_per_thin; b++) {
block_address base = (nr_thins - thin_dev - 1) * blocks_per_thin;
visit(thin_dev, b, base + b);
}
}
void check_rmap_size(unsigned expected) { void check_rmap_size(unsigned expected) {
ASSERT_THAT(rmap_v_.get_rmap().size(), Eq(expected)); ASSERT_THAT(rmap_v_.get_rmap().size(), Eq(expected));
} }
@ -153,4 +161,19 @@ TEST_F(RMapVisitorTests, overlapping_regions)
check_rmap_at(1, 100, 125, 1, 0); check_rmap_at(1, 100, 125, 1, 0);
} }
TEST_F(RMapVisitorTests, rmap_is_sorted)
{
add_data_region(75, 125);
add_data_region(350, 450);
reverse_linear_thins(10, 100);
run();
check_rmap_size(4);
check_rmap_at(0, 75, 100, 9, 75);
check_rmap_at(1, 100, 125, 8, 0);
check_rmap_at(2, 350, 400, 6, 50);
check_rmap_at(3, 400, 450, 5, 0);
}
//---------------------------------------------------------------- //----------------------------------------------------------------