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

Don't kill process when inside kernel.

Browse source
This commit is contained in:
rsc 2006-07-16 02:09:45 +00:00
parent 4ed974f5ea
commit 72fef4f855
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
trap.c
View file

@ -70,11 +70,18 @@ trap(struct Trapframe *tf)
lapic_timerintr(); lapic_timerintr();
if(cpus[cpu()].nlock) if(cpus[cpu()].nlock)
panic("timer interrupt while holding a lock"); panic("timer interrupt while holding a lock");
if((read_eflags() & FL_IF) == 0)
panic("timer interrupt but interrupts now disabled");
if(cp){ if(cp){
if((read_eflags() & FL_IF) == 0) // Force process exit if it has been killed
panic("timer interrupt but interrupts now disabled"); // and the interrupt came from user space.
if(cp->killed) // (If the kernel was executing at time of interrupt,
// don't kill the process. Let the process get back
// out to its regular system call return.)
if((tf->tf_cs&3) == 3 && cp->killed)
proc_exit(); proc_exit();
// Force process to give up CPU and let others run.
if(cp->state == RUNNING) if(cp->state == RUNNING)
yield(); yield();
} }