cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-24 11:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

venti: import changes from plan 9

Browse source 
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5325044
This commit is contained in:
David du Colombier 2011-11-08 11:48:18 -05:00 committed by Russ Cox
parent 91b0ee088e
commit 1e0c038342
5 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cmd/vac/stdinc.h
View file

@ -1,6 +1,7 @@
#include <u.h>
#include <libc.h>
#include <bio.h>
#include <ctype.h>
#include <thread.h>
#include <venti.h>
#include <libsec.h>

1
src/cmd/venti/mkfile
View file

@ -5,6 +5,7 @@ DIRS=srv
TARG=\
copy\
read\
ro\
sync\
write\
dump\

3
src/cmd/venti/srv/icache.c
View file

@ -425,7 +425,8 @@ insertscore(u8int score[VtScoreSize], IAddr *ia, int state, AState *as)
assert(state == IEDirty);
toload = nil;
if(as == nil)
fprint(2, "%T insertscore IEDirty without as; called from %lux\n", getcallerpc(&score));
fprint(2, "%T insertscore IEDirty without as; called from %#p\n",
getcallerpc(&score));
else{
if(icache.as.aa > as->aa)
fprint(2, "%T insertscore: aa moving backward: %#llux -> %#llux\n", icache.as.aa, as->aa);

3
src/cmd/venti/srv/mkfile
View file

@ -46,6 +46,8 @@ LIB=$SLIB $LIBDIR/libventi.a
HFILES= dat.h\
fns.h\
stdinc.h\
$PLAN9/include/venti.h\
$PLAN9/include/httpd.h\
TARG=\
venti\
@ -61,6 +63,7 @@ TARG=\
fmtisect\
mirrorarenas\
printarena\
printarenapart\
rdarena\
syncindex\
verifyarena\

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

@ -22,6 +22,7 @@ usage(void)
"[-C lumpcachesize] [-h httpaddress] [-I indexcachesize] [-W webroot]\n");
threadexitsall("usage");
}
void
threadmain(int argc, char *argv[])
{
@ -137,7 +138,6 @@ threadmain(int argc, char *argv[])
if(httpdinit(haddr, webroot) < 0)
fprint(2, "warning: can't start http server: %r");
}
fprint(2, "init...");
if(mem == 0xffffffffUL)
@ -163,7 +163,6 @@ threadmain(int argc, char *argv[])
(mainindex->narenas + mainindex->nsects*4 + 16);
if(bcmem < minbcmem)
bcmem = minbcmem;
if(0) fprint(2, "initialize %d bytes of disk block cache\n", bcmem);
initdcache(bcmem);