summaryrefslogtreecommitdiff
path: root/kernel/pipe.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/pipe.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/pipe.c')
-rw-r--r--kernel/pipe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/pipe.c b/kernel/pipe.c
index b6eefb9..e438d7e 100644
--- a/kernel/pipe.c
+++ b/kernel/pipe.c
@@ -81,7 +81,7 @@ pipewrite(struct pipe *pi, uint64 addr, int n)
acquire(&pi->lock);
while(i < n){
- if(pi->readopen == 0 || pr->killed){
+ if(pi->readopen == 0 || __sync_add_and_fetch(&pr->killed,0)){
release(&pi->lock);
return -1;
}
@@ -111,7 +111,7 @@ piperead(struct pipe *pi, uint64 addr, int n)
acquire(&pi->lock);
while(pi->nread == pi->nwrite && pi->writeopen){ //DOC: pipe-empty
- if(pr->killed){
+ if(__sync_add_and_fetch(&pr->killed,0)){
release(&pi->lock);
return -1;
}