Skip to content

X
xv6-public
提交 bd57e37a 创建 作者: David Benjamin's avatar David Benjamin
浏览文件
操作

Store radix_entry in radix_iterator2 instead of void*

Still assuming that the leaf is at level 0, but we're getting there.
上级 0e9d895b
隐藏空白字符变更
内嵌 并排
正在显示 包含 6 行增加 和 6 行删除
include/radix.hh
浏览文件 @ bd57e37a
...@@ -221,7 +221,7 @@ struct radix_iterator2 { ...@@ -221,7 +221,7 @@ struct radix_iterator2 {
// and is radix_elem. The rest are radix_node. For now we assume all // and is radix_elem. The rest are radix_node. For now we assume all
// leaves are at level 0. Later we'll steal a bit for them. The root // leaves are at level 0. Later we'll steal a bit for them. The root
// is path_[radix_levels]. // is path_[radix_levels].
void *path_[radix_levels+1]; radix_entry path_[radix_levels+1];
radix_iterator2(const radix* r, u64 k); radix_iterator2(const radix* r, u64 k);
...@@ -230,9 +230,9 @@ struct radix_iterator2 { ...@@ -230,9 +230,9 @@ struct radix_iterator2 {
return *this; return *this;
} }
radix_elem* operator*() { radix_elem* operator*() {
return (radix_elem*)path_[0]; return path_[0].elem();
} }
radix_node* node(u32 level) { return (radix_node*)path_[level]; } radix_node* node(u32 level) { return path_[level].node(); }
// Compare equality on just the key. // Compare equality on just the key.
bool operator==(const radix_iterator2 &other) { bool operator==(const radix_iterator2 &other) {
......
kernel/radix.cc
浏览文件 @ bd57e37a
...@@ -187,7 +187,7 @@ radix_iterator2::radix_iterator2(const radix* r, u64 k) ...@@ -187,7 +187,7 @@ radix_iterator2::radix_iterator2(const radix* r, u64 k)
: r_(r), k_(k) { : r_(r), k_(k) {
dprintf("%p: Made iterator with k = %lu\n", r_, k_); dprintf("%p: Made iterator with k = %lu\n", r_, k_);
if (k_ != ~0ULL) { if (k_ != ~0ULL) {
path_[radix_levels] = (void*)r_->root_.load().ptr(); path_[radix_levels] = r_->root_.load();
if (!find_first_leaf(radix_levels - 1)) if (!find_first_leaf(radix_levels - 1))
k_ = ~0ULL; k_ = ~0ULL;
} }
...@@ -220,8 +220,8 @@ radix_iterator2::find_first_leaf(u32 level) ...@@ -220,8 +220,8 @@ radix_iterator2::find_first_leaf(u32 level)
{ {
// Find the first non-empty node after k_ on this level. // Find the first non-empty node after k_ on this level.
for (u32 idx = index(k_, level); idx < (1<<bits_per_level); idx++) { for (u32 idx = index(k_, level); idx < (1<<bits_per_level); idx++) {
void *next = (void*) node(level+1)->child[idx].load().ptr(); radix_entry next = node(level+1)->child[idx].load();
if (next != nullptr) { if (!next.is_null()) {
if (index(k_, level) != idx) { if (index(k_, level) != idx) {
// We had to advance; clear everything this level and under // We had to advance; clear everything this level and under
// and set this one. // and set this one.
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论