o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bugs

Browse source
This commit is contained in:
rsc 2004-06-17 03:31:07 +00:00
parent 7ae745421a
commit bb501e1274
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/cmd/vac/vtdump.c
View file

@ -32,6 +32,9 @@ uvlong vtgetuint48(uchar *p);
void usage(void); void usage(void);
void readroot(VtRoot*, uchar *score, char *file); void readroot(VtRoot*, uchar *score, char *file);
int dumpdir(Source*, int indent); int dumpdir(Source*, int indent);
int timevtread(VtConn*, uchar*, int, void*, int);
int mainstacksize = 512*1024;
void void
threadmain(int argc, char *argv[]) threadmain(int argc, char *argv[])
@ -39,9 +42,9 @@ threadmain(int argc, char *argv[])
char *host = nil, *pref; char *host = nil, *pref;
uchar score[VtScoreSize]; uchar score[VtScoreSize];
Source source; Source source;
uchar buf[VtMaxLumpSize];
char *p; char *p;
int n; int n;
uchar buf[VtMaxLumpSize];
ARGBEGIN{ ARGBEGIN{
case 'h': case 'h':
@ -88,7 +91,7 @@ threadmain(int argc, char *argv[])
} }
fprint(2, "read...\n"); fprint(2, "read...\n");
n = vtread(z, root.score, VtDirType, buf, bsize); n = timevtread(z, root.score, VtDirType, buf, bsize);
if(n < 0) if(n < 0)
sysfatal("could not read root dir"); sysfatal("could not read root dir");
@ -161,12 +164,11 @@ parse(Source *s, uchar *p)
s->active = 1; s->active = 1;
s->gen = dir.gen; s->gen = dir.gen;
s->psize = dir.psize; s->psize = dir.psize;
s->dsize = dir.size; s->dsize = dir.dsize;
s->size = dir.size; s->size = dir.size;
memmove(s->score, dir.score, VtScoreSize); memmove(s->score, dir.score, VtScoreSize);
if((dir.type&~VtTypeDepthMask) == VtDirType) if((dir.type&~VtTypeDepthMask) == VtDirType)
s->dir = 1; s->dir = 1;
fprint(2, "sdir %d type %d %.*H\n", s->dir, dir.type, VtEntrySize, p);
s->depth = dir.type&VtTypeDepthMask; s->depth = dir.type&VtTypeDepthMask;
return 0; return 0;
} }
@ -191,7 +193,7 @@ sourceread(Source *s, ulong block, uchar *p, int n)
assert(block == 0); assert(block == 0);
for(i=s->depth-1; i>=0; i--) { for(i=s->depth-1; i>=0; i--) {
nn = vtread(z, score, (s->dir ? VtDirType : VtDataType)+1+i, buf, s->psize); nn = timevtread(z, score, (s->dir ? VtDirType : VtDataType)+1+i, buf, s->psize);
if(nn < 0){ if(nn < 0){
fprint(2, "vtread %V %d: %r\n", score, (s->dir ? VtDirType : VtDataType)+1+i); fprint(2, "vtread %V %d: %r\n", score, (s->dir ? VtDirType : VtDataType)+1+i);
free(buf); free(buf);
@ -210,7 +212,7 @@ fprint(2, "vtread %V %d: %r\n", score, (s->dir ? VtDirType : VtDataType)+1+i);
else else
type = VtDataType; type = VtDataType;
nn = vtread(z, score, type, p, n); nn = timevtread(z, score, type, p, n);
if(nn < 0){ if(nn < 0){
fprint(2, "vtread %V %d: %r\n", score, type); fprint(2, "vtread %V %d: %r\n", score, type);
abort(); abort();
@ -346,9 +348,25 @@ readroot(VtRoot *root, uchar *score, char *file)
if(vtparsescore(buf, &pref, score) < 0){ if(vtparsescore(buf, &pref, score) < 0){
sysfatal("not a root file"); sysfatal("not a root file");
} }
nn = vtread(z, score, VtRootType, buf, VtRootSize); nn = timevtread(z, score, VtRootType, buf, VtRootSize);
if(nn < 0) if(nn < 0)
sysfatal("cannot read root %V", score); sysfatal("cannot read root %V", score);
if(vtrootunpack(root, buf) < 0) if(vtrootunpack(root, buf) < 0)
sysfatal("cannot parse root: %r"); sysfatal("cannot parse root: %r");
} }
int
timevtread(VtConn *z, uchar *score, int type, void *buf, int nbuf)
{
/*
ulong t0, t1;
int n;
t0 = nsec();
n = vtread(z, score, type, buf, nbuf);
t1 = nsec();
fprint(2, "read %V: %.6f seconds\n", score, (t1-t0)/1.e9);
return n;
*/
return vtread(z, score, type, buf, nbuf);
}