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

Use p->lock to read p->killed

Browse source
This commit is contained in:
Frans Kaashoek 2022-08-11 14:22:00 -04:00
parent 429c7b717e
commit 4f716c8550
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kernel/proc.c
View file

@ -588,7 +588,7 @@ kill(int pid)
for(p = proc; p < &proc[NPROC]; p++){
acquire(&p->lock);
if(p->pid == pid){
__atomic_store_n(&p->killed, 1, __ATOMIC_SEQ_CST);
p->killed = 1;
if(p->state == SLEEPING){
// Wake process from sleep().
p->state = RUNNABLE;
@ -601,10 +601,23 @@ kill(int pid)
return -1;
}
void
setkilled(struct proc *p)
{
acquire(&p->lock);
p->killed = 1;
release(&p->lock);
}
int
killed(struct proc *p)
{
return __atomic_load_n(&p->killed, __ATOMIC_SEQ_CST);
int k;
acquire(&p->lock);
k = p->killed;
release(&p->lock);
return k;
}
// Copy to either a user address, or kernel address,