From e6071b5fe05e29994a274fe51619ab209a87e2d6 Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 16 Nov 2026 00:53:07 +0900 Subject: [PATCH] sys/include, sys/src: increase IOUNIT to 32KB Import IOUNIT-related changes from 9front. Change-Id: I3d144f68ad26c7436837d2a299d632a2ca9363ab --- acme/bin/source/win/dat.h | 2 +- sys/include/ape/lib9.h | 2 ++ sys/include/bio.h | 2 +- sys/include/libc.h | 1 + sys/lib/dist/cmd/bzfs/mkext.c | 30 ++++++++++-------------------- sys/lib/dist/cmd/bzfs/oramfs.c | 2 +- sys/lib/dist/cmd/bzfs/unbzip.c | 4 ++-- sys/src/9/pc/devvirtio9p.c | 2 +- sys/src/9/port/devmnt.c | 2 +- sys/src/9k/386/devvirtio9p.c | 2 +- sys/src/9k/k10/root/cpu.c | 2 +- sys/src/9k/port/devmnt.c | 2 +- sys/src/9k/root/cpu.c | 2 +- sys/src/cmd/5a/a.h | 2 +- sys/src/cmd/5l/l.h | 2 +- sys/src/cmd/6a/a.h | 2 +- sys/src/cmd/6l/l.h | 2 +- sys/src/cmd/7a/mkfile | 1 - sys/src/cmd/7c/mkfile | 1 - sys/src/cmd/7l/mkfile | 1 - sys/src/cmd/8a/a.h | 2 +- sys/src/cmd/8l/l.h | 2 +- sys/src/cmd/9660srv/main.c | 2 +- sys/src/cmd/9a/a.h | 2 +- sys/src/cmd/9l/l.h | 2 +- sys/src/cmd/acme/dat.h | 2 +- sys/src/cmd/ar.c | 2 +- sys/src/cmd/aux/consolefs.c | 13 +++++++------ sys/src/cmd/aux/trampoline.c | 2 +- sys/src/cmd/bzip2/bunzip2.c | 4 ++-- sys/src/cmd/bzip2/bzip2.c | 4 ++-- sys/src/cmd/cat.c | 2 +- sys/src/cmd/cc/cc.h | 2 +- sys/src/cmd/cfs/cfs.c | 2 +- sys/src/cmd/cp.c | 18 ++++++++++++++---- sys/src/cmd/cpu.c | 2 +- sys/src/cmd/cwfs/net.c | 2 +- sys/src/cmd/cwfs/portdat.h | 2 +- sys/src/cmd/dossrv/dosfs.h | 2 +- sys/src/cmd/exportfs/exportfs.c | 2 +- sys/src/cmd/fcp.c | 22 +++++++++++++++++----- sys/src/cmd/fossil/9proc.c | 2 +- sys/src/cmd/fscfs/cfs.c | 3 ++- sys/src/cmd/git/git.h | 3 --- sys/src/cmd/iostats/statfs.h | 2 +- sys/src/cmd/ip/ftpfs/ftpfs.c | 8 ++++---- sys/src/cmd/ip/ftpfs/ftpfs.h | 2 -- sys/src/cmd/jtagfs/jtagfs.c | 2 +- sys/src/cmd/ka/a.h | 2 +- sys/src/cmd/kl/l.h | 2 +- sys/src/cmd/ld/ld.h | 2 +- sys/src/cmd/lnfs.c | 2 +- sys/src/cmd/md5sum.c | 2 +- sys/src/cmd/mv.c | 2 +- sys/src/cmd/paqfs/paqfs.c | 2 +- sys/src/cmd/qa/a.h | 2 +- sys/src/cmd/ql/l.h | 2 +- sys/src/cmd/ramcfs/cfs.c | 2 +- sys/src/cmd/ramfs.c | 2 +- sys/src/cmd/rx.c | 6 +++--- sys/src/cmd/sam/sam.h | 2 +- sys/src/cmd/samterm/samterm.h | 2 +- sys/src/cmd/sha1sum.c | 2 +- sys/src/cmd/tapefs/tapefs.h | 3 +-- sys/src/cmd/tapefs/tapfs.c | 2 +- sys/src/cmd/tapefs/tpfs.c | 2 +- sys/src/cmd/tar.c | 3 +-- sys/src/cmd/tee.c | 2 +- sys/src/cmd/tlsclient.c | 2 +- sys/src/cmd/upas/fs/fs.c | 6 +++--- sys/src/cmd/upas/marshal/marshal.c | 4 ++-- sys/src/cmd/usb/disk/scsireq.h | 7 +------ sys/src/cmd/usb/lib/usbfs.h | 2 +- sys/src/cmd/va/a.h | 2 +- sys/src/cmd/vac/vac.c | 2 +- sys/src/cmd/vac/vacfs.c | 2 +- sys/src/cmd/vl/l.h | 2 +- sys/src/cmd/vnc/exportfs.c | 2 +- sys/src/lib9p/srv.c | 2 +- sys/src/libdraw/readimage.c | 7 +++++-- 80 files changed, 136 insertions(+), 131 deletions(-) diff --git a/acme/bin/source/win/dat.h b/acme/bin/source/win/dat.h index a03bcd68..2199e489 100644 --- a/acme/bin/source/win/dat.h +++ b/acme/bin/source/win/dat.h @@ -9,7 +9,7 @@ enum NPIPEDATA = 8000, NPIPE = NPIPEDATA+32, /* EVENTSIZE is really 256 in acme, but we use events internally and want bigger buffers */ - EVENTSIZE = 16*1024, + EVENTSIZE = IOUNIT, NEVENT = 5, }; diff --git a/sys/include/ape/lib9.h b/sys/include/ape/lib9.h index ec1fc23a..5671ec0d 100644 --- a/sys/include/ape/lib9.h +++ b/sys/include/ape/lib9.h @@ -7,6 +7,8 @@ #include /* ick; need Rune defined below */ +#define IOUNIT 32768U /* default buffer size for 9p io */ + #define MORDER 0x0003 /* mask for bits defining order of mounting */ #define MREPL 0x0000 /* mount replaces object */ #define MBEFORE 0x0001 /* mount goes before others in union directory */ diff --git a/sys/include/bio.h b/sys/include/bio.h index fe92a99c..22b9bb3f 100644 --- a/sys/include/bio.h +++ b/sys/include/bio.h @@ -6,7 +6,7 @@ typedef struct Biobufhdr Biobufhdr; enum { - Bsize = 16*1024, + Bsize = IOUNIT, Bungetsize = UTFmax+1, /* space for ungetc */ Bmagic = 0x314159, Beof = -1, diff --git a/sys/include/libc.h b/sys/include/libc.h index 4d59f5bd..a32d505f 100644 --- a/sys/include/libc.h +++ b/sys/include/libc.h @@ -549,6 +549,7 @@ extern void freenetconninfo(NetConnInfo*); * system calls * */ +#define IOUNIT 32768U /* default buffer size for 9p io */ #define STATMAX 65535U /* max length of machine-independent stat structure */ #define DIRMAX (sizeof(Dir)+STATMAX) /* max length of Dir structure */ #define ERRMAX 128 /* max length of error string */ diff --git a/sys/lib/dist/cmd/bzfs/mkext.c b/sys/lib/dist/cmd/bzfs/mkext.c index 1fedd62c..e617d14c 100644 --- a/sys/lib/dist/cmd/bzfs/mkext.c +++ b/sys/lib/dist/cmd/bzfs/mkext.c @@ -27,7 +27,6 @@ #include "bzfs.h" enum{ - LEN = 8*1024, NFLDS = 6, /* filename, modes, uid, gid, mtime, bytes */ }; @@ -39,8 +38,7 @@ void error(char*, ...); void warn(char*, ...); void usage(void); char *mtpt; -Biobufhdr bin; -uchar binbuf[2*LEN]; +Biobuf bin; void usage(void) @@ -89,15 +87,12 @@ blockread(int in, char *first, int nfirst) return -1; } -enum { NAMELEN = 28 }; - void main(int argc, char **argv) { char *rargv[10]; int rargc; - char *fields[NFLDS], name[2*LEN], *p, *namep; - char uid[NAMELEN], gid[NAMELEN]; + char *fields[NFLDS], *p; ulong mode, bytes, mtime; char *file; int i, n, stdin, fd, chatty; @@ -116,7 +111,6 @@ main(int argc, char **argv) rfork(RFNOTEG); stdin = 0; file = nil; - namep = name; mtpt = "/root"; chatty = 0; ARGBEGIN{ @@ -174,33 +168,29 @@ if(chatty) fprint(2, "found at %d\n", i); fd = unbflz(unbzip(blockread(fd, blk+13, sizeof(blk)-13))); - Binits(&bin, fd, OREAD, binbuf, sizeof binbuf); - while(p = Brdline(&bin, '\n')){ - p[Blinelen(&bin)-1] = '\0'; + Binit(&bin, fd, OREAD); + while((p = Brdstr(&bin, '\n', 1)) != nil){ if(chatty) fprint(2, "%s\n", p); - if(strcmp(p, "end of archive") == 0){ + if(strcmp(p, "end of archive") == 0) _exits(0); - } if(getfields(p, fields, NFLDS, 0, " \t") != NFLDS){ warn("too few fields in file header"); continue; } - strcpy(namep, fields[0]); mode = strtoul(fields[1], 0, 8); mtime = strtoul(fields[4], 0, 10); bytes = strtoul(fields[5], 0, 10); - strncpy(uid, fields[2], NAMELEN); - strncpy(gid, fields[3], NAMELEN); if(mode & DMDIR) - mkdir(name, mode, mtime, uid, gid); + mkdir(fields[0], mode, mtime, fields[2], fields[3]); else - extract(name, mode, mtime, uid, gid, bytes); + extract(fields[0], mode, mtime, fields[2], fields[3], bytes); + free(p); } fprint(2, "premature end of archive\n"); exits("premature end of archive"); } -char buf[8192]; +char buf[IOUNIT]; int ffcreate(char *name, ulong mode, char *uid, char *gid, ulong mtime, int length) @@ -208,7 +198,7 @@ ffcreate(char *name, ulong mode, char *uid, char *gid, ulong mtime, int length) int fd, om; Dir nd; - sprint(buf, "%s/%s", mtpt, name); + snprint(buf, sizeof buf, "%s/%s", mtpt, name); om = ORDWR; if(mode&DMDIR) om = OREAD; diff --git a/sys/lib/dist/cmd/bzfs/oramfs.c b/sys/lib/dist/cmd/bzfs/oramfs.c index cba02724..69473f97 100644 --- a/sys/lib/dist/cmd/bzfs/oramfs.c +++ b/sys/lib/dist/cmd/bzfs/oramfs.c @@ -16,7 +16,7 @@ enum OPERM = 0x3, /* mask of all permission types in open mode */ Nram = 512, Maxsize = 512*1024*1024, - Maxfdata = 8192, + Maxfdata = IOUNIT, }; typedef struct Fid Fid; diff --git a/sys/lib/dist/cmd/bzfs/unbzip.c b/sys/lib/dist/cmd/bzfs/unbzip.c index b02fd0ab..5a9724c3 100644 --- a/sys/lib/dist/cmd/bzfs/unbzip.c +++ b/sys/lib/dist/cmd/bzfs/unbzip.c @@ -68,8 +68,8 @@ static int bunzip(int ofd, char *ofile, Biobuf *bin) { int e, n, done, onemore; - char buf[8192]; - char obuf[8192]; + char buf[IOUNIT]; + char obuf[IOUNIT]; Biobuf bout; bz_stream strm; diff --git a/sys/src/9/pc/devvirtio9p.c b/sys/src/9/pc/devvirtio9p.c index c2eef876..7ec8e836 100644 --- a/sys/src/9/pc/devvirtio9p.c +++ b/sys/src/9/pc/devvirtio9p.c @@ -66,7 +66,7 @@ enum { Fmounttag = 1, /* 9P device feature bit 0: config carries a mount tag */ - Msize = IOHDRSZ + 16*1024, /* matches MAXRPC in devmnt.c */ + Msize = IOHDRSZ + 32*1024, /* matches MAXRPC in devmnt.c */ Maxslot = 64, /* cap on outstanding RPCs per device */ Fidhash = 257, /* buckets in the directory-fid set */ diff --git a/sys/src/9/port/devmnt.c b/sys/src/9/port/devmnt.c index 3bfc2b04..35c522d3 100644 --- a/sys/src/9/port/devmnt.c +++ b/sys/src/9/port/devmnt.c @@ -16,7 +16,7 @@ * connection. */ -#define MAXRPC (IOHDRSZ+16*1024) /* maybe a larger size will be faster */ +#define MAXRPC (IOHDRSZ+32*1024) /* maybe a larger size will be faster */ /* use a known-good common size for initial negotiation */ #define MAXCMNRPC (IOHDRSZ+8192) diff --git a/sys/src/9k/386/devvirtio9p.c b/sys/src/9k/386/devvirtio9p.c index bf9e6963..b620ca6d 100644 --- a/sys/src/9k/386/devvirtio9p.c +++ b/sys/src/9k/386/devvirtio9p.c @@ -66,7 +66,7 @@ enum { Fmounttag = 1, /* 9P device feature bit 0: config carries a mount tag */ - Msize = IOHDRSZ + 16*1024, /* matches MAXRPC in devmnt.c */ + Msize = IOHDRSZ + 32*1024, /* matches MAXRPC in devmnt.c */ Maxslot = 64, /* cap on outstanding RPCs per device */ Fidhash = 257, /* buckets in the directory-fid set */ diff --git a/sys/src/9k/k10/root/cpu.c b/sys/src/9k/k10/root/cpu.c index 7bf1bed8..297f2ccf 100644 --- a/sys/src/9k/k10/root/cpu.c +++ b/sys/src/9k/k10/root/cpu.c @@ -12,7 +12,7 @@ #include #include -#define Maxfdata 8192 +#define Maxfdata IOUNIT #define MaxStr 128 void remoteside(int); diff --git a/sys/src/9k/port/devmnt.c b/sys/src/9k/port/devmnt.c index 1b23b75f..3f6b3406 100644 --- a/sys/src/9k/port/devmnt.c +++ b/sys/src/9k/port/devmnt.c @@ -16,7 +16,7 @@ * connection. */ -#define MAXRPC (IOHDRSZ+16*1024) /* maybe a larger size will be faster */ +#define MAXRPC (IOHDRSZ+32*1024) /* maybe a larger size will be faster */ /* use a known-good common size for initial negotiation */ #define MAXCMNRPC (IOHDRSZ+8192) diff --git a/sys/src/9k/root/cpu.c b/sys/src/9k/root/cpu.c index f52762d9..2c94f77a 100644 --- a/sys/src/9k/root/cpu.c +++ b/sys/src/9k/root/cpu.c @@ -12,7 +12,7 @@ #include #include -#define Maxfdata 8192 +#define Maxfdata IOUNIT #define MaxStr 128 void remoteside(int); diff --git a/sys/src/cmd/5a/a.h b/sys/src/cmd/5a/a.h index 60b6fa9c..12178f86 100644 --- a/sys/src/cmd/5a/a.h +++ b/sys/src/cmd/5a/a.h @@ -15,7 +15,7 @@ typedef struct Hist Hist; #define MAXALIGN 7 #define FPCHIP 1 #define NSYMB 8192 -#define BUFSIZ (16*1024) +#define BUFSIZ IOUNIT #define HISTSZ 20 #define NINCLUDE 10 #define NHUNK 10000 diff --git a/sys/src/cmd/5l/l.h b/sys/src/cmd/5l/l.h index 998ced2a..5630a3e7 100644 --- a/sys/src/cmd/5l/l.h +++ b/sys/src/cmd/5l/l.h @@ -200,7 +200,7 @@ enum NHUNK = 100000, MINSIZ = 64, NENT = 100, - MAXIO = (16*1024), + MAXIO = IOUNIT, MAXHIST = 20, /* limit of path elements for history symbols */ Roffset = 22, /* no. bits for offset in relocation address */ diff --git a/sys/src/cmd/6a/a.h b/sys/src/cmd/6a/a.h index e14a0f1b..ff0d78fd 100644 --- a/sys/src/cmd/6a/a.h +++ b/sys/src/cmd/6a/a.h @@ -18,7 +18,7 @@ typedef struct Gen2 Gen2; #define MAXALIGN 7 #define FPCHIP 1 #define NSYMB 500 -#define BUFSIZ (16*1024) +#define BUFSIZ IOUNIT #define HISTSZ 20 #define NINCLUDE 10 #define NHUNK 10000 diff --git a/sys/src/cmd/6l/l.h b/sys/src/cmd/6l/l.h index b7859e65..a983350f 100644 --- a/sys/src/cmd/6l/l.h +++ b/sys/src/cmd/6l/l.h @@ -122,7 +122,7 @@ enum MINSIZ = 8, STRINGSZ = 200, MINLC = 1, - MAXIO = (16*1024), + MAXIO = IOUNIT, MAXHIST = 20, /* limit of path elements for history symbols */ Yxxx = 0, diff --git a/sys/src/cmd/7a/mkfile b/sys/src/cmd/7a/mkfile index c8b36ad4..4444582d 100644 --- a/sys/src/cmd/7a/mkfile +++ b/sys/src/cmd/7a/mkfile @@ -1,5 +1,4 @@ paged) { /* copy from disk */ seek(ap->fd, 0, 0); diff --git a/sys/src/cmd/aux/consolefs.c b/sys/src/cmd/aux/consolefs.c index 3f6b7c89..2957392a 100644 --- a/sys/src/cmd/aux/consolefs.c +++ b/sys/src/cmd/aux/consolefs.c @@ -27,6 +27,7 @@ enum Qdata, Bufsize= 32*1024, /* chars buffered per reader */ + Stacksize= Bufsize+1024*3, /* fsreply(Bufsize+IOHDRSZ)+fsreader(1024)+others */ Maxcons= 64, /* maximum consoles */ Nhash= 64, /* Fid hash buckets */ }; @@ -162,7 +163,7 @@ char Enofid[] = "no such fid"; char *consoledb = "/lib/ndb/consoledb"; char *mntpt = "/mnt/consoles"; -int messagesize = 8192+IOHDRSZ; +int messagesize = IOUNIT+IOHDRSZ; void fatal(char *fmt, ...) @@ -357,7 +358,7 @@ fsmount(char *mntpt) /* start up the file system process */ v[0] = fs; v[1] = pfd; - proccreate(fsrun, v, 16*1024); + proccreate(fsrun, v, Stacksize); /* Typically mounted before /srv exists */ if(access("#s/consoles", AEXIST) < 0){ @@ -417,7 +418,7 @@ fsreopen(Fs* fs, Console *c) v[0] = fs; v[1] = c; - proccreate(fsreader, v, 16*1024); + proccreate(fsreader, v, Stacksize); return 0; } @@ -764,8 +765,8 @@ fsversion(Fs *fs, Request *r, Fid*) return; } messagesize = r->f.msize; - if(messagesize > 8192+IOHDRSZ) - messagesize = 8192+IOHDRSZ; + if(messagesize > IOUNIT+IOHDRSZ) + messagesize = IOUNIT+IOHDRSZ; r->f.msize = messagesize; if(strncmp(r->f.version, "9P2000", 6) != 0){ fsreply(fs, r, "unrecognized 9P version"); @@ -1206,7 +1207,7 @@ void fsreply(Fs *fs, Request *r, char *err) { int n; - uchar buf[8192+IOHDRSZ]; + uchar buf[Bufsize+IOHDRSZ]; if(err){ r->f.type = Rerror; diff --git a/sys/src/cmd/aux/trampoline.c b/sys/src/cmd/aux/trampoline.c index 6a5c0dee..c236239f 100644 --- a/sys/src/cmd/aux/trampoline.c +++ b/sys/src/cmd/aux/trampoline.c @@ -102,7 +102,7 @@ main(int argc, char **argv) void xfer(int from, int to) { - char buf[12*1024]; + char buf[IOUNIT]; int n; while((n = read(from, buf, sizeof buf)) > 0) diff --git a/sys/src/cmd/bzip2/bunzip2.c b/sys/src/cmd/bzip2/bunzip2.c index df487535..d4ff7b81 100644 --- a/sys/src/cmd/bzip2/bunzip2.c +++ b/sys/src/cmd/bzip2/bunzip2.c @@ -125,8 +125,8 @@ static int bunzip(int ofd, char *ofile, Biobuf *bin) { int e, n, done, onemore; - char buf[8192]; - char obuf[8192]; + char buf[IOUNIT]; + char obuf[IOUNIT]; Biobuf bout; bz_stream strm; diff --git a/sys/src/cmd/bzip2/bzip2.c b/sys/src/cmd/bzip2/bzip2.c index 17c2d06d..25f660b1 100644 --- a/sys/src/cmd/bzip2/bzip2.c +++ b/sys/src/cmd/bzip2/bzip2.c @@ -127,8 +127,8 @@ static int bzip(char *file, long mtime, int ifd, Biobuf *bout) { int e, n, done, onemore; - char buf[8192]; - char obuf[8192]; + char buf[IOUNIT]; + char obuf[IOUNIT]; Biobuf bin; bz_stream strm; diff --git a/sys/src/cmd/cat.c b/sys/src/cmd/cat.c index e3f4efac..7143fbe5 100644 --- a/sys/src/cmd/cat.c +++ b/sys/src/cmd/cat.c @@ -4,7 +4,7 @@ void cat(int f, char *s) { - char buf[16*1024]; + char buf[IOUNIT]; long n; while((n=read(f, buf, (long)sizeof buf))>0) diff --git a/sys/src/cmd/cc/cc.h b/sys/src/cmd/cc/cc.h index 69f49d53..8c65ec16 100644 --- a/sys/src/cmd/cc/cc.h +++ b/sys/src/cmd/cc/cc.h @@ -23,7 +23,7 @@ typedef struct Bits Bits; typedef Rune TRune; /* target system type */ #define NHUNK 50000L -#define BUFSIZ 16*1024 +#define BUFSIZ IOUNIT #define NSYMB 1500 #define NHASH 1024 #define STRINGSZ 200 diff --git a/sys/src/cmd/cfs/cfs.c b/sys/src/cmd/cfs/cfs.c index 8bedeeb8..1c5d2c7f 100644 --- a/sys/src/cmd/cfs/cfs.c +++ b/sys/src/cmd/cfs/cfs.c @@ -49,7 +49,7 @@ struct Cfsstat cfsstat, cfsprev; char statbuf[2048]; int statlen; -#define MAXFDATA 8192 /* i/o size for read/write */ +#define MAXFDATA IOUNIT /* i/o size for read/write */ int messagesize = MAXFDATA+IOHDRSZ; diff --git a/sys/src/cmd/cp.c b/sys/src/cmd/cp.c index f12c5712..4a153ccb 100644 --- a/sys/src/cmd/cp.c +++ b/sys/src/cmd/cp.c @@ -1,8 +1,7 @@ #include #include -#define DEFB (16*1024) - +int buflen; int failed; int gflag; int uflag; @@ -124,6 +123,11 @@ copy(char *from, char *to, int todir) failed = 1; return; } + + buflen = iounit(fdf); + if(buflen <= 0) + buflen = IOUNIT; + if(copy1(fdf, fdt, from, to)==0 && (xflag || gflag || uflag)){ nulldir(&dirt); if(xflag){ @@ -150,13 +154,19 @@ copy1(int fdf, int fdt, char *from, char *to) int rv; char err[ERRMAX]; - buf = malloc(DEFB); + buf = malloc(buflen); + if(buf == nil){ + fprint(2, "cp: out of memory\n"); + failed = 1; + return -1; + } + /* clear any residual error */ err[0] = '\0'; errstr(err, ERRMAX); rv = 0; for(rcount=0;; rcount++) { - n = read(fdf, buf, DEFB); + n = read(fdf, buf, buflen); if(n <= 0) break; n1 = write(fdt, buf, n); diff --git a/sys/src/cmd/cpu.c b/sys/src/cmd/cpu.c index 964424f9..fcc498e8 100644 --- a/sys/src/cmd/cpu.c +++ b/sys/src/cmd/cpu.c @@ -14,7 +14,7 @@ #include enum { - Maxfdata = 16*1024, + Maxfdata = IOUNIT, MaxStr = 512, }; diff --git a/sys/src/cmd/cwfs/net.c b/sys/src/cmd/cwfs/net.c index 97553be6..57fe00f9 100644 --- a/sys/src/cmd/cwfs/net.c +++ b/sys/src/cmd/cwfs/net.c @@ -6,7 +6,7 @@ #include enum { - Maxfdata = 8192, + Maxfdata = IOUNIT, Nqueue = 200, /* queue size (tunable) */ Netclosed = 0, /* Connection state */ diff --git a/sys/src/cmd/cwfs/portdat.h b/sys/src/cmd/cwfs/portdat.h index e32b92e9..25a65894 100644 --- a/sys/src/cmd/cwfs/portdat.h +++ b/sys/src/cmd/cwfs/portdat.h @@ -26,7 +26,7 @@ typedef vlong Devsize; /* in bytes */ /* constants that don't affect disk layout */ enum { - MAXDAT = 8192, /* max allowable data message */ + MAXDAT = IOUNIT, /* max allowable data message */ MAXMSG = 128, /* max protocol message sans data */ MB = 1024*1024, diff --git a/sys/src/cmd/dossrv/dosfs.h b/sys/src/cmd/dossrv/dosfs.h index 3f933039..ec6fa56b 100644 --- a/sys/src/cmd/dossrv/dosfs.h +++ b/sys/src/cmd/dossrv/dosfs.h @@ -1,6 +1,6 @@ enum { - Maxfdata = 8192, + Maxfdata = IOUNIT, Maxiosize = IOHDRSZ+Maxfdata, }; diff --git a/sys/src/cmd/exportfs/exportfs.c b/sys/src/cmd/exportfs/exportfs.c index 5b2eefd5..2df3ae83 100644 --- a/sys/src/cmd/exportfs/exportfs.c +++ b/sys/src/cmd/exportfs/exportfs.c @@ -14,7 +14,7 @@ #define Extern #include "exportfs.h" -#define MAXRPC (IOHDRSZ+16*1024) /* see MAXRPC in devmnt; was 8K+IOHDRSZ */ +#define MAXRPC (IOHDRSZ+IOUNIT) /* see MAXRPC in devmnt; was 8K+IOHDRSZ */ #define QIDPATH ((1LL<<48)-1) vlong newqid = 0; diff --git a/sys/src/cmd/fcp.c b/sys/src/cmd/fcp.c index e960afa4..5e5dfbff 100644 --- a/sys/src/cmd/fcp.c +++ b/sys/src/cmd/fcp.c @@ -1,8 +1,9 @@ #include #include -#define DEFB (16*1024) + #define Nwork 16 +int buflen; int failed; int gflag; int uflag; @@ -130,6 +131,11 @@ copy(char *from, char *to, int todir) failed = 1; return; } + + buflen = iounit(fdf); + if(buflen <= 0) + buflen = IOUNIT; + if(copy1(fdf, fdt, from, to)==0 && (xflag || gflag || uflag)){ nulldir(&dirt); if(xflag){ @@ -191,11 +197,16 @@ copy1(int fdf, int fdt, char *from, char *to) void worker(int fdf, int fdt, char *from, char *to) { - char buf[DEFB], *bp; + char *buf, *bp; long len, n; vlong o; - len = sizeof(buf); + len = buflen; + buf = malloc(len); + if(buf == nil){ + fprint(2, "out of memory\n"); + _exits("bad"); + } bp = buf; o = nextoff(); @@ -212,11 +223,12 @@ worker(int fdf, int fdt, char *from, char *to) o += n; len -= n; if(len == 0){ - len = sizeof buf; + len = buflen; bp = buf; o = nextoff(); } } + free(buf); _exits(nil); } @@ -227,7 +239,7 @@ nextoff(void) qlock(&lk); o = off; - off += DEFB; + off += buflen; qunlock(&lk); return o; diff --git a/sys/src/cmd/fossil/9proc.c b/sys/src/cmd/fossil/9proc.c index 94fd5a9f..afe8b76a 100644 --- a/sys/src/cmd/fossil/9proc.c +++ b/sys/src/cmd/fossil/9proc.c @@ -8,7 +8,7 @@ enum { NConInit = 128, NMsgInit = 384, NMsgProcInit = 64, - NMsizeInit = 16*1024+IOHDRSZ, + NMsizeInit = IOUNIT+IOHDRSZ, }; static struct { diff --git a/sys/src/cmd/fscfs/cfs.c b/sys/src/cmd/fscfs/cfs.c index 8f2320d8..9b1267a0 100644 --- a/sys/src/cmd/fscfs/cfs.c +++ b/sys/src/cmd/fscfs/cfs.c @@ -25,8 +25,9 @@ enum { MAXLEN = ((uvlong)1<<63)-1 }; int debug, statson, noauth, openserver; +int mainstacksize = 64*1024; -#define MAXFDATA 8192 /* i/o size for read/write */ +#define MAXFDATA IOUNIT /* i/o size for read/write */ struct P9fs { diff --git a/sys/src/cmd/git/git.h b/sys/src/cmd/git/git.h index cf09d439..a764c3fe 100644 --- a/sys/src/cmd/git/git.h +++ b/sys/src/cmd/git/git.h @@ -4,9 +4,6 @@ #include #include -/* 9legacy libc lacks IOUNIT */ -#define IOUNIT 32768U - typedef struct Conn Conn; typedef struct Hash Hash; typedef struct Delta Delta; diff --git a/sys/src/cmd/iostats/statfs.h b/sys/src/cmd/iostats/statfs.h index 507e7a28..bbfddd94 100644 --- a/sys/src/cmd/iostats/statfs.h +++ b/sys/src/cmd/iostats/statfs.h @@ -10,7 +10,7 @@ #define fidhash(s) fhash[s%FHASHSIZE] enum{ - Maxfdata = 16*1024, /* max size of data in 9P message */ + Maxfdata = IOUNIT, /* max size of data in 9P message */ Maxrpc = 20000,/* number of RPCs we'll log */ }; diff --git a/sys/src/cmd/ip/ftpfs/ftpfs.c b/sys/src/cmd/ip/ftpfs/ftpfs.c index cbdaae50..61eda9be 100644 --- a/sys/src/cmd/ip/ftpfs/ftpfs.c +++ b/sys/src/cmd/ip/ftpfs/ftpfs.c @@ -19,9 +19,9 @@ struct Fid Fid *fids; /* linked list of fids */ char errstring[128]; /* error to return */ int mfd; /* fd for 9fs */ -int messagesize = 4*1024+IOHDRSZ; -uchar mdata[8*1024+IOHDRSZ]; -uchar mbuf[8*1024+IOHDRSZ]; +int messagesize = IOUNIT+IOHDRSZ; +uchar mdata[IOUNIT+IOHDRSZ]; +uchar mbuf[IOUNIT+IOHDRSZ]; Fcall rhdr; Fcall thdr; int debug; @@ -642,7 +642,7 @@ void fatal(char *fmt, ...) { va_list arg; - char buf[8*1024]; + char buf[1024]; dying = 1; diff --git a/sys/src/cmd/ip/ftpfs/ftpfs.h b/sys/src/cmd/ip/ftpfs/ftpfs.h index 5845f522..9f32d4ca 100644 --- a/sys/src/cmd/ip/ftpfs/ftpfs.h +++ b/sys/src/cmd/ip/ftpfs/ftpfs.h @@ -107,6 +107,4 @@ extern char *user; #define TIMEOUT 5*60 #define DMSYML 0x10000000 -#define MAXFDATA 8192 - extern char net[]; /* network for connections */ diff --git a/sys/src/cmd/jtagfs/jtagfs.c b/sys/src/cmd/jtagfs/jtagfs.c index df1d808a..bf53bbc9 100644 --- a/sys/src/cmd/jtagfs/jtagfs.c +++ b/sys/src/cmd/jtagfs/jtagfs.c @@ -119,7 +119,7 @@ static char Ebadcmd[] = "error in jtag operation"; static ArmCtxt ctxt; static Fs fs; -static int messagesize = 8192+IOHDRSZ; +static int messagesize = IOUNIT+IOHDRSZ; static int cmdsetdebug(uchar *deb) diff --git a/sys/src/cmd/ka/a.h b/sys/src/cmd/ka/a.h index ac226725..2f1e22aa 100644 --- a/sys/src/cmd/ka/a.h +++ b/sys/src/cmd/ka/a.h @@ -15,7 +15,7 @@ typedef struct Hist Hist; #define MAXALIGN 7 #define FPCHIP 1 #define NSYMB 500 -#define BUFSIZ (16*1024) +#define BUFSIZ IOUNIT #define HISTSZ 20 #define NINCLUDE 10 #define NHUNK 10000 diff --git a/sys/src/cmd/kl/l.h b/sys/src/cmd/kl/l.h index 8a96da8f..c94de706 100644 --- a/sys/src/cmd/kl/l.h +++ b/sys/src/cmd/kl/l.h @@ -100,7 +100,7 @@ enum FPCHIP = 1, BIG = 4096-8, STRINGSZ = 200, - MAXIO = (16*1024), + MAXIO = IOUNIT, MAXHIST = 20, /* limit of path elements for history symbols */ DATBLK = 1024, NHASH = 10007, diff --git a/sys/src/cmd/ld/ld.h b/sys/src/cmd/ld/ld.h index be738fcc..dc5e6005 100644 --- a/sys/src/cmd/ld/ld.h +++ b/sys/src/cmd/ld/ld.h @@ -46,7 +46,7 @@ enum STRINGSZ = 200, NHASH = 10007, NHUNK = 100000, - MAXIO = 16*1024, + MAXIO = IOUNIT, MAXHIST = 20, /* limit of path elements for history symbols */ }; diff --git a/sys/src/cmd/lnfs.c b/sys/src/cmd/lnfs.c index c34669b9..72e596ab 100644 --- a/sys/src/cmd/lnfs.c +++ b/sys/src/cmd/lnfs.c @@ -10,7 +10,7 @@ enum { OPERM = 0x3, /* mask of all permission types in open mode */ Maxsize = 512*1024*1024, - Maxfdata = 8192, + Maxfdata = IOUNIT, NAMELEN = 28, }; diff --git a/sys/src/cmd/md5sum.c b/sys/src/cmd/md5sum.c index 37a681ef..368aa1bd 100644 --- a/sys/src/cmd/md5sum.c +++ b/sys/src/cmd/md5sum.c @@ -22,7 +22,7 @@ static void sum(int fd, char *name) { int n; - uchar buf[8192], digest[MD5dlen]; + uchar buf[IOUNIT], digest[MD5dlen]; DigestState *s; s = md5(nil, 0, nil, nil); diff --git a/sys/src/cmd/mv.c b/sys/src/cmd/mv.c index fa94d7ba..ce43b0bd 100644 --- a/sys/src/cmd/mv.c +++ b/sys/src/cmd/mv.c @@ -167,7 +167,7 @@ mv1(char *from, Dir *dirb, char *todir, char *toelem) int copy1(int fdf, int fdt, char *from, char *to) { - char buf[16*1024]; + char buf[IOUNIT]; long n, n1; while ((n = read(fdf, buf, sizeof buf)) > 0) { diff --git a/sys/src/cmd/paqfs/paqfs.c b/sys/src/cmd/paqfs/paqfs.c index 2e642700..8c274ef2 100644 --- a/sys/src/cmd/paqfs/paqfs.c +++ b/sys/src/cmd/paqfs/paqfs.c @@ -62,7 +62,7 @@ Fid *fids; Fcall rhdr, thdr; int blocksize; int cachesize = 20; -int mesgsize = 8*1024 + IOHDRSZ; +int mesgsize = IOUNIT + IOHDRSZ; Paq *root, *rootfile; Block *cache; ulong cacheage; diff --git a/sys/src/cmd/qa/a.h b/sys/src/cmd/qa/a.h index efd2e5c6..3b65d074 100644 --- a/sys/src/cmd/qa/a.h +++ b/sys/src/cmd/qa/a.h @@ -15,7 +15,7 @@ typedef struct Hist Hist; #define MAXALIGN 7 #define FPCHIP 1 #define NSYMB 8192 -#define BUFSIZ (16*1024) +#define BUFSIZ IOUNIT #define HISTSZ 20 #define NINCLUDE 10 #define NHUNK 10000 diff --git a/sys/src/cmd/ql/l.h b/sys/src/cmd/ql/l.h index f06cd659..47456ba7 100644 --- a/sys/src/cmd/ql/l.h +++ b/sys/src/cmd/ql/l.h @@ -98,7 +98,7 @@ enum FPCHIP = 1, BIG = 32768-8, STRINGSZ = 200, - MAXIO = (16*1024), + MAXIO = IOUNIT, MAXHIST = 20, /* limit of path elements for history symbols */ DATBLK = 1024, NHASH = 10007, diff --git a/sys/src/cmd/ramcfs/cfs.c b/sys/src/cmd/ramcfs/cfs.c index 96f07d05..8e3131b8 100644 --- a/sys/src/cmd/ramcfs/cfs.c +++ b/sys/src/cmd/ramcfs/cfs.c @@ -50,7 +50,7 @@ struct Cfsstat cfsstat, cfsprev; char statbuf[2048]; int statlen; -#define MAXFDATA 8192 /* i/o size for read/write */ +#define MAXFDATA IOUNIT /* i/o size for read/write */ int messagesize = MAXFDATA+IOHDRSZ; diff --git a/sys/src/cmd/ramfs.c b/sys/src/cmd/ramfs.c index f8a72cf8..8a26c5fd 100644 --- a/sys/src/cmd/ramfs.c +++ b/sys/src/cmd/ramfs.c @@ -15,7 +15,7 @@ enum OPERM = 0x3, /* mask of all permission types in open mode */ Nram = 1024, Maxsize = 768*1024*1024, - Maxfdata = 16*1024, + Maxfdata = IOUNIT, Maxulong= (1ULL << 32) - 1, }; diff --git a/sys/src/cmd/rx.c b/sys/src/cmd/rx.c index 116f48e3..16101bbd 100644 --- a/sys/src/cmd/rx.c +++ b/sys/src/cmd/rx.c @@ -103,7 +103,7 @@ call(char *net, char *host, char *service, char **na) void rex(int fd, char *cmd, char *proto) { - char buf[4096]; + char buf[IOUNIT]; int kid, n, oalarm; AuthInfo *ai; @@ -129,7 +129,7 @@ rex(int fd, char *cmd, char *proto) void tcpexec(int fd, char *addr, char *cmd) { - char *cp, *ep, *u, *ru, buf[4096]; + char *cp, *ep, *u, *ru, buf[IOUNIT]; int kid, n; /* @@ -212,7 +212,7 @@ sshexec(char *host, char *cmd) int send(int fd) { - char buf[4096]; + char buf[IOUNIT]; int n; int kid; switch(kid = fork()){ diff --git a/sys/src/cmd/sam/sam.h b/sys/src/cmd/sam/sam.h index 53e86fbb..7be24e7b 100644 --- a/sys/src/cmd/sam/sam.h +++ b/sys/src/cmd/sam/sam.h @@ -87,7 +87,7 @@ struct List enum { Blockincr = 256, - Maxblock = 16*1024, + Maxblock = IOUNIT, BUFSIZE = Maxblock, /* size from fbufalloc() */ RBUFSIZE = BUFSIZE/sizeof(Rune), diff --git a/sys/src/cmd/samterm/samterm.h b/sys/src/cmd/samterm/samterm.h index e7bebc3f..c3770e1f 100644 --- a/sys/src/cmd/samterm/samterm.h +++ b/sys/src/cmd/samterm/samterm.h @@ -2,7 +2,7 @@ #define RUNESIZE sizeof(Rune) #define MAXFILES 256 -#define READBUFSIZE (16*1024) +#define READBUFSIZE IOUNIT #define NL 5 enum{ diff --git a/sys/src/cmd/sha1sum.c b/sys/src/cmd/sha1sum.c index 321a3ba1..bb74acd9 100644 --- a/sys/src/cmd/sha1sum.c +++ b/sys/src/cmd/sha1sum.c @@ -42,7 +42,7 @@ static void sum(int fd, char *name) { int n; - uchar buf[8192], digest[SHA2_512dlen]; + uchar buf[IOUNIT], digest[SHA2_512dlen]; DigestState *s; s = (*shafunc)(nil, 0, nil, nil); diff --git a/sys/src/cmd/tapefs/tapefs.h b/sys/src/cmd/tapefs/tapefs.h index 2e7f8cdc..23dd0881 100644 --- a/sys/src/cmd/tapefs/tapefs.h +++ b/sys/src/cmd/tapefs/tapefs.h @@ -8,8 +8,7 @@ enum { OPERM = 0x3, /* mask of all permission types in open mode */ - Nram = 512, - Maxbuf = 8192, /* max buffer size */ + Maxbuf = IOUNIT, /* max buffer size */ }; typedef struct Fid Fid; diff --git a/sys/src/cmd/tapefs/tapfs.c b/sys/src/cmd/tapefs/tapfs.c index fb1738c2..60449289 100644 --- a/sys/src/cmd/tapefs/tapfs.c +++ b/sys/src/cmd/tapefs/tapfs.c @@ -18,7 +18,7 @@ struct tap { } dir[192]; int tapefile; -char buffer[8192]; +char buffer[Maxbuf]; long cvtime(unsigned char *); extern int verbose; extern int newtap; diff --git a/sys/src/cmd/tapefs/tpfs.c b/sys/src/cmd/tapefs/tpfs.c index 02079a3a..2f07754c 100644 --- a/sys/src/cmd/tapefs/tpfs.c +++ b/sys/src/cmd/tapefs/tpfs.c @@ -21,7 +21,7 @@ struct tp { unsigned char checksum[2]; } dir[496+8]; -char buffer[8192]; +char buffer[Maxbuf]; int tapefile; void diff --git a/sys/src/cmd/tar.c b/sys/src/cmd/tar.c index f0c9f3c1..0bcdf02d 100644 --- a/sys/src/cmd/tar.c +++ b/sys/src/cmd/tar.c @@ -55,8 +55,7 @@ enum { Binsize = 0x80, /* flag in size[0], from gnu: positive binary size */ Binnegsz = 0xff, /* flag in size[0]: negative binary size */ - Nblock = 40, /* maximum blocksize */ - Dblock = 20, /* default blocksize */ + Dblock = IOUNIT/Tblock, /* blocksize */ Debug = 0, }; diff --git a/sys/src/cmd/tee.c b/sys/src/cmd/tee.c index 753ceb36..291e5b93 100644 --- a/sys/src/cmd/tee.c +++ b/sys/src/cmd/tee.c @@ -9,7 +9,7 @@ int uflag; int aflag; int *openf; -char in[8192]; +char in[IOUNIT]; int intignore(void*, char*); diff --git a/sys/src/cmd/tlsclient.c b/sys/src/cmd/tlsclient.c index ddb5bb29..e96dd485 100644 --- a/sys/src/cmd/tlsclient.c +++ b/sys/src/cmd/tlsclient.c @@ -13,7 +13,7 @@ usage(void) void xfer(int from, int to) { - char buf[12*1024]; + char buf[IOUNIT]; int n; while((n = read(from, buf, sizeof buf)) > 0) diff --git a/sys/src/cmd/upas/fs/fs.c b/sys/src/cmd/upas/fs/fs.c index 8f62b002..e65a6035 100644 --- a/sys/src/cmd/upas/fs/fs.c +++ b/sys/src/cmd/upas/fs/fs.c @@ -33,9 +33,9 @@ ulong path; // incremented for each new file Fid *fids; int mfd[2]; char user[Elemlen]; -int messagesize = 4*1024+IOHDRSZ; -uchar mdata[8*1024+IOHDRSZ]; -uchar mbuf[8*1024+IOHDRSZ]; +int messagesize = IOUNIT+IOHDRSZ; +uchar mdata[IOUNIT+IOHDRSZ]; +uchar mbuf[IOUNIT]; Fcall thdr; Fcall rhdr; int fflg; diff --git a/sys/src/cmd/upas/marshal/marshal.c b/sys/src/cmd/upas/marshal/marshal.c index 0dfdda46..d1103e43 100644 --- a/sys/src/cmd/upas/marshal/marshal.c +++ b/sys/src/cmd/upas/marshal/marshal.c @@ -933,7 +933,7 @@ static void tee(int in, int out1, int out2) { int n; - char buf[8*1024]; + char buf[IOUNIT]; while ((n = read(in, buf, sizeof buf)) > 0) if (write(out1, buf, n) != n || @@ -1736,7 +1736,7 @@ expandline(String **s, Addr *to) void Bdrain(Biobuf *b) { - char buf[8192]; + char buf[IOUNIT]; while(Bread(b, buf, sizeof buf) > 0) ; diff --git a/sys/src/cmd/usb/disk/scsireq.h b/sys/src/cmd/usb/disk/scsireq.h index f98d0e40..b9b41d50 100644 --- a/sys/src/cmd/usb/disk/scsireq.h +++ b/sys/src/cmd/usb/disk/scsireq.h @@ -10,12 +10,7 @@ typedef struct Umsc Umsc; enum { /* fundamental constants/defaults */ MaxDirData = 255, /* max. direct data returned */ - /* - * Because we are accessed via devmnt, we can never get i/o counts - * larger than 8216 (Msgsize and devmnt's offered iounit) - 24 - * (IOHDRSZ) = 8K. - */ - Maxiosize = 8216 - IOHDRSZ, /* max. I/O transfer size */ + Maxiosize = IOUNIT, /* max. I/O transfer size */ }; typedef struct { diff --git a/sys/src/cmd/usb/lib/usbfs.h b/sys/src/cmd/usb/lib/usbfs.h index ebb3c6cc..c537f587 100644 --- a/sys/src/cmd/usb/lib/usbfs.h +++ b/sys/src/cmd/usb/lib/usbfs.h @@ -4,7 +4,7 @@ typedef struct Fid Fid; enum { Hdrsize = 128, /* plenty of room for headers */ - Msgsize = 8216, /* our preferred iounit (also devmnt's) */ + Msgsize = IOHDRSZ+IOUNIT, /* our preferred msize (also devmnt's) */ Bufsize = Hdrsize + Msgsize, Namesz = 40, Errmax = 128, diff --git a/sys/src/cmd/va/a.h b/sys/src/cmd/va/a.h index f40951ac..7d91fd66 100644 --- a/sys/src/cmd/va/a.h +++ b/sys/src/cmd/va/a.h @@ -15,7 +15,7 @@ typedef struct Hist Hist; #define MAXALIGN 7 #define FPCHIP 1 #define NSYMB 8192 -#define BUFSIZ (16*1024) +#define BUFSIZ IOUNIT #define HISTSZ 20 #define NINCLUDE 10 #define NHUNK 10000 diff --git a/sys/src/cmd/vac/vac.c b/sys/src/cmd/vac/vac.c index 5c0dba22..9c3cbe7b 100644 --- a/sys/src/cmd/vac/vac.c +++ b/sys/src/cmd/vac/vac.c @@ -558,7 +558,7 @@ vacstdin(VacFile *fp, char *name) { vlong off; VacFile *f; - static char buf[16*1024]; + static char buf[IOUNIT]; int n; if((f = vacfilecreate(fp, name, 0666)) == nil){ diff --git a/sys/src/cmd/vac/vacfs.c b/sys/src/cmd/vac/vacfs.c index dd17c3df..c75dad04 100644 --- a/sys/src/cmd/vac/vacfs.c +++ b/sys/src/cmd/vac/vacfs.c @@ -42,7 +42,7 @@ uchar *data; int mfd[2]; int srvfd = -1; char *user; -uchar mdata[16*1024+IOHDRSZ]; +uchar mdata[IOUNIT+IOHDRSZ]; int messagesize = sizeof mdata; Fcall rhdr; Fcall thdr; diff --git a/sys/src/cmd/vl/l.h b/sys/src/cmd/vl/l.h index 83564e30..0db00bfc 100644 --- a/sys/src/cmd/vl/l.h +++ b/sys/src/cmd/vl/l.h @@ -168,7 +168,7 @@ enum NHUNK = 100000, MINSIZ = 64, NENT = 100, - MAXIO = (16*1024), + MAXIO = IOUNIT, MAXHIST = 20, /* limit of path elements for history symbols */ }; diff --git a/sys/src/cmd/vnc/exportfs.c b/sys/src/cmd/vnc/exportfs.c index 4948016d..bacf3d01 100644 --- a/sys/src/cmd/vnc/exportfs.c +++ b/sys/src/cmd/vnc/exportfs.c @@ -12,7 +12,7 @@ typedef struct Exwork Exwork; enum { Nfidhash = 32, - Maxfdata = 8192, + Maxfdata = IOUNIT, Maxrpc = IOHDRSZ + Maxfdata, }; diff --git a/sys/src/lib9p/srv.c b/sys/src/lib9p/srv.c index 5588339f..737a381b 100644 --- a/sys/src/lib9p/srv.c +++ b/sys/src/lib9p/srv.c @@ -695,7 +695,7 @@ srv(Srv *srv) if(srv->rpool == nil) srv->rpool = allocreqpool(srv->destroyreq); if(srv->msize == 0) - srv->msize = 16*1024+IOHDRSZ; + srv->msize = IOUNIT+IOHDRSZ; changemsize(srv, srv->msize); diff --git a/sys/src/libdraw/readimage.c b/sys/src/libdraw/readimage.c index 61dbd12a..cf15a251 100644 --- a/sys/src/libdraw/readimage.c +++ b/sys/src/libdraw/readimage.c @@ -25,8 +25,11 @@ readimage(Display *d, int fd, int dolock) return nil; if(d) chunk = d->bufsize - 32; /* a little room for header */ - else - chunk = 8192; + else{ + chunk = iounit(fd); + if(chunk <= 0) + chunk = IOUNIT; + } /* * distinguish new channel descriptor from old ldepth.