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

vac: eliminated vac cache size 128. vacfsopen used to take ncache rather than cachemem

Browse source 
R=rsc
CC=codebot
http://codereview.appspot.com/817041
This commit is contained in:
David Swasey 2010-04-13 13:18:12 -07:00 • committed by Russ Cox
parent 7b08cf334b
commit 7771477e15
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cmd/vac/vac.c
View file

@ -15,6 +15,7 @@ usage(void)
enum enum
{ {
BlockSize = 8*1024, BlockSize = 8*1024,
CacheSize = 4<<20,
}; };
struct struct
@ -168,10 +169,10 @@ threadmain(int argc, char **argv)
if((outfd = create(archivefile, OWRITE, 0666)) < 0) if((outfd = create(archivefile, OWRITE, 0666)) < 0)
sysfatal("create %s: %r", archivefile); sysfatal("create %s: %r", archivefile);
atexit(removevacfile); // because it is new atexit(removevacfile); // because it is new
if((fs = vacfscreate(z, blocksize, 4<<20)) == nil) if((fs = vacfscreate(z, blocksize, CacheSize)) == nil)
sysfatal("vacfscreate: %r"); sysfatal("vacfscreate: %r");
}else{ }else{
if((fs = vacfsopen(z, archivefile, VtORDWR, 4<<20)) == nil) if((fs = vacfsopen(z, archivefile, VtORDWR, CacheSize)) == nil)
sysfatal("vacfsopen %s: %r", archivefile); sysfatal("vacfsopen %s: %r", archivefile);
if((fdiff = recentarchive(fs, oldpath)) != nil){ if((fdiff = recentarchive(fs, oldpath)) != nil){
if(verbose) if(verbose)
@ -211,13 +212,13 @@ threadmain(int argc, char **argv)
else if((outfd = create(vacfile, OWRITE, 0666)) < 0) else if((outfd = create(vacfile, OWRITE, 0666)) < 0)
sysfatal("create %s: %r", vacfile); sysfatal("create %s: %r", vacfile);
atexit(removevacfile); atexit(removevacfile);
if((fs = vacfscreate(z, blocksize, 4<<20)) == nil) if((fs = vacfscreate(z, blocksize, CacheSize)) == nil)
sysfatal("vacfscreate: %r"); sysfatal("vacfscreate: %r");
f = vacfsgetroot(fs); f = vacfsgetroot(fs);
fdiff = nil; fdiff = nil;
if(diffvac){ if(diffvac){
if((fsdiff = vacfsopen(z, diffvac, VtOREAD, 128)) == nil) if((fsdiff = vacfsopen(z, diffvac, VtOREAD, CacheSize)) == nil)
warn("vacfsopen %s: %r", diffvac); warn("vacfsopen %s: %r", diffvac);
else else
fdiff = vacfsgetroot(fsdiff); fdiff = vacfsgetroot(fsdiff);
@ -708,7 +709,7 @@ vacmerge(VacFile *fp, char *name)
if(strlen(name) < 4 || strcmp(name+strlen(name)-4, ".vac") != 0) if(strlen(name) < 4 || strcmp(name+strlen(name)-4, ".vac") != 0)
return -1; return -1;
if((mfs = vacfsopen(z, name, VtOREAD, 4<<20)) == nil) if((mfs = vacfsopen(z, name, VtOREAD, CacheSize)) == nil)
return -1; return -1;
if(verbose) if(verbose)
fprint(2, "merging %s\n", name); fprint(2, "merging %s\n", name);