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

[btree] call inc_children when shadowning a btree node.

Browse Source
This commit is contained in:
Joe Thornber 2013-06-19 17:20:12 +01:00
parent ec99e6fd93
commit a2e51062e3
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
persistent-data/data-structures/btree.h
View File

@ -397,12 +397,13 @@ namespace persistent_data {
block_address parent_index, block_address parent_index,
uint64_t key); uint64_t key);
template <typename ValueTraits2> template <typename ValueTraits2, typename RC>
bool bool
insert_location(btree_detail::shadow_spine &spine, insert_location(btree_detail::shadow_spine &spine,
block_address block, block_address block,
uint64_t key, uint64_t key,
int *index); int *index,
RC &leaf_rc);
void walk_tree(visitor &visitor, void walk_tree(visitor &visitor,
btree_detail::node_location const &loc, btree_detail::node_location const &loc,

24
persistent-data/data-structures/btree.tcc
View File

@ -467,7 +467,7 @@ namespace persistent_data {
shadow_spine spine(tm_, validator_); shadow_spine spine(tm_, validator_);
for (unsigned level = 0; level < Levels - 1; ++level) { for (unsigned level = 0; level < Levels - 1; ++level) {
bool need_insert = insert_location<uint64_traits>(spine, block, key[level], &index); bool need_insert = insert_location<uint64_traits>(spine, block, key[level], &index, internal_rc_);
internal_node n = spine.template get_node<uint64_traits>(); internal_node n = spine.template get_node<uint64_traits>();
if (need_insert) { if (need_insert) {
@ -478,7 +478,7 @@ namespace persistent_data {
block = n.value_at(index); block = n.value_at(index);
} }
bool need_insert = insert_location<ValueTraits>(spine, block, key[Levels - 1], &index); bool need_insert = insert_location<ValueTraits>(spine, block, key[Levels - 1], &index, rc_);
leaf_node n = spine.template get_node<ValueTraits>(); leaf_node n = spine.template get_node<ValueTraits>();
if (need_insert) if (need_insert)
@ -678,13 +678,14 @@ namespace persistent_data {
// Returns true if we need a new insertion, rather than overwrite. // Returns true if we need a new insertion, rather than overwrite.
template <unsigned Levels, typename _> template <unsigned Levels, typename _>
template <typename ValueTraits> template <typename ValueTraits, typename RC>
bool bool
btree<Levels, _>:: btree<Levels, _>::
insert_location(btree_detail::shadow_spine &spine, insert_location(btree_detail::shadow_spine &spine,
block_address block, block_address block,
uint64_t key, uint64_t key,
int *index) int *index,
RC &leaf_rc)
{ {
using namespace btree_detail; using namespace btree_detail;
@ -694,10 +695,17 @@ namespace persistent_data {
for (;;) { for (;;) {
inc = spine.step(block); inc = spine.step(block);
#if 0
if (inc) // FIXME: factor out
inc_children<ValueTraits>(); {
#endif node_ref<uint64_traits> nr = spine.template get_node<uint64_traits>();
if (nr.get_type() == INTERNAL)
nr.inc_children(internal_rc_);
else {
node_ref<ValueTraits> leaf = spine.template get_node<ValueTraits>();
leaf.inc_children(leaf_rc);
}
}
// patch up the parent to point to the new shadow // patch up the parent to point to the new shadow
if (spine.has_parent()) { if (spine.has_parent()) {