diff options
| author | Frans Kaashoek <[email protected]> | 2022-08-23 11:01:06 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2022-08-23 11:01:06 -0400 |
| commit | ccb7bd14c7303a77f8f99928e2297ddd815674b1 (patch) | |
| tree | ac9fc9f6773c87d5adc8ded3bc8bc3a0145e85cd /kernel/pipe.c | |
| parent | 4cd4d194b8827af4971a81ad28968499925f884f (diff) | |
| parent | 8621be8f3d105cd73ffbc681f9810d04b083b0ae (diff) | |
| download | xv6-labs-ccb7bd14c7303a77f8f99928e2297ddd815674b1.tar.gz xv6-labs-ccb7bd14c7303a77f8f99928e2297ddd815674b1.tar.bz2 xv6-labs-ccb7bd14c7303a77f8f99928e2297ddd815674b1.zip | |
Merge branch 'riscv' into uvm-perm
Diffstat (limited to 'kernel/pipe.c')
| -rw-r--r-- | kernel/pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/pipe.c b/kernel/pipe.c index b6eefb9..f6b501a 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 || killed(pr)){ 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(killed(pr)){ release(&pi->lock); return -1; } |