diff options
| author | David du Colombier <0intro@gmail.com> | 2011-11-08 11:48:18 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2011-11-08 11:48:18 -0500 |
| commit | 1e0c0383421cb902dabbb1d3b3b7b6957db37005 (patch) | |
| tree | 988970a120eeb23107df99ffcc7d9a2654db2267 /src/cmd/venti | |
| parent | 91b0ee088e6c249478a21c43bf1fd4484d8d76d5 (diff) | |
| download | plan9port-1e0c0383421cb902dabbb1d3b3b7b6957db37005.tar.gz plan9port-1e0c0383421cb902dabbb1d3b3b7b6957db37005.tar.bz2 plan9port-1e0c0383421cb902dabbb1d3b3b7b6957db37005.zip | |
venti: import changes from plan 9
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5325044
Diffstat (limited to 'src/cmd/venti')
| -rw-r--r-- | src/cmd/venti/mkfile | 1 | ||||
| -rw-r--r-- | src/cmd/venti/srv/icache.c | 3 | ||||
| -rw-r--r-- | src/cmd/venti/srv/mkfile | 3 | ||||
| -rw-r--r-- | src/cmd/venti/srv/venti.c | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/cmd/venti/mkfile b/src/cmd/venti/mkfile index b5cfff7e..d49a5d34 100644 --- a/src/cmd/venti/mkfile +++ b/src/cmd/venti/mkfile @@ -5,6 +5,7 @@ DIRS=srv TARG=\ copy\ read\ + ro\ sync\ write\ dump\ diff --git a/src/cmd/venti/srv/icache.c b/src/cmd/venti/srv/icache.c index db2e7993..af76819f 100644 --- a/src/cmd/venti/srv/icache.c +++ b/src/cmd/venti/srv/icache.c @@ -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); diff --git a/src/cmd/venti/srv/mkfile b/src/cmd/venti/srv/mkfile index 0c7ad8eb..b11a461a 100644 --- a/src/cmd/venti/srv/mkfile +++ b/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\ diff --git a/src/cmd/venti/srv/venti.c b/src/cmd/venti/srv/venti.c index 4d386ec9..2a3cc669 100644 --- a/src/cmd/venti/srv/venti.c +++ b/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); |