Skip to content

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

hlt when idle

上级 4fe2d66d
隐藏空白字符变更
内嵌 并排
正在显示 包含 25 行增加 和 12 行删除
proc.c
浏览文件 @ fe8f6fc2
...@@ -112,7 +112,7 @@ addrun(struct proc *p) ...@@ -112,7 +112,7 @@ addrun(struct proc *p)
if(!holding(&p->lock)) if(!holding(&p->lock))
panic("addrun no p->lock"); panic("addrun no p->lock");
acquire(&runqs[p->cpuid].lock); acquire(&runqs[p->cpuid].lock);
// cprintf("%d: addrun %d\n", cpunum(), p->pid); // cprintf("%d: addrun %d\n", cpu->id, p->pid);
addrun1(&runqs[p->cpuid], p); addrun1(&runqs[p->cpuid], p);
release(&runqs[p->cpuid].lock); release(&runqs[p->cpuid].lock);
} }
...@@ -136,7 +136,7 @@ delrun(struct proc *p) ...@@ -136,7 +136,7 @@ delrun(struct proc *p)
if(!holding(&p->lock)) if(!holding(&p->lock))
panic("delrun no p->lock"); panic("delrun no p->lock");
acquire(&runq->lock); acquire(&runq->lock);
// cprintf("%d: delrun %d\n", cpunum(), p->pid); // cprintf("%d: delrun %d\n", cpu->id, p->pid);
delrun1(runq, p); delrun1(runq, p);
release(&runq->lock); release(&runq->lock);
} }
...@@ -423,7 +423,7 @@ migrate(void) ...@@ -423,7 +423,7 @@ migrate(void)
struct proc *p; struct proc *p;
for (c = 0; c < NCPU; c++) { for (c = 0; c < NCPU; c++) {
if (c == cpunum()) if (c == cpu->id)
continue; continue;
if (idle[c]) { // OK if there is a race if (idle[c]) { // OK if there is a race
// cprintf("migrate to %d\n", c); // cprintf("migrate to %d\n", c);
...@@ -446,7 +446,7 @@ steal(void) ...@@ -446,7 +446,7 @@ steal(void)
struct proc *p; struct proc *p;
for (c = 0; c < NCPU; c++) { for (c = 0; c < NCPU; c++) {
if (c == cpunum()) if (c == cpu->id)
continue; continue;
acquire(&runqs[c].lock); acquire(&runqs[c].lock);
STAILQ_FOREACH(p, &runqs[c].runq, run_next) { STAILQ_FOREACH(p, &runqs[c].runq, run_next) {
...@@ -454,7 +454,7 @@ steal(void) ...@@ -454,7 +454,7 @@ steal(void)
if (p->state != RUNNABLE) if (p->state != RUNNABLE)
panic("non-runnable proc on runq"); panic("non-runnable proc on runq");
if (p->curcycles == 0 || p->curcycles > MINCYCTHRESH) { if (p->curcycles == 0 || p->curcycles > MINCYCTHRESH) {
// cprintf("%d: steal %d (%d) from %d\n", cpunum(), p->pid, p->curcycles, c); // cprintf("%d: steal %d (%d) from %d\n", cpu->id, p->pid, p->curcycles, c);
delrun1(&runqs[c], p); delrun1(&runqs[c], p);
release(&runqs[c].lock); release(&runqs[c].lock);
p->curcycles = 0; p->curcycles = 0;
...@@ -487,7 +487,7 @@ scheduler(void) ...@@ -487,7 +487,7 @@ scheduler(void)
pid = ns_allockey(nspid); pid = ns_allockey(nspid);
// Enabling mtrace calls in scheduler generates many mtrace_call_entrys. // Enabling mtrace calls in scheduler generates many mtrace_call_entrys.
// mtrace_call_set(1, cpunum()); // mtrace_call_set(1, cpu->id);
mtrace_fcall_register(pid, (unsigned long)scheduler, 0, mtrace_start); mtrace_fcall_register(pid, (unsigned long)scheduler, 0, mtrace_start);
for(;;){ for(;;){
...@@ -520,10 +520,10 @@ scheduler(void) ...@@ -520,10 +520,10 @@ scheduler(void)
mtrace_fcall_register(pid, 0, 0, mtrace_pause); mtrace_fcall_register(pid, 0, 0, mtrace_pause);
mtrace_fcall_register(proc->pid, 0, 0, mtrace_resume); mtrace_fcall_register(proc->pid, 0, 0, mtrace_resume);
mtrace_call_set(1, cpunum()); mtrace_call_set(1, cpu->id);
swtch(&cpu->scheduler, proc->context); swtch(&cpu->scheduler, proc->context);
mtrace_fcall_register(pid, 0, 0, mtrace_resume); mtrace_fcall_register(pid, 0, 0, mtrace_resume);
mtrace_call_set(0, cpunum()); mtrace_call_set(0, cpu->id);
switchkvm(); switchkvm();
// Process is done running for now. // Process is done running for now.
...@@ -535,11 +535,19 @@ scheduler(void) ...@@ -535,11 +535,19 @@ scheduler(void)
if(p==0) { if(p==0) {
release(&runq->lock); release(&runq->lock);
if (!steal() && !idle[cpu->id]) { if (steal()) {
// cprintf("%d: idle\n", cpu->id); if (idle[cpu->id])
idle[cpu->id] = 1; idle[cpu->id] = 0;
} else {
if (!idle[cpu->id])
idle[cpu->id] = 1;
} }
} }
if (idle[cpu->id]) {
sti();
hlt();
}
} }
} }
...@@ -561,7 +569,7 @@ sched(void) ...@@ -561,7 +569,7 @@ sched(void)
intena = cpu->intena; intena = cpu->intena;
proc->curcycles += rdtsc() - proc->tsc; proc->curcycles += rdtsc() - proc->tsc;
mtrace_fcall_register(proc->pid, 0, 0, mtrace_pause); mtrace_fcall_register(proc->pid, 0, 0, mtrace_pause);
mtrace_call_set(0, cpunum()); mtrace_call_set(0, cpu->id);
swtch(&proc->context, cpu->scheduler); swtch(&proc->context, cpu->scheduler);
cpu->intena = intena; cpu->intena = intena;
......
x86.h
浏览文件 @ fe8f6fc2
...@@ -212,6 +212,11 @@ static __inline__ unsigned long long rdtsc(void) ...@@ -212,6 +212,11 @@ static __inline__ unsigned long long rdtsc(void)
return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 ); return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
} }
static __inline__ void hlt(void)
{
__asm__ __volatile__ ("hlt");
}
//PAGEBREAK: 36 //PAGEBREAK: 36
// Layout of the trap frame built on the stack by the // Layout of the trap frame built on the stack by the
// hardware and by trapasm.S, and passed to trap(). // hardware and by trapasm.S, and passed to trap().
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论