[btree_damage_visitor] factor out non-template functions

persistent-data/data-structures/btree_damage_visitor.cc

@@ -16,13 +16,13 @@ damage_tracker::bad_node()
 	damaged_ = true;
 }
 
-maybe_range64
+damage_tracker::maybe_run64
 damage_tracker::good_internal(block_address begin)
 {
-	maybe_range64 r;
+	maybe_run64 r;
 
 	if (damaged_) {
-		r = maybe_range64(range64(damage_begin_, begin));
+		r = maybe_run64(run64(damage_begin_, begin));
 		damaged_ = false;
 	}
 
@@ -30,13 +30,13 @@ damage_tracker::good_internal(block_address begin)
 	return r;
 }
 
-maybe_range64
-damage_tracker::good_leaf(uint64_t begin, uint64_t end)
+damage_tracker::maybe_run64
+damage_tracker::good_leaf(block_address begin, block_address end)
 {
-	maybe_range64 r;
+	maybe_run64 r;
 
 	if (damaged_) {
-		r = maybe_range64(range64(damage_begin_, begin));
+		r = maybe_run64(run64(damage_begin_, begin));
 		damaged_ = false;
 	}
 
@@ -44,13 +44,49 @@ damage_tracker::good_leaf(uint64_t begin, uint64_t end)
 	return r;
 }
 
-maybe_range64
+damage_tracker::maybe_run64
 damage_tracker::end()
 {
+	maybe_run64 r;
+
 	if (damaged_)
-		return maybe_range64(damage_begin_);
+		r = maybe_run64(damage_begin_);
 	else
-		return maybe_range64();
+		r = maybe_run64();
+
+	damaged_ = false;
+	damage_begin_ = 0;
+
+	return r;
+}
+
+//----------------------------------------------------------------
+
+path_tracker::path_tracker()
+{
+	// We push an empty path, to ensure there
+	// is always a current_path.
+	paths_.push_back(btree_path());
+}
+
+btree_path const *
+path_tracker::next_path(btree_path const &p)
+{
+	if (p != current_path()) {
+		if (paths_.size() == 2)
+			paths_.pop_front();
+		paths_.push_back(p);
+
+		return &paths_.front();
+	}
+
+	return NULL;
+}
+
+btree_path const &
+path_tracker::current_path() const
+{
+	return paths_.back();
 }
 
 //----------------------------------------------------------------