diff options
author | Frans Kaashoek <[email protected]> | 2011-07-27 20:49:45 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2011-07-27 20:49:45 -0400 |
commit | dccb915282854476ce47752df6631dcce3b8f661 (patch) | |
tree | a84aa8ed35618f99c3d7e8cdd466d22ae7bad597 /pipe.c | |
parent | 9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20 (diff) | |
parent | 13a96baefc0ff5d8262c4bc8c797bee4b157443c (diff) | |
download | xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.tar.gz xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.tar.bz2 xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.zip |
Merge commit 'origin/master' into page
Diffstat (limited to 'pipe.c')
-rw-r--r-- | pipe.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -66,7 +66,7 @@ pipeclose(struct pipe *p, int writable) p->readopen = 0; wakeup(&p->nwrite); } - if(p->readopen == 0 && p->writeopen == 0) { + if(p->readopen == 0 && p->writeopen == 0){ release(&p->lock); kfree((char*)p); } else @@ -81,7 +81,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 + while(p->nwrite == p->nread + PIPESIZE){ //DOC: pipewrite-full if(p->readopen == 0 || proc->killed){ release(&p->lock); return -1; |