venti updates

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,13 +143,30 @@ _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;
-	r1 = vtfileopen(r, 1, fs->mode);
-	if(r1 == nil)
-		goto Err;
 	r2 = vtfileopen(r, 2, fs->mode);
-	if(r2 == nil)
+	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;
 
 	mr = filealloc(fs);

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)

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\

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);

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");

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");

src/cmd/venti/root.c

@@ -0,0 +1,72 @@
+#include <u.h>
+#include <libc.h>
+#include <venti.h>
+#include <libsec.h>
+#include <thread.h>
+
+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<argc; i++){
+		if(vtparsescore(argv[i], nil, score) < 0){
+			fprint(2, "cannot parse score '%s': %r\n", argv[i]);
+			continue;
+		}
+		n = vtread(z, score, VtRootType, buf, VtMaxLumpSize);
+		if(n < 0){
+			fprint(2, "could not read block %V: %r\n", score);
+			continue;
+		}
+		if(n != VtRootSize){
+			fprint(2, "block %V is wrong size %d != 300\n", score, n);
+			continue;
+		}
+		if(vtrootunpack(&root, buf) < 0){
+			fprint(2, "unpacking block %V: %r\n", score);
+			continue;
+		}
+		print("%V: %q %q %V %d %V\n", score, root.name, root.type, root.score, root.blocksize, root.prev);
+	}
+	vthangup(z);
+	threadexitsall(0);
+}

src/cmd/venti/srv/buildindex.c

@@ -119,6 +119,7 @@ threadmain(int argc, char *argv[])
 
 	zero = 1;
 	bcmem = 0;
+	ventifmtinstall();
 	ARGBEGIN{
 	case 'B':
 		bcmem = unittoull(ARGF());

src/cmd/venti/srv/wrarena.c

@@ -190,14 +190,14 @@ threadmain(int argc, char *argv[])
 	if(arena == nil)
 		sysfatal("initarena: %r");
 
-	if(host && strcmp(host, "/dev/null") != 0){
+	z = nil;
+	if(host==nil || strcmp(host, "/dev/null") != 0){
 		z = vtdial(host);
 		if(z == nil)
 			sysfatal("could not connect to server: %r");
 		if(vtconnect(z) < 0)
 			sysfatal("vtconnect: %r");
-	}else
-		z = nil;
+	}
 	
 	c = chancreate(sizeof(ZClump), 0);
 	for(i=0; i<12; i++)