Skip to content

X
xv6-public
提交 3ce16470 创建 作者: rsc's avatar rsc
浏览文件
操作

nits

上级 603deefc
显示空白字符变更
内嵌 并排
正在显示 包含 10 行增加 和 12 行删除
pipe.c
浏览文件 @ 3ce16470
...@@ -25,12 +25,10 @@ pipe_alloc(struct file **f0, struct file **f1) ...@@ -25,12 +25,10 @@ pipe_alloc(struct file **f0, struct file **f1)
p = 0; p = 0;
*f0 = *f1 = 0; *f0 = *f1 = 0;
if((*f0 = filealloc()) == 0) if((*f0 = filealloc()) == 0 || (*f1 = filealloc()) == 0)
goto oops; goto bad;
if((*f1 = filealloc()) == 0) if((p = (struct pipe*)kalloc(PAGE)) == 0)
goto oops; goto bad;
if((p = (struct pipe*) kalloc(PAGE)) == 0)
goto oops;
p->readopen = 1; p->readopen = 1;
p->writeopen = 1; p->writeopen = 1;
p->writep = 0; p->writep = 0;
...@@ -46,9 +44,9 @@ pipe_alloc(struct file **f0, struct file **f1) ...@@ -46,9 +44,9 @@ pipe_alloc(struct file **f0, struct file **f1)
(*f1)->pipe = p; (*f1)->pipe = p;
return 0; return 0;
oops: bad:
if(p) if(p)
kfree((char*) p, PAGE); kfree((char*)p, PAGE);
if(*f0){ if(*f0){
(*f0)->type = FD_NONE; (*f0)->type = FD_NONE;
fileclose(*f0); fileclose(*f0);
...@@ -74,7 +72,7 @@ pipe_close(struct pipe *p, int writable) ...@@ -74,7 +72,7 @@ pipe_close(struct pipe *p, int writable)
release(&p->lock); release(&p->lock);
if(p->readopen == 0 && p->writeopen == 0) if(p->readopen == 0 && p->writeopen == 0)
kfree((char*) p, PAGE); kfree((char*)p, PAGE);
} }
//PAGEBREAK: 20 //PAGEBREAK: 20
...@@ -107,10 +105,10 @@ pipe_read(struct pipe *p, char *addr, int n) ...@@ -107,10 +105,10 @@ pipe_read(struct pipe *p, char *addr, int n)
int i; int i;
acquire(&p->lock); acquire(&p->lock);
while(p->readp == p->writep){ while(p->readp == p->writep && p->writeopen){
if(p->writeopen == 0 || cp->killed){ if(cp->killed){
release(&p->lock); release(&p->lock);
return 0; return -1;
} }
sleep(&p->readp, &p->lock); sleep(&p->readp, &p->lock);
} }
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论