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

venti: new icache

Browse source
This commit is contained in:
Russ Cox 2007-09-25 09:47:31 -04:00
parent 25a4e89fa9
commit 7a400ee957
17 changed files with 854 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/cmd/venti/srv/venti.c
View file

@ -18,7 +18,7 @@ static void ventiserver(void*);
void
usage(void)
{
fprint(2, "usage: venti [-Ldrs] [-a ventiaddr] [-c config] "
fprint(2, "usage: venti [-Ldrsw] [-a ventiaddr] [-c config] "
"[-h httpaddr] [-B blockcachesize] [-C cachesize] [-I icachesize] [-W webroot]\n");
threadexitsall("usage");
}
@ -73,6 +73,9 @@ threadmain(int argc, char *argv[])
case 's':
nofork = 1;
break;
case 'w': /* compatibility with old venti */
queuewrites = 1;
break;
case 'W':
webroot = EARGF(usage());
break;
@ -103,9 +106,6 @@ threadmain(int argc, char *argv[])
if(configfile == nil)
configfile = "venti.conf";
if(initarenasum() < 0)
fprint(2, "warning: can't initialize arena summing process: %r");
fprint(2, "conf...");
if(initventi(configfile, &config) < 0)
sysfatal("can't init server: %r");
@ -143,13 +143,7 @@ threadmain(int argc, char *argv[])
mem, mem / (8 * 1024));
initlumpcache(mem, mem / (8 * 1024));
icmem = u64log2(icmem / (sizeof(IEntry)+sizeof(IEntry*)) / ICacheDepth);
if(icmem < 4)
icmem = 4;
if(0) fprint(2, "initialize %d bytes of index cache for %d index entries\n",
(sizeof(IEntry)+sizeof(IEntry*)) * (1 << icmem) * ICacheDepth,
(1 << icmem) * ICacheDepth);
initicache(icmem, ICacheDepth);
initicache(icmem);
initicachewrite();
/*
@ -179,6 +173,9 @@ threadmain(int argc, char *argv[])
}
}
if(initarenasum() < 0)
fprint(2, "warning: can't initialize arena summing process: %r");
fprint(2, "announce %s...", vaddr);
ventisrv = vtlisten(vaddr);
if(ventisrv == nil)
@ -272,5 +269,3 @@ ventiserver(void *v)
flushicache();
threadexitsall(0);
}