tventi: import changes from plan 9 - plan9port - [fork] Plan 9 from user space
 (HTM) git clone git://src.adamsgaard.dk/plan9port
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 1e0c0383421cb902dabbb1d3b3b7b6957db37005
 (DIR) parent 91b0ee088e6c249478a21c43bf1fd4484d8d76d5
 (HTM) Author: David du Colombier <0intro@gmail.com>
       Date:   Tue,  8 Nov 2011 11:48:18 -0500
       
       venti: import changes from plan 9
       
       R=rsc
       CC=plan9port.codebot
       http://codereview.appspot.com/5325044
       
       Diffstat:
         M src/cmd/vac/stdinc.h                |       1 +
         M src/cmd/venti/mkfile                |       1 +
         M src/cmd/venti/srv/icache.c          |       3 ++-
         M src/cmd/venti/srv/mkfile            |       3 +++
         M src/cmd/venti/srv/venti.c           |       3 +--
       
       5 files changed, 8 insertions(+), 3 deletions(-)
       ---
 (DIR) diff --git a/src/cmd/vac/stdinc.h b/src/cmd/vac/stdinc.h
       t@@ -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>
 (DIR) diff --git a/src/cmd/venti/mkfile b/src/cmd/venti/mkfile
       t@@ -5,6 +5,7 @@ DIRS=srv
        TARG=\
                copy\
                read\
       +        ro\
                sync\
                write\
                dump\
 (DIR) diff --git a/src/cmd/venti/srv/icache.c b/src/cmd/venti/srv/icache.c
       t@@ -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);
 (DIR) diff --git a/src/cmd/venti/srv/mkfile b/src/cmd/venti/srv/mkfile
       t@@ -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\
       t@@ -61,6 +63,7 @@ TARG=\
                fmtisect\
                mirrorarenas\
                printarena\
       +        printarenapart\
                rdarena\
                syncindex\
                verifyarena\
 (DIR) diff --git a/src/cmd/venti/srv/venti.c b/src/cmd/venti/srv/venti.c
       t@@ -22,6 +22,7 @@ usage(void)
        "[-C lumpcachesize] [-h httpaddress] [-I indexcachesize] [-W webroot]\n");
                threadexitsall("usage");
        }
       +
        void
        threadmain(int argc, char *argv[])
        {
       t@@ -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)
       t@@ -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);