Skip to content

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

yield in exec, preferentially steal threads in the middle of exec.

hopefully this will migrate less state when stealing.
上级 a2bd6f68
显示空白字符变更
内嵌 并排
正在显示 包含 12 行增加 和 4 行删除
include/proc.hh
浏览文件 @ 4947af9c
...@@ -87,6 +87,7 @@ struct proc : public rcu_freed { ...@@ -87,6 +87,7 @@ struct proc : public rcu_freed {
u64 user_fs_; u64 user_fs_;
u64 unmap_tlbreq_; u64 unmap_tlbreq_;
int exec_cpuid_; int exec_cpuid_;
int in_exec_;
static proc* alloc(); static proc* alloc();
void set_state(procstate_t s); void set_state(procstate_t s);
......
kernel/exec.cc
浏览文件 @ 4947af9c
...@@ -197,6 +197,10 @@ exec(const char *path, char **argv) ...@@ -197,6 +197,10 @@ exec(const char *path, char **argv)
myproc()->exec_cpuid_ = mycpuid(); myproc()->exec_cpuid_ = mycpuid();
myproc()->in_exec_ = 1;
yield();
myproc()->in_exec_ = 0;
if((ip = namei(myproc()->cwd, path)) == 0) if((ip = namei(myproc()->cwd, path)) == 0)
return -1; return -1;
......
kernel/proc.cc
浏览文件 @ 4947af9c
...@@ -41,7 +41,7 @@ proc::proc(int npid) : ...@@ -41,7 +41,7 @@ proc::proc(int npid) :
pid(npid), parent(0), tf(0), context(0), killed(0), pid(npid), parent(0), tf(0), context(0), killed(0),
ftable(0), cwd(0), tsc(0), curcycles(0), cpuid(0), epoch(0), ftable(0), cwd(0), tsc(0), curcycles(0), cpuid(0), epoch(0),
cpu_pin(0), runq(0), oncv(0), cv_wakeup(0), cpu_pin(0), runq(0), oncv(0), cv_wakeup(0),
user_fs_(0), unmap_tlbreq_(0), state_(EMBRYO) user_fs_(0), unmap_tlbreq_(0), in_exec_(0), state_(EMBRYO)
{ {
snprintf(lockname, sizeof(lockname), "cv:proc:%d", pid); snprintf(lockname, sizeof(lockname), "cv:proc:%d", pid);
initlock(&lock, lockname+3, LOCKSTAT_PROC); initlock(&lock, lockname+3, LOCKSTAT_PROC);
......
kernel/sched.cc
浏览文件 @ 4947af9c
...@@ -133,12 +133,12 @@ int ...@@ -133,12 +133,12 @@ int
steal(void) steal(void)
{ {
struct proc *steal; struct proc *steal;
int i;
int r = 0; int r = 0;
pushcli(); pushcli();
for (i = 1; i < ncpu; i++) { for (int nonexec = 0; nonexec < 2; nonexec++) {
for (int i = 1; i < ncpu; i++) {
struct runq *q = &runq[(i+mycpu()->id) % ncpu]; struct runq *q = &runq[(i+mycpu()->id) % ncpu];
struct proc *p; struct proc *p;
...@@ -151,6 +151,7 @@ steal(void) ...@@ -151,6 +151,7 @@ steal(void)
continue; continue;
STAILQ_FOREACH(p, &q->q, runqlink) { STAILQ_FOREACH(p, &q->q, runqlink) {
if (p->get_state() == RUNNABLE && !p->cpu_pin && if (p->get_state() == RUNNABLE && !p->cpu_pin &&
(p->in_exec_ || nonexec) &&
p->curcycles != 0 && p->curcycles > VICTIMAGE) p->curcycles != 0 && p->curcycles > VICTIMAGE)
{ {
STAILQ_REMOVE(&q->q, p, proc, runqlink); STAILQ_REMOVE(&q->q, p, proc, runqlink);
...@@ -170,14 +171,16 @@ steal(void) ...@@ -170,14 +171,16 @@ steal(void)
addrun(steal); addrun(steal);
release(&steal->lock); release(&steal->lock);
r = 1; r = 1;
break; goto found;
} }
if (steal->get_state() == RUNNABLE) if (steal->get_state() == RUNNABLE)
addrun(steal); addrun(steal);
release(&steal->lock); release(&steal->lock);
} }
} }
}
found:
popcli(); popcli();
return r; return r;
} }
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论