summaryrefslogtreecommitdiff
path: root/kernel/proc.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2022-08-10 20:35:42 -0400
committerFrans Kaashoek <[email protected]>2022-08-10 20:35:42 -0400
commit4087a6e7fc773ba4eb217dfc196dfe1eee84b25d (patch)
treea77a5b04944ed3f83ea10875aa32b1322e4224c6 /kernel/proc.c
parentb1fd09335ae1c112a01cedad0a6abd584fe8dca7 (diff)
downloadxv6-labs-4087a6e7fc773ba4eb217dfc196dfe1eee84b25d.tar.gz
xv6-labs-4087a6e7fc773ba4eb217dfc196dfe1eee84b25d.tar.bz2
xv6-labs-4087a6e7fc773ba4eb217dfc196dfe1eee84b25d.zip
Read and write p->killed using atomics
Diffstat (limited to 'kernel/proc.c')
-rw-r--r--kernel/proc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/proc.c b/kernel/proc.c
index 2d0ffa1..221f0f8 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -422,7 +422,7 @@ wait(uint64 addr)
}
// No point waiting if we don't have any children.
- if(!havekids || p->killed){
+ if(!havekids || __sync_add_and_fetch(&p->killed, 0)){
release(&wait_lock);
return -1;
}
@@ -588,7 +588,7 @@ kill(int pid)
for(p = proc; p < &proc[NPROC]; p++){
acquire(&p->lock);
if(p->pid == pid){
- p->killed = 1;
+ __sync_bool_compare_and_swap(&p->killed, 0, 1);
if(p->state == SLEEPING){
// Wake process from sleep().
p->state = RUNNABLE;