JehanneOS/jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

kernel: devpipe: fix error management on writes

Browse Source 
The "write on closed pipe" note should be posted only
if the write occurred on a closed pipe.

Before this fix, on any interrupt caused the note to be sent,
despite the pipe being open and fully working.
This commit is contained in:
Giacomo Tesio
2017-05-17 00:27:57 +02:00
parent 031201a1ac
commit 2b1baf8de1
2 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sys/src/kern/port/devpipe.c
View File

@ -1,3 +1,20 @@
/*
* This file is part of Jehanne.
*
* Copyright (C) 2017 Giacomo Tesio <giacomo@tesio.it>
*
* Jehanne is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 2 of the License.
*
* Jehanne is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Jehanne. If not, see <http://www.gnu.org/licenses/>.
*/
#include "u.h" #include "u.h"
#include "../port/lib.h" #include "../port/lib.h"
#include "mem.h" #include "mem.h"
@ -300,31 +317,33 @@ static long
pipewrite(Chan *c, void *va, long n, int64_t _1) pipewrite(Chan *c, void *va, long n, int64_t _1)
{ {
Pipe *p; Pipe *p;
Queue *q;
if(!islo()) if(!islo())
jehanne_print("pipewrite hi %#p\n", getcallerpc()); jehanne_print("pipewrite hi %#p\n", getcallerpc());
if(waserror()) {
/* avoid notes when pipe is a mounted queue */
if((c->flag & CMSG) == 0)
postnote(up, 1, "sys: write on closed pipe", NUser);
nexterror();
}
p = c->aux; p = c->aux;
switch(PIPETYPE(c->qid.path)){ switch(PIPETYPE(c->qid.path)){
case Qdata0: case Qdata0:
n = qwrite(p->q[1], va, n); q = p->q[1];
break; break;
case Qdata1: case Qdata1:
n = qwrite(p->q[0], va, n); q = p->q[0];
break; break;
default: default:
panic("pipewrite"); panic("pipewrite");
} }
if(waserror()) {
/* avoid notes when pipe is a mounted queue */
if((c->flag & CMSG) == 0
&& (qstate(q) & Qclosed)
&& (jehanne_strcmp(Ehungup, up->errstr) == 0)) // do not obscure other errors
postnote(up, 1, "sys: write on closed pipe", NUser);
nexterror();
}
n = qwrite(q, va, n);
poperror(); poperror();
return n; return n;
} }
@ -334,29 +353,30 @@ pipebwrite(Chan *c, Block *bp, int64_t _1)
{ {
long n; long n;
Pipe *p; Pipe *p;
Queue *q;
if(waserror()) {
/* avoid notes when pipe is a mounted queue */
if((c->flag & CMSG) == 0)
postnote(up, 1, "sys: write on closed pipe", NUser);
nexterror();
}
p = c->aux; p = c->aux;
switch(PIPETYPE(c->qid.path)){ switch(PIPETYPE(c->qid.path)){
case Qdata0: case Qdata0:
n = qbwrite(p->q[1], bp); q = p->q[1];
break; break;
case Qdata1: case Qdata1:
n = qbwrite(p->q[0], bp); q = p->q[0];
break; break;
default: default:
n = 0;
panic("pipebwrite"); panic("pipebwrite");
} }
if(waserror()) {
/* avoid notes when pipe is a mounted queue */
if((c->flag & CMSG) == 0
&& (qstate(q) & Qclosed)
&& (jehanne_strcmp(Ehungup, up->errstr) == 0)) // do not obscure other errors
postnote(up, 1, "sys: write on closed pipe", NUser);
nexterror();
}
n = qbwrite(q, bp);
poperror(); poperror();
return n; return n;
} }

1
sys/src/kern/port/portfns.h
View File

@ -314,6 +314,7 @@ void qreopen(Queue*);
void qsetbypass(Queue*, void (*)(void*, Block*), void*); void qsetbypass(Queue*, void (*)(void*, Block*), void*);
void qsetlimit(Queue*, int); void qsetlimit(Queue*, int);
void qsleep(Queue*); void qsleep(Queue*);
int qstate(Queue *q);
void qunlock(QLock*); void qunlock(QLock*);
int qwindow(Queue*); int qwindow(Queue*);
int qwrite(Queue*, void*, int); int qwrite(Queue*, void*, int);