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

Merge branch 'riscv-killed' into riscv

Browse source
This commit is contained in:
Frans Kaashoek 2022-08-23 07:31:08 -04:00
parent bc48c2be47 4f716c8550
commit cd6207a972
6 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/console.c
View file

@ -89,7 +89,7 @@ consoleread(int user_dst, uint64 dst, int n)
// wait until interrupt handler has put some // wait until interrupt handler has put some
// input into cons.buffer. // input into cons.buffer.
while(cons.r == cons.w){ while(cons.r == cons.w){
if(myproc()->killed){ if(killed(myproc())){
release(&cons.lock); release(&cons.lock);
return -1; return -1;
} }

2
kernel/defs.h
View file

@ -90,6 +90,8 @@ void proc_mapstacks(pagetable_t);
pagetable_t proc_pagetable(struct proc *); pagetable_t proc_pagetable(struct proc *);
void proc_freepagetable(pagetable_t, uint64); void proc_freepagetable(pagetable_t, uint64);
int kill(int); int kill(int);
int killed(struct proc*);
void setkilled(struct proc*);
struct cpu* mycpu(void); struct cpu* mycpu(void);
struct cpu* getmycpu(void); struct cpu* getmycpu(void);
struct proc* myproc(); struct proc* myproc();

4
kernel/pipe.c
View file

@ -81,7 +81,7 @@ pipewrite(struct pipe *pi, uint64 addr, int n)
acquire(&pi->lock); acquire(&pi->lock);
while(i < n){ while(i < n){
if(pi->readopen == 0 || pr->killed){ if(pi->readopen == 0 || killed(pr)){
release(&pi->lock); release(&pi->lock);
return -1; return -1;
} }
@ -111,7 +111,7 @@ piperead(struct pipe *pi, uint64 addr, int n)
acquire(&pi->lock); acquire(&pi->lock);
while(pi->nread == pi->nwrite && pi->writeopen){ //DOC: pipe-empty while(pi->nread == pi->nwrite && pi->writeopen){ //DOC: pipe-empty
if(pr->killed){ if(killed(pr)){
release(&pi->lock); release(&pi->lock);
return -1; return -1;
} }

21
kernel/proc.c
View file

@ -424,7 +424,7 @@ wait(uint64 addr)
} }
// No point waiting if we don't have any children. // No point waiting if we don't have any children.
if(!havekids || p->killed){ if(!havekids || killed(p)){
release(&wait_lock); release(&wait_lock);
return -1; return -1;
} }
@ -603,6 +603,25 @@ kill(int pid)
return -1; return -1;
} }
void
setkilled(struct proc *p)
{
acquire(&p->lock);
p->killed = 1;
release(&p->lock);
}
int
killed(struct proc *p)
{
int k;
acquire(&p->lock);
k = p->killed;
release(&p->lock);
return k;
}
// Copy to either a user address, or kernel address, // Copy to either a user address, or kernel address,
// depending on usr_dst. // depending on usr_dst.
// Returns 0 on success, -1 on error. // Returns 0 on success, -1 on error.

2
kernel/sysproc.c
View file

@ -58,7 +58,7 @@ sys_sleep(void)
acquire(&tickslock); acquire(&tickslock);
ticks0 = ticks; ticks0 = ticks;
while(ticks - ticks0 < n){ while(ticks - ticks0 < n){
if(myproc()->killed){ if(killed(myproc())){
release(&tickslock); release(&tickslock);
return -1; return -1;
} }

6
kernel/trap.c
View file

@ -53,7 +53,7 @@ usertrap(void)
if(r_scause() == 8){ if(r_scause() == 8){
// system call // system call
if(p->killed) if(killed(p))
exit(-1); exit(-1);
// sepc points to the ecall instruction, // sepc points to the ecall instruction,
@ -70,10 +70,10 @@ usertrap(void)
} else { } else {
printf("usertrap(): unexpected scause %p pid=%d\n", r_scause(), p->pid); printf("usertrap(): unexpected scause %p pid=%d\n", r_scause(), p->pid);
printf(" sepc=%p stval=%p\n", r_sepc(), r_stval()); printf(" sepc=%p stval=%p\n", r_sepc(), r_stval());
p->killed = 1; setkilled(p);
} }
if(p->killed) if(killed(p))
exit(-1); exit(-1);
// give up the CPU if this is a timer interrupt. // give up the CPU if this is a timer interrupt.