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

[thin_debug] Reduce code size by eliminating duplicated types

Browse Source 
This patch doesn't have a significant effect - only a few KBs of code
is reduced. However, it's still a nice have.
This commit is contained in:
Ming-Hung Tsai 2021-01-12 18:09:00 +08:00
parent 0ce026caf5
commit 62d09c6752
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
thin-provisioning/thin_debug.cc
View File

@ -215,6 +215,8 @@ namespace {
class device_details_show_traits : public thin_provisioning::device_tree_detail::device_details_traits { class device_details_show_traits : public thin_provisioning::device_tree_detail::device_details_traits {
public: public:
typedef thin_provisioning::device_tree_detail::device_details_traits value_trait;
static void show(formatter &f, string const &key, static void show(formatter &f, string const &key,
thin_provisioning::device_tree_detail::device_details const &value) { thin_provisioning::device_tree_detail::device_details const &value) {
field(f, "mapped blocks", value.mapped_blocks_); field(f, "mapped blocks", value.mapped_blocks_);
@ -226,6 +228,8 @@ namespace {
class uint64_show_traits : public uint64_traits { class uint64_show_traits : public uint64_traits {
public: public:
typedef uint64_traits value_trait;
static void show(formatter &f, string const &key, uint64_t const &value) { static void show(formatter &f, string const &key, uint64_t const &value) {
field(f, key, lexical_cast<string>(value)); field(f, key, lexical_cast<string>(value));
} }
@ -233,6 +237,8 @@ namespace {
class block_show_traits : public thin_provisioning::mapping_tree_detail::block_traits { class block_show_traits : public thin_provisioning::mapping_tree_detail::block_traits {
public: public:
typedef thin_provisioning::mapping_tree_detail::block_traits value_trait;
static void show(formatter &f, string const &key, static void show(formatter &f, string const &key,
thin_provisioning::mapping_tree_detail::block_time const &value) { thin_provisioning::mapping_tree_detail::block_time const &value) {
field(f, "block", value.block_); field(f, "block", value.block_);
@ -240,7 +246,7 @@ namespace {
} }
}; };
template <typename ValueTraits> template <typename ShowTraits>
class show_btree_node : public command { class show_btree_node : public command {
public: public:
explicit show_btree_node(metadata::ptr md) explicit show_btree_node(metadata::ptr md)
@ -256,18 +262,18 @@ namespace {
block_address block = lexical_cast<block_address>(args[1]); block_address block = lexical_cast<block_address>(args[1]);
block_manager::read_ref rr = md_->tm_->read_lock(block); block_manager::read_ref rr = md_->tm_->read_lock(block);
node_ref<uint64_show_traits> n = btree_detail::to_node<uint64_show_traits>(rr); node_ref<uint64_show_traits::value_trait> n = btree_detail::to_node<uint64_show_traits::value_trait>(rr);
if (n.get_type() == INTERNAL) if (n.get_type() == INTERNAL)
show_node<uint64_show_traits>(n, out); show_node<uint64_show_traits>(n, out);
else { else {
node_ref<ValueTraits> n = btree_detail::to_node<ValueTraits>(rr); node_ref<typename ShowTraits::value_trait> n = btree_detail::to_node<typename ShowTraits::value_trait>(rr);
show_node<ValueTraits>(n, out); show_node<ShowTraits>(n, out);
} }
} }
private: private:
template <typename VT> template <typename ST>
void show_node(node_ref<VT> n, ostream &out) { void show_node(node_ref<typename ST::value_trait> n, ostream &out) {
xml_formatter f; xml_formatter f;
field(f, "csum", n.get_checksum()); field(f, "csum", n.get_checksum());
@ -280,7 +286,7 @@ namespace {
for (unsigned i = 0; i < n.get_nr_entries(); i++) { for (unsigned i = 0; i < n.get_nr_entries(); i++) {
formatter::ptr f2(new xml_formatter); formatter::ptr f2(new xml_formatter);
field(*f2, "key", n.key_at(i)); field(*f2, "key", n.key_at(i));
VT::show(*f2, "value", n.value_at(i)); ST::show(*f2, "value", n.value_at(i));
f.child("child", f2); f.child("child", f2);
} }