xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qio: fix block leak introduced by eqlock change

Browse source
This commit is contained in:
cinap_lenrek 2011-08-10 17:26:05 +02:00
parent 70e4b8d1f9
commit 4b506cd0ae
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/src/9/port/qio.c
View file

@ -1173,14 +1173,10 @@ qbwrite(Queue *q, Block *b)
}
dowakeup = 0;
eqlock(&q->wlock);
if(waserror()){
if(b != nil)
freeb(b);
qunlock(&q->wlock);
freeb(b);
nexterror();
}
ilock(q);
/* give up if the queue is closed */
@ -1194,7 +1190,6 @@ qbwrite(Queue *q, Block *b)
if(q->noblock){
iunlock(q);
freeb(b);
qunlock(&q->wlock);
poperror();
return n;
}
@ -1214,7 +1209,6 @@ qbwrite(Queue *q, Block *b)
q->len += BALLOC(b);
q->dlen += n;
QDEBUG checkb(b, "qbwrite");
b = nil;
/* make sure other end gets awakened */
if(q->state & Qstarve){
@ -1222,6 +1216,7 @@ qbwrite(Queue *q, Block *b)
dowakeup = 1;
}
iunlock(q);
poperror();
/* get output going again */
if(q->kick && (dowakeup || (q->state&Qkick)))
@ -1255,12 +1250,17 @@ qbwrite(Queue *q, Block *b)
ilock(q);
q->state |= Qflow;
iunlock(q);
sleep(&q->wr, qnotfull, q);
}
USED(b);
qunlock(&q->wlock);
poperror();
eqlock(&q->wlock);
if(waserror()){
qunlock(&q->wlock);
nexterror();
}
sleep(&q->wr, qnotfull, q);
qunlock(&q->wlock);
poperror();
}
return n;
}