kernel: pipelined read ahead for the mount cache

this changes devmnt adding mntrahread() function and some helpers
for it to do pipelined sequential read ahead for the mount cache.

basically, cread() calls mntrahread() with Mntrah structure and it
figures out if we where reading sequentially and if thats the case
issues reads of c->iounit size in advance.

the read ahead state (Mntrah) is kept in the mount cache so we can
handle (read ahead) cache invalidation in the presence of writes.
This commit is contained in:
cinap_lenrek 2015-07-26 05:43:26 +02:00
parent 918cb76040
commit 6617c63a37
5 changed files with 483 additions and 116 deletions

View file

@ -15,6 +15,10 @@ enum
NBITMAP = (PGROUND(MAXCACHE)/BY2PG + MAPBITS-1) / MAPBITS, NBITMAP = (PGROUND(MAXCACHE)/BY2PG + MAPBITS-1) / MAPBITS,
}; };
/* devmnt.c: parallel read ahread implementation */
extern void mntrahinit(Mntrah *rah);
extern long mntrahread(Mntrah *rah, Chan *c, uchar *buf, long len, vlong off);
typedef struct Mntcache Mntcache; typedef struct Mntcache Mntcache;
struct Mntcache struct Mntcache
{ {
@ -23,12 +27,18 @@ struct Mntcache
int type; int type;
QLock; QLock;
Proc *locked;
ulong nlocked;
Mntcache *hash; Mntcache *hash;
Mntcache *prev; Mntcache *prev;
Mntcache *next; Mntcache *next;
/* page bitmap of valid pages */ /* page bitmap of valid pages */
ulong bitmap[NBITMAP]; ulong bitmap[NBITMAP];
/* read ahead state */
Mntrah rah;
}; };
typedef struct Cache Cache; typedef struct Cache Cache;
@ -124,13 +134,66 @@ clookup(Chan *c, int skipvers)
return nil; return nil;
} }
/*
* resursive Mntcache locking. Mntcache.rah is protected by the
* same lock and we want to call cupdate() from mntrahread()
* while holding the lock.
*/
static int
cancachelock(Mntcache *m)
{
if(m->locked == up || canqlock(m)){
m->locked = up;
m->nlocked++;
return 1;
}
return 0;
}
static void
cachelock(Mntcache *m)
{
if(m->locked != up){
qlock(m);
assert(m->nlocked == 0);
m->locked = up;
}
m->nlocked++;
}
static void
cacheunlock(Mntcache *m)
{
assert(m->locked == up);
if(--m->nlocked == 0){
m->locked = nil;
qunlock(m);
}
}
/* return locked Mntcache if still valid else reset mcp */
static Mntcache*
ccache(Chan *c)
{
Mntcache *m;
m = c->mcp;
if(m != nil) {
cachelock(m);
if(eqchantdqid(c, m->type, m->dev, m->qid, 0) && c->qid.type == m->qid.type)
return m;
c->mcp = nil;
cacheunlock(m);
}
return nil;
}
void void
copen(Chan *c) copen(Chan *c)
{ {
Mntcache *m, *f, **l; Mntcache *m, *f, **l;
/* directories aren't cacheable and append-only files confuse us */ /* directories aren't cacheable */
if(c->qid.type&(QTDIR|QTAPPEND)){ if(c->qid.type&QTDIR){
c->mcp = nil; c->mcp = nil;
return; return;
} }
@ -156,9 +219,9 @@ copen(Chan *c)
l = &f->hash; l = &f->hash;
} }
if(!canqlock(m)){ if(!cancachelock(m)){
unlock(&cache); unlock(&cache);
qlock(m); cachelock(m);
lock(&cache); lock(&cache);
f = clookup(c, 0); f = clookup(c, 0);
if(f != nil) { if(f != nil) {
@ -169,7 +232,7 @@ copen(Chan *c)
*/ */
ctail(f); ctail(f);
unlock(&cache); unlock(&cache);
qunlock(m); cacheunlock(m);
c->mcp = f; c->mcp = f;
return; return;
} }
@ -182,29 +245,18 @@ copen(Chan *c)
l = &cache.hash[c->qid.path%NHASH]; l = &cache.hash[c->qid.path%NHASH];
m->hash = *l; m->hash = *l;
*l = m; *l = m;
unlock(&cache); unlock(&cache);
m->rah.vers = m->qid.vers;
mntrahinit(&m->rah);
cnodata(m); cnodata(m);
qunlock(m);
cacheunlock(m);
c->mcp = m; c->mcp = m;
} }
/* return locked Mntcache if still valid else reset mcp */
static Mntcache*
ccache(Chan *c)
{
Mntcache *m;
m = c->mcp;
if(m != nil) {
qlock(m);
if(eqchantdqid(c, m->type, m->dev, m->qid, 0) && c->qid.type == m->qid.type)
return m;
c->mcp = nil;
qunlock(m);
}
return nil;
}
enum { enum {
VABITS = 8*sizeof(uintptr) - 2*PGSHIFT, VABITS = 8*sizeof(uintptr) - 2*PGSHIFT,
VAMASK = (((uintptr)1 << VABITS)-1) << PGSHIFT, VAMASK = (((uintptr)1 << VABITS)-1) << PGSHIFT,
@ -243,17 +295,24 @@ cread(Chan *c, uchar *buf, int len, vlong off)
KMap *k; KMap *k;
Page *p; Page *p;
Mntcache *m; Mntcache *m;
int l, total; int l, tot;
ulong offset, pn, po, pe; ulong offset, pn, po, pe;
if(off >= MAXCACHE || len <= 0) if(len <= 0)
return 0; return 0;
m = ccache(c); m = ccache(c);
if(m == nil) if(m == nil)
return 0; return 0;
total = 0; if(waserror()){
cacheunlock(m);
nexterror();
}
tot = 0;
if(off >= MAXCACHE)
goto Prefetch;
offset = off; offset = off;
if(offset+len > MAXCACHE) if(offset+len > MAXCACHE)
@ -277,16 +336,16 @@ cread(Chan *c, uchar *buf, int len, vlong off)
if(waserror()) { if(waserror()) {
kunmap(k); kunmap(k);
putpage(p); putpage(p);
qunlock(m);
nexterror(); nexterror();
} }
memmove(buf, (uchar*)VA(k) + offset, l); memmove(buf, (uchar*)VA(k) + offset, l);
poperror();
kunmap(k); kunmap(k);
putpage(p); putpage(p);
poperror();
total += l; tot += l;
buf += l;
len -= l;
offset += l; offset += l;
offset &= (BY2PG-1); offset &= (BY2PG-1);
@ -294,12 +353,21 @@ cread(Chan *c, uchar *buf, int len, vlong off)
break; break;
pn++; pn++;
buf += l;
len -= l;
} }
qunlock(m);
return total; Prefetch:
if(len > 0){
if(m->rah.vers != m->qid.vers){
mntrahinit(&m->rah);
m->rah.vers = m->qid.vers;
}
off += tot;
tot += mntrahread(&m->rah, c, buf, len, off);
}
cacheunlock(m);
poperror();
return tot;
} }
/* invalidate pages in page bitmap */ /* invalidate pages in page bitmap */
@ -322,7 +390,7 @@ cachedata(Mntcache *m, uchar *buf, int len, vlong off)
ulong offset, pn, po, pe; ulong offset, pn, po, pe;
if(off >= MAXCACHE || len <= 0){ if(off >= MAXCACHE || len <= 0){
qunlock(m); cacheunlock(m);
return; return;
} }
@ -370,7 +438,7 @@ cachedata(Mntcache *m, uchar *buf, int len, vlong off)
kunmap(k); kunmap(k);
putpage(p); putpage(p);
invalidate(m, offset + pn*BY2PG, len); invalidate(m, offset + pn*BY2PG, len);
qunlock(m); cacheunlock(m);
nexterror(); nexterror();
} }
memmove((uchar*)VA(k) + offset, buf, l); memmove((uchar*)VA(k) + offset, buf, l);
@ -383,7 +451,7 @@ cachedata(Mntcache *m, uchar *buf, int len, vlong off)
buf += l; buf += l;
len -= l; len -= l;
} }
qunlock(m); cacheunlock(m);
} }
void void
@ -407,5 +475,22 @@ cwrite(Chan* c, uchar *buf, int len, vlong off)
return; return;
m->qid.vers++; m->qid.vers++;
c->qid.vers++; c->qid.vers++;
if(c->qid.type&QTAPPEND){
cacheunlock(m);
return;
}
cachedata(m, buf, len, off); cachedata(m, buf, len, off);
} }
void
cclunk(Chan *c)
{
Mntcache *m;
m = ccache(c);
if(m == nil)
return;
mntrahinit(&m->rah);
cacheunlock(m);
c->mcp = nil;
}

