Skip to content

X
xv6-public
提交 6b7ca768 创建 作者: Nickolai Zeldovich's avatar Nickolai Zeldovich
浏览文件
操作

allow duplicate keys in namespace

上级 d6952037
隐藏空白字符变更
内嵌 并排
正在显示 包含 21 行增加 和 6 行删除
defs.h
浏览文件 @ 6b7ca768
...@@ -104,8 +104,9 @@ struct ns* nsalloc(void); ...@@ -104,8 +104,9 @@ struct ns* nsalloc(void);
int ns_allockey(struct ns*); int ns_allockey(struct ns*);
int ns_insert(struct ns*, int key, void*); int ns_insert(struct ns*, int key, void*);
void* ns_lookup(struct ns*, int); void* ns_lookup(struct ns*, int);
int ns_remove(struct ns *ns, int key); int ns_remove(struct ns *ns, int key, void *val);
void ns_enumerate(struct ns *ns, void (*f)(int, void *)); void ns_enumerate(struct ns *ns, void (*f)(int, void *));
void ns_enumerate_key(struct ns *ns, int key, void (*f)(void *));
// picirq.c // picirq.c
......
ns.c
浏览文件 @ 6b7ca768
...@@ -111,7 +111,7 @@ ns_lookup(struct ns *ns, int key) ...@@ -111,7 +111,7 @@ ns_lookup(struct ns *ns, int key)
} }
int int
ns_remove(struct ns *ns, int key) ns_remove(struct ns *ns, int key, void *v)
{ {
uint i = key % NHASH; uint i = key % NHASH;
rcu_begin_write(&ns->table[i].l); rcu_begin_write(&ns->table[i].l);
...@@ -122,7 +122,7 @@ ns_remove(struct ns *ns, int key) ...@@ -122,7 +122,7 @@ ns_remove(struct ns *ns, int key)
if (!e) if (!e)
break; break;
if (e->key == key) { if (e->key == key && (e->val == v || v == 0)) {
for (;;) for (;;)
if (__sync_bool_compare_and_swap(pe, e, e->next)) if (__sync_bool_compare_and_swap(pe, e, e->next))
break; break;
...@@ -152,3 +152,17 @@ ns_enumerate(struct ns *ns, void (*f)(int, void *)) ...@@ -152,3 +152,17 @@ ns_enumerate(struct ns *ns, void (*f)(int, void *))
rcu_end_read(); rcu_end_read();
} }
void
ns_enumerate_key(struct ns *ns, int key, void (*f)(void *))
{
uint i = key % NHASH;
rcu_begin_read();
struct elem *e = ns->table[i].chain;
while (e) {
if (e->key == key)
(*f)(e->val);
e = e->next;
}
rcu_end_read();
}
proc.c
浏览文件 @ 6b7ca768
...@@ -66,7 +66,7 @@ allocproc(void) ...@@ -66,7 +66,7 @@ allocproc(void)
// Allocate kernel stack if possible. // Allocate kernel stack if possible.
if((p->kstack = kalloc()) == 0){ if((p->kstack = kalloc()) == 0){
ns_remove(nspid, p->pid); ns_remove(nspid, p->pid, p);
rcu_delayed(p, kmfree); rcu_delayed(p, kmfree);
return 0; return 0;
} }
...@@ -286,7 +286,7 @@ fork(int flags) ...@@ -286,7 +286,7 @@ fork(int flags)
kfree(np->kstack); kfree(np->kstack);
np->kstack = 0; np->kstack = 0;
np->state = UNUSED; np->state = UNUSED;
ns_remove(nspid, np->pid); ns_remove(nspid, np->pid, np);
rcu_delayed(np, kmfree); rcu_delayed(np, kmfree);
return -1; return -1;
} }
...@@ -397,7 +397,7 @@ wait(void) ...@@ -397,7 +397,7 @@ wait(void)
p->kstack = 0; p->kstack = 0;
vmap_decref(p->vmap); vmap_decref(p->vmap);
p->state = UNUSED; p->state = UNUSED;
if (ns_remove(nspid, p->pid) < 0) if (ns_remove(nspid, p->pid, p) < 0)
panic("wait: ns_remove"); panic("wait: ns_remove");
p->pid = 0; p->pid = 0;
p->parent = 0; p->parent = 0;
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论