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

kernel/qio: fix comments, fix qiwrite() on close queue, remove debug setmalloctag() call in qwrite()

Browse source
This commit is contained in:
cinap_lenrek 2016-11-08 00:38:07 +01:00
parent 32dfbc7c50
commit b431b6c169
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1192,7 +1192,6 @@ qwrite(Queue *q, void *vp, int len)
n = Maxatomic;
b = allocb(n);
setmalloctag(b, (up->text[0]<<24)|(up->text[1]<<16)|(up->text[2]<<8)|up->text[3]);
if(waserror()){
freeb(b);
nexterror();
@ -1201,9 +1200,7 @@ qwrite(Queue *q, void *vp, int len)
poperror();
b->wp += n;
qbwrite(q, b);
sofar += n;
sofar += qbwrite(q, b);
} while(sofar < len && (q->state & Qmsg) == 0);
return len;
@ -1212,9 +1209,6 @@ qwrite(Queue *q, void *vp, int len)
/*
* used by print() to write to a queue. Since we may be splhi or not in
* a process, don't qlock.
*
* this routine merges adjacent blocks if block n+1 will fit into
* the free space of block n.
*/
int
qiwrite(Queue *q, void *vp, int len)
@ -1242,7 +1236,7 @@ qiwrite(Queue *q, void *vp, int len)
/* we use an artificially high limit for kernel prints since anything
* over the limit gets dropped
*/
if(q->dlen >= 16*1024){
if((q->state & Qclosed) != 0 || q->len/2 >= q->limit){
iunlock(q);
freeb(b);
break;
@ -1424,7 +1418,7 @@ qflush(Queue *q)
/* free queued blocks */
freeblist(bfirst);
/* wake up readers/writers */
/* wake up writers */
wakeup(&q->wr);
}