View file

@ -42,7 +42,7 @@ enum
NMASK = (64*1024)>>TAGSHIFT, NMASK = (64*1024)>>TAGSHIFT,
}; };
struct Mntalloc static struct Mntalloc
{ {
Lock; Lock;
Mnt* list; /* Mount devices in use */ Mnt* list; /* Mount devices in use */
@ -54,21 +54,21 @@ struct Mntalloc
ulong tagmask[NMASK]; ulong tagmask[NMASK];
}mntalloc; }mntalloc;
Mnt* mntchk(Chan*); static Chan* mntchan(void);
void mntdirfix(uchar*, Chan*); static Mnt* mntchk(Chan*);
Mntrpc* mntflushalloc(Mntrpc*, ulong); static void mntdirfix(uchar*, Chan*);
Mntrpc* mntflushfree(Mnt*, Mntrpc*); static Mntrpc* mntflushalloc(Mntrpc*, ulong);
void mntfree(Mntrpc*); static Mntrpc* mntflushfree(Mnt*, Mntrpc*);
void mntgate(Mnt*); static void mntfree(Mntrpc*);
void mntqrm(Mnt*, Mntrpc*); static void mntgate(Mnt*);
Mntrpc* mntralloc(Chan*, ulong); static void mntqrm(Mnt*, Mntrpc*);
long mntrdwr(int, Chan*, void*, long, vlong); static Mntrpc* mntralloc(Chan*, ulong);
int mntrpcread(Mnt*, Mntrpc*); static long mntrdwr(int, Chan*, void*, long, vlong);
void mountio(Mnt*, Mntrpc*); static int mntrpcread(Mnt*, Mntrpc*);
void mountmux(Mnt*, Mntrpc*); static void mountio(Mnt*, Mntrpc*);
void mountrpc(Mnt*, Mntrpc*); static void mountmux(Mnt*, Mntrpc*);
int rpcattn(void*); static void mountrpc(Mnt*, Mntrpc*);
Chan* mntchan(void); static int rpcattn(void*);
char Esbadstat[] = "invalid directory entry received from server"; char Esbadstat[] = "invalid directory entry received from server";
char Enoversion[] = "version not established for mount channel"; char Enoversion[] = "version not established for mount channel";
@ -257,7 +257,6 @@ mntauth(Chan *c, char *spec)
Mntrpc *r; Mntrpc *r;
m = c->mux; m = c->mux;
if(m == nil){ if(m == nil){
mntversion(c, VERSION9P, MAXRPC, 0); mntversion(c, VERSION9P, MAXRPC, 0);
m = c->mux; m = c->mux;
@ -275,7 +274,6 @@ mntauth(Chan *c, char *spec)
} }
r = mntralloc(0, m->msize); r = mntralloc(0, m->msize);
if(waserror()) { if(waserror()) {
mntfree(r); mntfree(r);
nexterror(); nexterror();
@ -319,7 +317,6 @@ mntattach(char *muxattach)
c = bogus.chan; c = bogus.chan;
m = c->mux; m = c->mux;
if(m == nil){ if(m == nil){
mntversion(c, nil, 0, 0); mntversion(c, nil, 0, 0);
m = c->mux; m = c->mux;
@ -342,7 +339,6 @@ mntattach(char *muxattach)
mntfree(r); mntfree(r);
nexterror(); nexterror();
} }
r->request.type = Tattach; r->request.type = Tattach;
r->request.fid = c->fid; r->request.fid = c->fid;
if(bogus.authchan == nil) if(bogus.authchan == nil)
@ -368,7 +364,7 @@ mntattach(char *muxattach)
return c; return c;
} }
Chan* static Chan*
mntchan(void) mntchan(void)
{ {
Chan *c; Chan *c;
@ -552,13 +548,13 @@ mntclunk(Chan *c, int t)
Mnt *m; Mnt *m;
Mntrpc *r; Mntrpc *r;
cclunk(c);
m = mntchk(c); m = mntchk(c);
r = mntralloc(c, m->msize); r = mntralloc(c, m->msize);
if(waserror()){ if(waserror()){
mntfree(r); mntfree(r);
nexterror(); nexterror();
} }
r->request.type = t; r->request.type = t;
r->request.fid = c->fid; r->request.fid = c->fid;
mountrpc(m, r); mountrpc(m, r);
@ -658,24 +654,59 @@ mntwrite(Chan *c, void *buf, long n, vlong off)
return mntrdwr(Twrite, c, buf, n, off); return mntrdwr(Twrite, c, buf, n, off);
} }
long static void
mntcache(Mntrpc *r)
{
ulong n, m;
vlong off;
Block *b;
Chan *c;
c = r->c;
if((c->flag & CCACHE) == 0 || c->mcp == nil)
return;
off = r->request.offset;
switch(r->reply.type){
case Rread:
m = r->reply.count;
if(m > r->request.count)
m = r->request.count;
for(b = r->b; m > 0 && b != nil; b = b->next) {
n = BLEN(b);
if(m < n)
n = m;
cupdate(c, b->rp, n, off);
off += n;
}
break;
case Rwrite:
if(convM2S(r->rpc, r->rpclen, &r->request) == 0)
panic("convM2S");
cwrite(c, (uchar*)r->request.data, r->request.count, off);
break;
}
}
static long
mntrdwr(int type, Chan *c, void *buf, long n, vlong off) mntrdwr(int type, Chan *c, void *buf, long n, vlong off)
{ {
Mnt *m; Mnt *m;
Mntrpc *r; Mntrpc *r;
char *uba; char *uba;
int cache;
ulong cnt, nr, nreq; ulong cnt, nr, nreq;
m = mntchk(c); m = mntchk(c);
uba = buf; uba = buf;
cnt = 0; cnt = 0;
cache = c->flag & CCACHE;
if(c->qid.type & QTDIR)
cache = 0;
for(;;) { for(;;) {
if(cache && type == Tread) { nreq = n;
nr = cread(c, (uchar*)uba, n, off); if(nreq > m->msize-IOHDRSZ)
nreq = m->msize-IOHDRSZ;
if(type == Tread) {
nr = cread(c, (uchar*)uba, nreq, off);
if(nr > 0) { if(nr > 0) {
nreq = nr; nreq = nr;
goto Next; goto Next;
@ -691,43 +722,12 @@ mntrdwr(int type, Chan *c, void *buf, long n, vlong off)
r->request.fid = c->fid; r->request.fid = c->fid;
r->request.offset = off; r->request.offset = off;
r->request.data = uba; r->request.data = uba;
nr = n; r->request.count = nreq;
if(nr > m->msize-IOHDRSZ)
nr = m->msize-IOHDRSZ;
r->request.count = nr;
mountrpc(m, r); mountrpc(m, r);
nreq = r->request.count; mntcache(r);
nr = r->reply.count; nr = r->reply.count;
if(nr > nreq) if(nr > nreq)
nr = nreq; nr = nreq;
if(cache) {
/*
* note that we cannot update the cache from uba as
* the user could change its contents from another
* process before the data gets copied to the cached.
*/
if(type == Tread) {
ulong nc, nn;
Block *b;
nc = 0;
for(b = r->b; b != nil; b = b->next) {
nn = BLEN(b);
if(nc+nn > nr)
nn = nr - nc;
cupdate(c, b->rp, nn, off + nc);
nc += nn;
if(nc >= nr)
break;
}
} else {
if(convM2S(r->rpc, r->rpclen, &r->request) == 0)
panic("convM2S");
cwrite(c, (uchar*)r->request.data, nr, off);
}
}
if(type == Tread) if(type == Tread)
r->b = bl2mem((uchar*)uba, r->b, nr); r->b = bl2mem((uchar*)uba, r->b, nr);
mntfree(r); mntfree(r);
@ -744,7 +744,231 @@ mntrdwr(int type, Chan *c, void *buf, long n, vlong off)
return cnt; return cnt;
} }
static int
mntprocwork(void *a)
{
Mntproc *p = a;
return p->f != nil;
}
static void
mntproc(void *a)
{
Mntproc *p = a;
Chan *c;
Mnt *m;
while(waserror())
;
m = p->m;
for(;;){
tsleep(p, mntprocwork, p, 500);
lock(m);
if(p->f == nil){
p->m = nil;
unlock(m);
pexit("no work", 1);
}
c = p->r->c;
unlock(m);
(*p->f)(p->r, p->a);
lock(m);
p->r = nil;
p->a = nil;
p->f = nil;
unlock(m);
cclose(c);
}
}
static int
mntdefer(void (*f)(Mntrpc*, void*), Mntrpc *r, void *a)
{
Mntproc *p;
Mnt *m;
int i;
m = mntchk(r->c);
lock(m);
for(i = 0; i < nelem(m->defered); i++){
p = &m->defered[i];
if(p->f != nil)
continue;
incref(r->c);
r->m = m;
p->r = r;
p->a = a;
p->f = f;
if(p->m == nil){
p->m = m;
unlock(m);
kproc("mntporc", mntproc, p);
} else {
unlock(m);
wakeup(p);
}
return 1;
}
unlock(m);
return 0;
}
static void
rahproc(Mntrpc *r, void *a)
{
Mntrah *rah = a;
if(!waserror()){
mountrpc(r->m, r);
poperror();
}
r->done = 2;
wakeup(rah);
}
static int
rahdone(void *v)
{
Mntrpc *r = v;
return r->done == 2;
}
static Mntrpc*
rahfindrpc(Mntrah *rah, vlong off)
{
Mntrpc *r;
int i, n;
vlong o;
for(i=0; i<nelem(rah->r); i++){
if((r = rah->r[i]) == nil)
continue;
n = r->request.count;
o = r->request.offset;
if(off >= o && off < o+n)
return r;
}
return nil;
}
void void
mntrahinit(Mntrah *rah)
{
Mntrpc *r;
int i;
while(waserror())
;
for(i=0; i<nelem(rah->r); i++){
if((r = rah->r[i]) != nil){
while(!rahdone(r))
sleep(rah, rahdone, r);
rah->r[i] = nil;
mntfree(r);
}
}
rah->i = 0;
rah->off = 0;
rah->seq = 0;
poperror();
}
long
mntrahread(Mntrah *rah, Chan *c, uchar *buf, long len, vlong off)
{
Mntrpc *r, **rr;
vlong o, w, e;
long n, tot;
Mnt *m;
if(len <= 0)
return 0;
if(off != rah->off){
rah->off = off;
rah->seq = 0;
}
rah->off += len;
rah->seq += len;
if(rah->seq >= 2*c->iounit){
w = (off / c->iounit) * c->iounit;
e = w + rah->seq;
for(o = w; w < e; o += c->iounit){
if(rahfindrpc(rah, o) != nil)
continue;
rr = &rah->r[rah->i % nelem(rah->r)];
if((r = *rr) != nil){
if(!rahdone(r) || (r->request.offset >= w && r->request.offset < e))
break;
*rr = nil;
mntfree(r);
}
m = mntchk(c);
r = mntralloc(c, m->msize);
r->request.type = Tread;
r->request.fid = c->fid;
r->request.offset = o;
r->request.count = c->iounit;
if(!mntdefer(rahproc, r, rah)){
mntfree(r);
break;
}
*rr = r;
rah->i++;
}
}
tot = 0;
while(len > 0 && (r = rahfindrpc(rah, off)) != nil){
while(!rahdone(r))
sleep(rah, rahdone, r);
switch(r->reply.type){
default:
error(Emountrpc);
case Rflush:
error(Eintr);
case Rerror:
error(r->reply.ename);
case Rread:
break;
}
mntcache(r);
n = r->request.count;
o = r->request.offset;
if(r->reply.count < n)
n = r->reply.count;
n -= (off - o);
if(n <= 0)
break;
if(len < n)
n = len;
n = readblist(r->b, buf, n, off - o);
buf += n;
off += n;
tot += n;
len -= n;
}
if(tot > 0){
rah->off -= len;
rah->seq -= len;
}
return tot;
}
static void
mountrpc(Mnt *m, Mntrpc *r) mountrpc(Mnt *m, Mntrpc *r)
{ {
char *sn, *cn; char *sn, *cn;
@ -778,7 +1002,7 @@ mountrpc(Mnt *m, Mntrpc *r)
} }
} }
void static void
mountio(Mnt *m, Mntrpc *r) mountio(Mnt *m, Mntrpc *r)
{ {
int n; int n;
@ -870,7 +1094,7 @@ doread(Mnt *m, int len)
return 0; return 0;
} }
int static int
mntrpcread(Mnt *m, Mntrpc *r) mntrpcread(Mnt *m, Mntrpc *r)
{ {
int i, t, len, hlen; int i, t, len, hlen;
@ -942,7 +1166,7 @@ mntrpcread(Mnt *m, Mntrpc *r)
return 0; return 0;
} }
void static void
mntgate(Mnt *m) mntgate(Mnt *m)
{ {
Mntrpc *q; Mntrpc *q;
@ -957,7 +1181,7 @@ mntgate(Mnt *m)
unlock(m); unlock(m);
} }
void static void
mountmux(Mnt *m, Mntrpc *r) mountmux(Mnt *m, Mntrpc *r)
{ {
Mntrpc **l, *q; Mntrpc **l, *q;
@ -1003,7 +1227,7 @@ mountmux(Mnt *m, Mntrpc *r)
* Create a new flush request and chain the previous * Create a new flush request and chain the previous
* requests from it * requests from it
*/ */
Mntrpc* static Mntrpc*
mntflushalloc(Mntrpc *r, ulong iounit) mntflushalloc(Mntrpc *r, ulong iounit)
{ {
Mntrpc *fr; Mntrpc *fr;
@ -1027,7 +1251,7 @@ mntflushalloc(Mntrpc *r, ulong iounit)
* and if it hasn't been answered set the reply to to * and if it hasn't been answered set the reply to to
* Rflush. Return the original rpc. * Rflush. Return the original rpc.
*/ */
Mntrpc* static Mntrpc*
mntflushfree(Mnt *m, Mntrpc *r) mntflushfree(Mnt *m, Mntrpc *r)
{ {
Mntrpc *fr; Mntrpc *fr;
@ -1046,7 +1270,7 @@ mntflushfree(Mnt *m, Mntrpc *r)
return r; return r;
} }
int static int
alloctag(void) alloctag(void)
{ {
int i, j; int i, j;
@ -1066,13 +1290,13 @@ alloctag(void)
return NOTAG; return NOTAG;
} }
void static void
freetag(int t) freetag(int t)
{ {
mntalloc.tagmask[t>>TAGSHIFT] &= ~(1<<(t&TAGMASK)); mntalloc.tagmask[t>>TAGSHIFT] &= ~(1<<(t&TAGMASK));
} }
Mntrpc* static Mntrpc*
mntralloc(Chan *c, ulong msize) mntralloc(Chan *c, ulong msize)
{ {
Mntrpc *new; Mntrpc *new;
@ -1122,7 +1346,7 @@ mntralloc(Chan *c, ulong msize)
return new; return new;
} }
void static void
mntfree(Mntrpc *r) mntfree(Mntrpc *r)
{ {
if(r->b != nil) if(r->b != nil)
@ -1142,7 +1366,7 @@ mntfree(Mntrpc *r)
unlock(&mntalloc); unlock(&mntalloc);
} }
void static void
mntqrm(Mnt *m, Mntrpc *r) mntqrm(Mnt *m, Mntrpc *r)
{ {
Mntrpc **l, *f; Mntrpc **l, *f;
@ -1161,7 +1385,7 @@ mntqrm(Mnt *m, Mntrpc *r)
unlock(m); unlock(m);
} }
Mnt* static Mnt*
mntchk(Chan *c) mntchk(Chan *c)
{ {
Mnt *m; Mnt *m;
@ -1190,7 +1414,7 @@ mntchk(Chan *c)
* reflect local values. These entries are known to be * reflect local values. These entries are known to be
* the first two in the Dir encoding after the count. * the first two in the Dir encoding after the count.
*/ */
void static void
mntdirfix(uchar *dirbuf, Chan *c) mntdirfix(uchar *dirbuf, Chan *c)
{ {
uint r; uint r;
@ -1202,7 +1426,7 @@ mntdirfix(uchar *dirbuf, Chan *c)
PBIT32(dirbuf, c->dev); PBIT32(dirbuf, c->dev);
} }
int static int
rpcattn(void *v) rpcattn(void *v)
{ {
Mntrpc *r; Mntrpc *r;

View file

@ -16,7 +16,9 @@ typedef struct Log Log;
typedef struct Logflag Logflag; typedef struct Logflag Logflag;
typedef struct Mntcache Mntcache; typedef struct Mntcache Mntcache;
typedef struct Mount Mount; typedef struct Mount Mount;
typedef struct Mntrah Mntrah;
typedef struct Mntrpc Mntrpc; typedef struct Mntrpc Mntrpc;
typedef struct Mntproc Mntproc;
typedef struct Mnt Mnt; typedef struct Mnt Mnt;
typedef struct Mhead Mhead; typedef struct Mhead Mhead;
typedef struct Note Note; typedef struct Note Note;
@ -270,6 +272,29 @@ struct Mhead
Mhead* hash; /* Hash chain */ Mhead* hash; /* Hash chain */
}; };
struct Mntrah
{
Rendez;
ulong vers;
vlong off;
vlong seq;
uint i;
Mntrpc *r[8];
};
struct Mntproc
{
Rendez;
Mnt *m;
Mntrpc *r;
void *a;
void (*f)(Mntrpc*, void*);
};
struct Mnt struct Mnt
{ {
Lock; Lock;
@ -277,6 +302,7 @@ struct Mnt
Chan *c; /* Channel to file service */ Chan *c; /* Channel to file service */
Proc *rip; /* Reader in progress */ Proc *rip; /* Reader in progress */
Mntrpc *queue; /* Queue of pending requests on this channel */ Mntrpc *queue; /* Queue of pending requests on this channel */
Mntproc defered[8]; /* Worker processes for defered RPCs (read ahead) */
ulong id; /* Multiplexer id for channel check */ ulong id; /* Multiplexer id for channel check */
Mnt *list; /* Free list */ Mnt *list; /* Free list */
int flags; /* cache */ int flags; /* cache */

View file

@ -42,6 +42,7 @@ void confinit(void);
int consactive(void); int consactive(void);
void (*consdebug)(void); void (*consdebug)(void);
void copen(Chan*); void copen(Chan*);
void cclunk(Chan*);
Block* concatblock(Block*); Block* concatblock(Block*);
Block* copyblock(Block*, int); Block* copyblock(Block*, int);
void copypage(Page*, Page*); void copypage(Page*, Page*);
@ -283,6 +284,7 @@ int rand(void);
void randominit(void); void randominit(void);
ulong randomread(void*, ulong); ulong randomread(void*, ulong);
void rdb(void); void rdb(void);
long readblist(Block *, uchar *, long, long);
int readnum(ulong, char*, ulong, ulong, int); int readnum(ulong, char*, ulong, ulong, int);
int readstr(ulong, char*, ulong, char*); int readstr(ulong, char*, ulong, char*);
void ready(Proc*); void ready(Proc*);

View file

@ -904,6 +904,36 @@ qremove(Queue *q)
return b; return b;
} }
/*
* copy the contents of a string of blocks into
* memory from an offset. blocklist kept unchanged.
* return number of copied bytes.
*/
long
readblist(Block *b, uchar *p, long n, long o)
{
long m, r;
r = 0;
while(n > 0 && b != nil){
m = BLEN(b);
if(o >= m)
o -= m;
else {
m -= o;
if(n < m)
m = n;
memmove(p, b->rp + o, m);
p += m;
r += m;
n -= m;
o = 0;
}
b = b->next;
}
return r;
}
/* /*
* copy the contents of a string of blocks into * copy the contents of a string of blocks into
* memory. emptied blocks are freed. return * memory. emptied blocks are freed. return