Bricoles/xv6-riscv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scheduler()'s intr_on() is in the wrong place, reflecting

Browse source 
the locking scheme from long ago.
This commit is contained in:
Robert Morris 2022-10-16 15:28:21 -04:00
parent 348cf7fee4
commit f376ad7f1f
1 changed files with 4 additions and 3 deletions

7
kernel/proc.c
View file

@ -446,12 +446,13 @@ scheduler(void)
{ {
struct proc *p; struct proc *p;
struct cpu *c = mycpu(); struct cpu *c = mycpu();
// Interrupts are disabled at first, but they must be
// enabled in order for the shell to get input.
intr_on();
c->proc = 0; c->proc = 0;
for(;;){ for(;;){
// Avoid deadlock by ensuring that devices can interrupt.
intr_on();
for(p = proc; p < &proc[NPROC]; p++) { for(p = proc; p < &proc[NPROC]; p++) {
acquire(&p->lock); acquire(&p->lock);
if(p->state == RUNNABLE) { if(p->state == RUNNABLE) {