Skip to content

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

i cannot prove that release before wakeup is wrong, but i cannot convince myself it is right either

上级 4bc5056c
显示空白字符变更
内嵌 并排
正在显示 包含 2 行增加 和 8 行删除
pipe.c
浏览文件 @ ea6e3709
...@@ -64,7 +64,6 @@ void ...@@ -64,7 +64,6 @@ void
pipe_close(struct pipe *p, int writable) pipe_close(struct pipe *p, int writable)
{ {
acquire(&p->lock); acquire(&p->lock);
if(writable){ if(writable){
p->writeopen = 0; p->writeopen = 0;
wakeup(&p->readp); wakeup(&p->readp);
...@@ -72,7 +71,6 @@ pipe_close(struct pipe *p, int writable) ...@@ -72,7 +71,6 @@ pipe_close(struct pipe *p, int writable)
p->readopen = 0; p->readopen = 0;
wakeup(&p->writep); wakeup(&p->writep);
} }
release(&p->lock); release(&p->lock);
if(p->readopen == 0 && p->writeopen == 0) if(p->readopen == 0 && p->writeopen == 0)
...@@ -86,7 +84,6 @@ pipe_write(struct pipe *p, char *addr, int n) ...@@ -86,7 +84,6 @@ pipe_write(struct pipe *p, char *addr, int n)
int i; int i;
acquire(&p->lock); acquire(&p->lock);
for(i = 0; i < n; i++){ for(i = 0; i < n; i++){
while(((p->writep + 1) % PIPESIZE) == p->readp){ while(((p->writep + 1) % PIPESIZE) == p->readp){
if(p->readopen == 0 || cp->killed){ if(p->readopen == 0 || cp->killed){
...@@ -99,9 +96,8 @@ pipe_write(struct pipe *p, char *addr, int n) ...@@ -99,9 +96,8 @@ pipe_write(struct pipe *p, char *addr, int n)
p->data[p->writep] = addr[i]; p->data[p->writep] = addr[i];
p->writep = (p->writep + 1) % PIPESIZE; p->writep = (p->writep + 1) % PIPESIZE;
} }
release(&p->lock);
wakeup(&p->readp); wakeup(&p->readp);
release(&p->lock);
return i; return i;
} }
...@@ -111,7 +107,6 @@ pipe_read(struct pipe *p, char *addr, int n) ...@@ -111,7 +107,6 @@ 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){
if(p->writeopen == 0 || cp->killed){ if(p->writeopen == 0 || cp->killed){
release(&p->lock); release(&p->lock);
...@@ -125,8 +120,7 @@ pipe_read(struct pipe *p, char *addr, int n) ...@@ -125,8 +120,7 @@ pipe_read(struct pipe *p, char *addr, int n)
addr[i] = p->data[p->readp]; addr[i] = p->data[p->readp];
p->readp = (p->readp + 1) % PIPESIZE; p->readp = (p->readp + 1) % PIPESIZE;
} }
release(&p->lock);
wakeup(&p->writep); wakeup(&p->writep);
release(&p->lock);
return i; return i;
} }
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论