From 23fb2edb22703ad10aae02295e654b3de68617c5 Mon Sep 17 00:00:00 2001 From: rsc Date: Sun, 24 Jul 2005 20:15:44 +0000 Subject: venti updates --- src/cmd/vac/file.c | 29 +++++++++++++++-- src/cmd/vac/fs.c | 8 +++-- src/cmd/vac/mkfile | 2 +- src/cmd/vac/vac.c | 3 +- src/cmd/vac/vacfs.c | 11 ++++--- src/cmd/venti/read.c | 7 ++-- src/cmd/venti/root.c | 72 ++++++++++++++++++++++++++++++++++++++++++ src/cmd/venti/srv/buildindex.c | 1 + src/cmd/venti/srv/wrarena.c | 6 ++-- 9 files changed, 120 insertions(+), 19 deletions(-) create mode 100644 src/cmd/venti/root.c (limited to 'src/cmd') diff --git a/src/cmd/vac/file.c b/src/cmd/vac/file.c index bb0bb03d..10c632c9 100644 --- a/src/cmd/vac/file.c +++ b/src/cmd/vac/file.c @@ -4,6 +4,8 @@ #include "fns.h" #include "error.h" +#define debug 0 + /* * locking order is upwards. A thread can hold the lock for a VacFile * and then acquire the lock of its parent @@ -122,12 +124,16 @@ Err: VacFile* _vacfileroot(VacFs *fs, VtFile *r) { + int redirected; + char err[ERRMAX]; VtBlock *b; VtFile *r0, *r1, *r2; MetaBlock mb; MetaEntry me; VacFile *root, *mr; + redirected = 0; +Top: b = nil; root = nil; mr = nil; @@ -137,14 +143,31 @@ _vacfileroot(VacFs *fs, VtFile *r) if(vtfilelock(r, -1) < 0) return nil; r0 = vtfileopen(r, 0, fs->mode); + if(debug) + fprint(2, "r0 %p\n", r0); if(r0 == nil) goto Err; + r2 = vtfileopen(r, 2, fs->mode); + if(debug) + fprint(2, "r2 %p\n", r2); + if(r2 == nil){ + /* + * some vac files (e.g., from fossil) + * have an extra layer of indirection. + */ + rerrstr(err, sizeof err); + if(!redirected && strstr(err, "not active")){ + vtfileunlock(r); + r = r0; + goto Top; + } + goto Err; + } r1 = vtfileopen(r, 1, fs->mode); + if(debug) + fprint(2, "r1 %p\n", r1); if(r1 == nil) goto Err; - r2 = vtfileopen(r, 2, fs->mode); - if(r2 == nil) - goto Err; mr = filealloc(fs); mr->msource = r2; diff --git a/src/cmd/vac/fs.c b/src/cmd/vac/fs.c index f635d5d1..d9ab258c 100644 --- a/src/cmd/vac/fs.c +++ b/src/cmd/vac/fs.c @@ -3,6 +3,8 @@ #include "dat.h" #include "fns.h" +#define debug 0 + static char EBadVacFormat[] = "bad format for vac file"; static VacFs * @@ -103,13 +105,15 @@ vacfsopenscore(VtConn *z, u8int *score, int mode, int ncache) root = nil; if((r = vtfileopenroot(fs->cache, &e)) == nil) goto Err; - + if(debug) + fprint(2, "r %p\n", r); root = _vacfileroot(fs, r); + if(debug) + fprint(2, "root %p\n", root); vtfileclose(r); if(root == nil) goto Err; fs->root = root; - return fs; Err: if(root) diff --git a/src/cmd/vac/mkfile b/src/cmd/vac/mkfile index dfc0e1a5..1f8d9995 100644 --- a/src/cmd/vac/mkfile +++ b/src/cmd/vac/mkfile @@ -6,7 +6,7 @@ LIBFILES=\ fs\ pack\ -LIB=${LIBFILES:%=%.$O} +LIB=${LIBFILES:%=%.$O} $PLAN9/lib/libventi.a HFILES=\ $PLAN9/include/venti.h\ diff --git a/src/cmd/vac/vac.c b/src/cmd/vac/vac.c index 0b4f818a..bcb9b57e 100644 --- a/src/cmd/vac/vac.c +++ b/src/cmd/vac/vac.c @@ -318,9 +318,8 @@ vac(VtConn *z, char *argv[]) /* build meta information for the root */ ms = metasinkalloc(z, bsize, bsize); /* fake into a directory */ - dir->mode |= (dir->mode&0444)>>2; + dir->mode = DMDIR|0555; dir->qid.type |= QTDIR; - dir->mode |= DMDIR; plan9tovacdir(&vd, dir, 0, fileid++); if(strcmp(vd.elem, "/") == 0){ vtfree(vd.elem); diff --git a/src/cmd/vac/vacfs.c b/src/cmd/vac/vacfs.c index 6720919c..4064cfa9 100644 --- a/src/cmd/vac/vacfs.c +++ b/src/cmd/vac/vacfs.c @@ -141,6 +141,10 @@ threadmain(int argc, char *argv[]) long ncache = 1000; int readOnly = 1; + fmtinstall('H', encodefmt); + fmtinstall('V', vtscorefmt); + fmtinstall('F', vtfcallfmt); + defsrv = nil; ARGBEGIN{ case 'd': @@ -164,6 +168,9 @@ threadmain(int argc, char *argv[]) case 'p': noperm = 1; break; + case 'V': + chattyventi = 1; + break; default: usage(); }ARGEND @@ -198,7 +205,6 @@ threadmain(int argc, char *argv[]) if(post9pservice(p[1], defsrv) != 0) sysfatal("post9pservice"); - threadexits(0); } @@ -840,9 +846,6 @@ init(char *file, char *host, long ncache, int readOnly) notify(notifyf); user = getuser(); - fmtinstall('V', vtscorefmt); -// fmtinstall('R', vtErrFmt); - conn = vtdial(host); if(conn == nil) sysfatal("could not connect to server: %r"); diff --git a/src/cmd/venti/read.c b/src/cmd/venti/read.c index 3f3441e7..a48e62e6 100644 --- a/src/cmd/venti/read.c +++ b/src/cmd/venti/read.c @@ -30,7 +30,7 @@ threadmain(int argc, char *argv[]) host = EARGF(usage()); break; case 't': - type = atoi(argv[1]); + type = atoi(EARGF(usage())); break; default: usage(); @@ -62,10 +62,9 @@ threadmain(int argc, char *argv[]) break; } } - }else{ - type = atoi(argv[1]); + }else n = vtread(z, score, type, buf, VtMaxLumpSize); - } + vthangup(z); if(n < 0) sysfatal("could not read block: %r"); diff --git a/src/cmd/venti/root.c b/src/cmd/venti/root.c new file mode 100644 index 00000000..5d67ad31 --- /dev/null +++ b/src/cmd/venti/root.c @@ -0,0 +1,72 @@ +#include +#include +#include +#include +#include + +void +usage(void) +{ + fprint(2, "usage: root [-h host] score\n"); + threadexitsall("usage"); +} + +void +threadmain(int argc, char *argv[]) +{ + int i, n; + uchar score[VtScoreSize]; + uchar *buf; + VtConn *z; + char *host; + VtRoot root; + + fmtinstall('F', vtfcallfmt); + fmtinstall('V', vtscorefmt); + quotefmtinstall(); + + host = nil; + ARGBEGIN{ + case 'h': + host = EARGF(usage()); + break; + default: + usage(); + break; + }ARGEND + + if(argc == 0) + usage(); + + buf = vtmallocz(VtMaxLumpSize); + + z = vtdial(host); + if(z == nil) + sysfatal("could not connect to server: %r"); + + if(vtconnect(z) < 0) + sysfatal("vtconnect: %r"); + + for(i=0; i