summaryrefslogtreecommitdiff
path: root/pipe.c
diff options
context:
space:
mode:
authorRuss Cox <[email protected]>2009-08-30 23:02:08 -0700
committerRuss Cox <[email protected]>2009-08-30 23:02:08 -0700
commit48755214c9a02d6249caf3126d3b41d67eda4730 (patch)
tree2edc8b996fd7c3ef2da8876d657140e242999d93 /pipe.c
parent0aef8914959af9e472852611eb6352c211093d35 (diff)
downloadxv6-labs-48755214c9a02d6249caf3126d3b41d67eda4730.tar.gz
xv6-labs-48755214c9a02d6249caf3126d3b41d67eda4730.tar.bz2
xv6-labs-48755214c9a02d6249caf3126d3b41d67eda4730.zip
assorted fixes:
* rename c/cp to cpu/proc * rename cpu.context to cpu.scheduler * fix some comments * formatting for printout
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 29c01b2..4a1857c 100644
--- a/pipe.c
+++ b/pipe.c
@@ -82,7 +82,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 || cp->killed){
+ if(p->readopen == 0 || proc->killed){
release(&p->lock);
return -1;
}
@@ -103,7 +103,7 @@ piperead(struct pipe *p, char *addr, int n)
acquire(&p->lock);
while(p->nread == p->nwrite && p->writeopen){ //DOC: pipe-empty
- if(cp->killed){
+ if(proc->killed){
release(&p->lock);
return -1;
}