commit 1e0c0383421cb902dabbb1d3b3b7b6957db37005
from: David du Colombier <0intro@gmail.com>
via: Russ Cox <rsc@swtch.com>
date: Tue Nov 08 16:48:18 2011 UTC

venti: import changes from plan 9

R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5325044

commit - 91b0ee088e6c249478a21c43bf1fd4484d8d76d5
commit + 1e0c0383421cb902dabbb1d3b3b7b6957db37005
blob - aa3b5f7c61dd93a8a788439ce09111ca713a093a
blob + 070c56b3ff9b93b8f55e23578d76a0c58988403e
--- src/cmd/vac/stdinc.h
+++ src/cmd/vac/stdinc.h
@@ -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>
blob - b5cfff7e0f43842e5c72eb453aecbeb0441db1db
blob + d49a5d346f1422c9755b4d5ec759231e366c5ee1
--- src/cmd/venti/mkfile
+++ src/cmd/venti/mkfile
@@ -5,6 +5,7 @@ DIRS=srv
 TARG=\
 	copy\
 	read\
+	ro\
 	sync\
 	write\
 	dump\
blob - db2e799322ee3b0b40cf1a1a454e0fb5349c5085
blob + af76819f92e5d96fcbc027bc4b65bcd2badf3b11
--- src/cmd/venti/srv/icache.c
+++ src/cmd/venti/srv/icache.c
@@ -425,7 +425,8 @@ insertscore(u8int score[VtScoreSize], IAddr *ia, int s
 		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);
blob - 0c7ad8eb6d9e4fe5c378d30fac377b30b8aca00a
blob + b11a461afdd850d95032e0fd3528cc1730a3a159
--- src/cmd/venti/srv/mkfile
+++ src/cmd/venti/srv/mkfile
@@ -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\
blob - 4d386ec9fbbaa7f9ea75f5abdcbd0fe19ff8c871
blob + 2a3cc66944878a457790942e33b176aa9af24330
--- src/cmd/venti/srv/venti.c
+++ src/cmd/venti/srv/venti.c
@@ -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);