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

[thin_rmap] now produces ranged output.

Browse Source
This commit is contained in:
Joe Thornber 2013-05-24 13:43:55 +01:00
parent 41204dceaa
commit 8fab2e37af
2 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -115,7 +115,7 @@ endif
$(V) $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $< $(V) $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $<
#---------------------------------------------------------------- #----------------------------------------------------------------
# libpdata
lib/libpdata.a: $(PDATA_OBJECTS) lib/libpdata.a: $(PDATA_OBJECTS)
@echo " [AR] $<" @echo " [AR] $<"
$(V)ar -rv $@ $(PDATA_OBJECTS) > /dev/null 2>&1 $(V)ar -rv $@ $(PDATA_OBJECTS) > /dev/null 2>&1
@ -160,6 +160,7 @@ THIN_RMAP_SOURCE=\
thin-provisioning/mapping_tree.cc \ thin-provisioning/mapping_tree.cc \
thin-provisioning/metadata.cc \ thin-provisioning/metadata.cc \
thin-provisioning/metadata_checker.cc \ thin-provisioning/metadata_checker.cc \
thin-provisioning/rmap_visitor.cc \
thin-provisioning/superblock.cc thin-provisioning/superblock.cc
THIN_DEBUG_OBJECTS=$(subst .cc,.o,$(THIN_DEBUG_SOURCE)) THIN_DEBUG_OBJECTS=$(subst .cc,.o,$(THIN_DEBUG_SOURCE))

53
thin-provisioning/thin_rmap.cc
View File

@ -12,6 +12,7 @@
#include "thin-provisioning/file_utils.h" #include "thin-provisioning/file_utils.h"
#include "thin-provisioning/superblock.h" #include "thin-provisioning/superblock.h"
#include "thin-provisioning/mapping_tree.h" #include "thin-provisioning/mapping_tree.h"
#include "thin-provisioning/rmap_visitor.h"
using namespace std; using namespace std;
using namespace thin_provisioning; using namespace thin_provisioning;
@ -36,40 +37,10 @@ namespace {
//-------------------------------- //--------------------------------
typedef range<block_address> region;
using namespace mapping_tree_detail; using namespace mapping_tree_detail;
class region_visitor { typedef rmap_visitor::region region;
public: typedef rmap_visitor::rmap_region rmap_region;
region_visitor(vector<region> const &regions)
: regions_(regions) {
}
virtual void visit(btree_path const &path, block_time const &bt) {
if (in_regions(bt.block_)) {
uint32_t thin_dev = path[0];
block_address thin_block = path[1];
cout << "[" << thin_dev
<< ", " << thin_block
<< "] -> " << bt.block_
<< endl;
}
}
private:
// Slow, but I suspect we wont run with many regions.
bool in_regions(block_address b) const {
for (region const &r : regions_)
if (r.contains(b))
return true;
return false;
}
vector<region> const &regions_;
};
class damage_visitor { class damage_visitor {
public: public:
@ -78,12 +49,26 @@ namespace {
} }
}; };
void display_rmap(ostream &out, vector<rmap_region> const &rmap) {
for (rmap_region const &r : rmap) {
out << "data " << r.data_begin
<< ".." << r.data_end
<< " -> thin(" << r.thin_dev
<< ") " << r.thin_begin
<< ".." << (r.thin_begin + (r.data_end - r.data_begin))
<< endl;
}
}
int rmap(string const &path, vector<region> const &regions) { int rmap(string const &path, vector<region> const &regions) {
block_counter counter; // FIXME: get rid of this counter arg block_counter counter; // FIXME: get rid of this counter arg
region_visitor rv(regions);
damage_visitor dv; damage_visitor dv;
rmap_visitor rv;
try { try {
for (region const &r : regions)
rv.add_data_region(r);
block_manager<>::ptr bm = open_bm(path); block_manager<>::ptr bm = open_bm(path);
transaction_manager::ptr tm = open_tm(bm); transaction_manager::ptr tm = open_tm(bm);
@ -92,6 +77,8 @@ namespace {
mapping_tree_detail::block_traits::ref_counter(tm->get_sm())); mapping_tree_detail::block_traits::ref_counter(tm->get_sm()));
btree_visit_values(mtree, counter, rv, dv); btree_visit_values(mtree, counter, rv, dv);
rv.complete();
display_rmap(cout, rv.get_rmap());
} catch (std::exception const &e) { } catch (std::exception const &e) {
cerr << e.what(); cerr << e.what();