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

allow fixarenas of single arena file

Browse source
This commit is contained in:
rsc 2007-05-03 03:14:02 +00:00
parent 1d53bf4a03
commit c482feff4b
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/cmd/venti/srv/fixarenas.c
View file

@ -650,7 +650,16 @@ showdiffs(uchar *want, uchar *have, int len, Info *info)
} }
} }
static int tabsizes[] = { 64*1024, 512*1024, }; /*
* Does part begin with an arena?
*/
int
isonearena(void)
{
return u32(pagein(0, Block)) == ArenaHeadMagic;
}
static int tabsizes[] = { 16*1024, 64*1024, 512*1024, };
/* /*
* Poke around on the disk to guess what the ArenaPart numbers are. * Poke around on the disk to guess what the ArenaPart numbers are.
*/ */
@ -808,7 +817,6 @@ guessgeometry(void)
u32(p)!=ArenaHeadMagic ? " (but no arena head there)" : ""); u32(p)!=ArenaHeadMagic ? " (but no arena head there)" : "");
ap.tabsize = ap.arenabase - ap.tabbase; ap.tabsize = ap.arenabase - ap.tabbase;
} }
/* /*
@ -1078,6 +1086,8 @@ okayname(char *name, int n)
if(nameok(name) < 0) if(nameok(name) < 0)
return 0; return 0;
sprint(buf, "%d", n); sprint(buf, "%d", n);
if(n == 0)
buf[0] = 0;
if(strlen(name) < strlen(buf) if(strlen(name) < strlen(buf)
|| strcmp(name+strlen(name)-strlen(buf), buf) != 0) || strcmp(name+strlen(name)-strlen(buf), buf) != 0)
return 0; return 0;
@ -1201,9 +1211,12 @@ print("old arena: sealed=%d\n", oarena.diskstats.sealed);
} }
if(arena->version == 0) if(arena->version == 0)
arena->version = ArenaVersion5; arena->version = ArenaVersion5;
if(basename) if(basename){
snprint(arena->name, ANameSize, "%s%d", basename, anum); if(anum == -1)
else if(lastbase[0]) snprint(arena->name, ANameSize, "%s", basename);
else
snprint(arena->name, ANameSize, "%s%d", basename, anum);
}else if(lastbase[0])
snprint(arena->name, ANameSize, "%s%d", lastbase, anum); snprint(arena->name, ANameSize, "%s%d", lastbase, anum);
else if(head->name[0]) else if(head->name[0])
strcpy(arena->name, head->name); strcpy(arena->name, head->name);
@ -1382,7 +1395,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena,
} }
if(haveclump(cl.info.score)) if(haveclump(cl.info.score))
print("warning: duplicate clump %d %V\n", cl.info.type, cl.info.score); print("warning: duplicate clump %d %V at %#llux+%#d\n", cl.info.type, cl.info.score, offset, n);
/* /*
* If clumps use different magic numbers, we don't care. * If clumps use different magic numbers, we don't care.
@ -1538,6 +1551,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena,
eci = bci+clumps+1; eci = bci+clumps+1;
bcit = cibuf; bcit = cibuf;
ecit = cibuf+ncibuf; ecit = cibuf+ncibuf;
smart = 1; smart = 1;
Again: Again:
nbad = 0; nbad = 0;
@ -1886,6 +1900,10 @@ threadmain(int argc, char **argv)
sysfatal("can't open %s: %r", file); sysfatal("can't open %s: %r", file);
partend = part->size; partend = part->size;
if(isonearena()){
checkarena(0, -1);
threadexitsall(nil);
}
checkarenas(argc > 1 ? argv[1] : nil); checkarenas(argc > 1 ? argv[1] : nil);
checkmap(); checkmap();
threadexitsall(nil); threadexitsall(nil);