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

check p->killed for long-lived sleeps

Browse source
This commit is contained in:
rsc 2007-08-08 10:29:42 +00:00
parent 1cb183a987
commit f2f062da61
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
console.c
View file

@ -6,6 +6,7 @@
#include "dev.h"
#include "param.h"
#include "mmu.h"
#include "proc.h"
struct spinlock console_lock;
int panicked = 0;
@ -395,8 +396,13 @@ console_read(int minor, char *dst, int n)
target = n;
acquire(&kbd_lock);
while(n > 0){
while(kbd_r == kbd_w)
while(kbd_r == kbd_w){
if(curproc[cpu()]->killed){
release(&kbd_lock);
return -1;
}
sleep(&kbd_r, &kbd_lock);
}
c = kbd_buf[kbd_r++];
if(c == C('D')){ // EOF
if(n < target){