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

[thin_delta] backport cherry-picked changes to c++98

Browse Source
This commit is contained in:
Joe Thornber 2016-02-18 11:37:51 +00:00
parent a21cee55c7
commit 0ec27c7835
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
thin-provisioning/thin_delta.cc
View File

@ -464,31 +464,31 @@ namespace local {
// We iterate through both sets of mappings in parallel // We iterate through both sets of mappings in parallel
// noting any differences. // noting any differences.
mapping_stream<mapping_deque> ls{left}; mapping_stream<mapping_deque> ls(left);
mapping_stream<mapping_deque> rs{right}; mapping_stream<mapping_deque> rs(right);
while (ls.more_mappings() && rs.more_mappings()) { while (ls.more_mappings() && rs.more_mappings()) {
auto &lm = ls.get_mapping(); mapping const &lm = ls.get_mapping();
auto &rm = rs.get_mapping(); mapping const &rm = rs.get_mapping();
if (lm.vbegin_ < rm.vbegin_) { if (lm.vbegin_ < rm.vbegin_) {
auto delta = min<uint64_t>(lm.len_, rm.vbegin_ - lm.vbegin_); uint64_t delta = min<uint64_t>(lm.len_, rm.vbegin_ - lm.vbegin_);
e.left_only(lm.vbegin_, lm.dbegin_, delta); e.left_only(lm.vbegin_, lm.dbegin_, delta);
ls.consume(delta); ls.consume(delta);
} else if (lm.vbegin_ > rm.vbegin_) { } else if (lm.vbegin_ > rm.vbegin_) {
auto delta = min<uint64_t>(rm.len_, lm.vbegin_ - rm.vbegin_); uint64_t delta = min<uint64_t>(rm.len_, lm.vbegin_ - rm.vbegin_);
e.right_only(rm.vbegin_, rm.dbegin_, delta); e.right_only(rm.vbegin_, rm.dbegin_, delta);
rs.consume(delta); rs.consume(delta);
} else if (lm.dbegin_ != rm.dbegin_) { } else if (lm.dbegin_ != rm.dbegin_) {
auto delta = min<uint64_t>(lm.len_, rm.len_); uint64_t delta = min<uint64_t>(lm.len_, rm.len_);
e.blocks_differ(lm.vbegin_, lm.dbegin_, rm.dbegin_, delta); e.blocks_differ(lm.vbegin_, lm.dbegin_, rm.dbegin_, delta);
ls.consume(delta); ls.consume(delta);
rs.consume(delta); rs.consume(delta);
} else { } else {
auto delta = min<uint64_t>(lm.len_, rm.len_); uint64_t delta = min<uint64_t>(lm.len_, rm.len_);
e.blocks_same(lm.vbegin_, lm.dbegin_, delta); e.blocks_same(lm.vbegin_, lm.dbegin_, delta);
ls.consume(delta); ls.consume(delta);
rs.consume(delta); rs.consume(delta);
@ -496,13 +496,13 @@ namespace local {
} }
while (ls.more_mappings()) { while (ls.more_mappings()) {
auto &lm = ls.get_mapping(); mapping const &lm = ls.get_mapping();
e.left_only(lm.vbegin_, lm.dbegin_, lm.len_); e.left_only(lm.vbegin_, lm.dbegin_, lm.len_);
ls.consume(lm.len_); ls.consume(lm.len_);
} }
while (rs.more_mappings()) { while (rs.more_mappings()) {
auto &rm = rs.get_mapping(); mapping const &rm = rs.get_mapping();
e.right_only(rm.vbegin_, rm.dbegin_, rm.len_); e.right_only(rm.vbegin_, rm.dbegin_, rm.len_);
rs.consume(rm.len_); rs.consume(rm.len_);
} }