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

bio: add support for custom I/O handler via Biofn

Browse source
This commit is contained in:
aiju 2017-05-04 17:42:12 +00:00
parent 414d29e98f
commit f681cf835a
9 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/libbio/bflush.c
View file

@ -12,7 +12,7 @@ Bflush(Biobufhdr *bp)
n = bp->bsize+bp->ocount;
if(n == 0)
return 0;
c = write(bp->fid, bp->bbuf, n);
c = bp->iof(bp, bp->bbuf, n);
if(n == c) {
bp->offset += n;
bp->ocount = -bp->bsize;

2
sys/src/libbio/bgetc.c
View file

@ -24,7 +24,7 @@ loop:
* buffer to allow that many ungets.
*/
memmove(bp->bbuf-Bungetsize, bp->ebuf-Bungetsize, Bungetsize);
i = read(bp->fid, bp->bbuf, bp->bsize);
i = bp->iof(bp, bp->bbuf, bp->bsize);
bp->gbuf = bp->bbuf;
if(i <= 0) {
bp->state = Bracteof;

26
sys/src/libbio/binit.c
View file

@ -50,6 +50,18 @@ install(Biobufhdr *bp)
}
}
static int
bioread(Biobufhdr *bp, void *v, long n)
{
return read(bp->fid, v, n);
}
static int
biowrite(Biobufhdr *bp, void *v, long n)
{
return write(bp->fid, v, n);
}
int
Binits(Biobufhdr *bp, int f, int mode, uchar *p, int size)
{
@ -64,12 +76,14 @@ Binits(Biobufhdr *bp, int f, int mode, uchar *p, int size)
case OREAD:
bp->state = Bractive;
bp->ocount = 0;
bp->iof = bioread;
break;
case OWRITE:
install(bp);
bp->state = Bwactive;
bp->ocount = -size;
bp->iof = biowrite;
break;
}
bp->bbuf = p;
@ -154,3 +168,15 @@ Bterm(Biobufhdr *bp)
/* otherwise opened with Binit(s) */
return r;
}
void
Biofn(Biobufhdr *bp, int (*f)(Biobufhdr *, void *, long))
{
if(f == nil)
if(bp->state == Bwactive)
bp->iof = biowrite;
else
bp->iof = bioread;
else
bp->iof = f;
}

2
sys/src/libbio/brdline.c
View file

@ -46,7 +46,7 @@ Brdline(Biobufhdr *bp, int delim)
*/
ip = (char*)bp->bbuf + i;
while(i < bp->bsize) {
j = read(bp->fid, ip, bp->bsize-i);
j = bp->iof(bp, ip, bp->bsize-i);
if(j < 0)
Berror(bp, "read error: %r");
if(j <= 0) {

2
sys/src/libbio/brdstr.c
View file

@ -69,7 +69,7 @@ Brdstr(Biobufhdr *bp, int delim, int nulldelim)
for(;;){
ip = (char*)bp->bbuf + i;
while(i < bp->bsize) {
j = read(bp->fid, ip, bp->bsize-i);
j = bp->iof(bp, ip, bp->bsize-i);
if(j < 0)
Berror(bp, "read error: %r");
if(j <= 0 && i == 0)

2
sys/src/libbio/bread.c
View file

@ -20,7 +20,7 @@ Bread(Biobufhdr *bp, void *ap, long count)
if(n == 0) {
if(bp->state != Bractive)
break;
i = read(bp->fid, bp->bbuf, bp->bsize);
i = bp->iof(bp, bp->bbuf, bp->bsize);
if(i <= 0) {
bp->state = Bracteof;
if(i < 0) {

2
sys/src/libbio/bwrite.c
View file

@ -21,7 +21,7 @@ Bwrite(Biobufhdr *bp, void *ap, long count)
if(n == 0) {
if(bp->state != Bwactive)
return Beof;
i = write(bp->fid, bp->bbuf, bp->bsize);
i = bp->iof(bp, bp->bbuf, bp->bsize);
if(i != bp->bsize) {
errstr(errbuf, sizeof errbuf);
if(strstr(errbuf, "interrupt") == nil) {