ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

cpu->scheduler -> cpu->context to reduce confusion

Browse source
This commit is contained in:
Robert Morris 2020-07-17 16:40:57 -04:00
parent d6dad42aaf
commit 3b053f5d58
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/proc.c
View file

@ -456,7 +456,7 @@ scheduler(void)
// before jumping back to us. // before jumping back to us.
p->state = RUNNING; p->state = RUNNING;
c->proc = p; c->proc = p;
swtch(&c->scheduler, &p->context); swtch(&c->context, &p->context);
// Process is done running for now. // Process is done running for now.
// It should have changed its p->state before coming back. // It should have changed its p->state before coming back.
@ -490,7 +490,7 @@ sched(void)
panic("sched interruptible"); panic("sched interruptible");
intena = mycpu()->intena; intena = mycpu()->intena;
swtch(&p->context, &mycpu()->scheduler); swtch(&p->context, &mycpu()->context);
mycpu()->intena = intena; mycpu()->intena = intena;
} }

2
kernel/proc.h
View file

@ -21,7 +21,7 @@ struct context {
// Per-CPU state. // Per-CPU state.
struct cpu { struct cpu {
struct proc *proc; // The process running on this cpu, or null. struct proc *proc; // The process running on this cpu, or null.
struct context scheduler; // swtch() here to enter scheduler(). struct context context; // swtch() here to enter scheduler().
int noff; // Depth of push_off() nesting. int noff; // Depth of push_off() nesting.
int intena; // Were interrupts enabled before push_off()? int intena; // Were interrupts enabled before push_off()?
}; };