diff options
| author | Frans Kaashoek <kaashoek@mit.edu> | 2022-08-23 07:31:08 -0400 |
|---|---|---|
| committer | Frans Kaashoek <kaashoek@mit.edu> | 2022-08-23 07:31:08 -0400 |
| commit | cd6207a972cf7692dceb837f460234eae9df5052 (patch) | |
| tree | c2e1f8be9e5d030727ee4d5c4f033b8f2e5a3314 /kernel/pipe.c | |
| parent | bc48c2be47ed4994d23327980737fef441fbbcc8 (diff) | |
| parent | 4f716c8550b406c3e4b3e0c21b986ef99bc06c40 (diff) | |
| download | xv6-labs-2022-cd6207a972cf7692dceb837f460234eae9df5052.tar.xz xv6-labs-2022-cd6207a972cf7692dceb837f460234eae9df5052.zip | |
Merge branch 'riscv-killed' into riscv
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; } |