summaryrefslogtreecommitdiff
path: root/pipe.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2017-08-08 13:27:06 -0400
committerRobert Morris <[email protected]>2017-08-08 13:27:06 -0400
commit14270288b7e5327832cdf6a8d9da52ef58fce652 (patch)
treeb604cb49fb049a14966418eda4589cd1271f8e53 /pipe.c
parentaba8423c4a5ae01828040d04f668f07ec544dcd0 (diff)
parent825ce074b10a0e1f63fd3a1fe245220d04054e0a (diff)
downloadxv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.tar.gz
xv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.tar.bz2
xv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.zip
Merge branch 'master' of g.csail.mit.edu:xv6-dev
Diffstat (limited to 'pipe.c')
-rw-r--r--pipe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pipe.c b/pipe.c
index a9f471e..e9abe7f 100644
--- a/pipe.c
+++ b/pipe.c
@@ -83,7 +83,7 @@ pipewrite(struct pipe *p, char *addr, int n)
acquire(&p->lock);
for(i = 0; i < n; i++){
while(p->nwrite == p->nread + PIPESIZE){ //DOC: pipewrite-full
- if(p->readopen == 0 || proc->killed){
+ if(p->readopen == 0 || myproc()->killed){
release(&p->lock);
return -1;
}
@@ -104,7 +104,7 @@ piperead(struct pipe *p, char *addr, int n)
acquire(&p->lock);
while(p->nread == p->nwrite && p->writeopen){ //DOC: pipe-empty
- if(proc->killed){
+ if(myproc()->killed){
release(&p->lock);
return -1;
}