Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[cinap_lenrek]

it is as i suspected. that just undoes a fix i did a while ago.
just leave it out.

term% hg log -p /sys/src/cmd/venti/srv/conf.rc
changeset:   6344:95785cc684a7
user:        cinap_lenrek@felloff.net
date:        Sun Jan 28 17:22:00 2018 +0100
summary:     venti/conf: fix padding so we write multiple of sector size

diff -r 12804f5a9a22 -r 95785cc684a7 sys/src/cmd/venti/srv/conf.rc
--- a/sys/src/cmd/venti/srv/conf.rc	Sat Jan 27 23:47:46 2018 +0100
+++ b/sys/src/cmd/venti/srv/conf.rc	Sun Jan 28 17:22:00 2018 +0100
@@ -49,7 +49,7 @@
 	}
 	dd -quiet 1 -bs 1024 -count 8 -if $disk -iseek 248 \
 		>/tmp/_venticonf.old || exit backup
-	dd -quiet 1 -count 2 </dev/zero >> /tmp/venticonf.$pid || exit dd
+	dd -quiet 1 -bs 1024 -count 8 </dev/zero >> /tmp/venticonf.$pid || exit dd
 	dd -quiet 1 -bs 1024 -count 8 -if /tmp/venticonf.$pid \
 		-of $disk -trunc 0 -oseek 248 || exit dd2
 	exit 0

--
cinap

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[Sean Hinchee]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

I'm not really familiar with 3 way diff's, I wasn't aware there was a
way to make them on 9front and I've never really used them, my
apologies.

I've attached the updated diff with no dd(1) regression and sha1.c.

Cheers,
Sean

[-- Attachment #2: ventiupdate3.diff --]
[-- Type: text/x-patch, Size: 7988 bytes --]

diff -r a3522064f5dc sys/include/venti.h
--- a/sys/include/venti.h	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/include/venti.h	Tue Sep 18 19:30:23 2018 -0500
@@ -134,7 +134,8 @@
 	_VtEntryDir = 1<<1,		/* a directory */
 	_VtEntryDepthShift = 2,		/* shift for pointer depth */
 	_VtEntryDepthMask = 7<<2,	/* mask for pointer depth */
-	VtEntryLocal = 1<<5		/* for local storage only */
+	VtEntryLocal = 1<<5,		/* for local storage only */
+	VtEntryNoArchive = 1<<6		/* for local storage only */
 };
 enum
 {
@@ -334,7 +335,9 @@
 };
 
 VtConn*	vtconn(int infd, int outfd);
+int	vtreconn(VtConn*, int, int);
 VtConn*	vtdial(char*);
+int	vtredial(VtConn*, char*);
 void	vtfreeconn(VtConn*);
 int	vtsend(VtConn*, Packet*);
 Packet*	vtrecv(VtConn*);
@@ -378,6 +381,10 @@
 int	vtsync(VtConn*);
 int	vtping(VtConn*);
 
+/* sha1 */
+void	vtsha1(uchar score[VtScoreSize], uchar*, int);
+int	vtsha1check(uchar score[VtScoreSize], uchar*, int);
+
 /*
  * Data blocks and block cache.
  */
diff -r a3522064f5dc sys/man/2/venti-conn
--- a/sys/man/2/venti-conn	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/man/2/venti-conn	Tue Sep 18 19:30:23 2018 -0500
@@ -28,9 +28,15 @@
 VtConn*	vtconn(int infd, int outfd)
 .PP
 .B
+int	vtreconn(VtConn *z, int infd, int outfd)
+.PP
+.B
 VtConn*	vtdial(char *addr)
 .PP
 .B
+int	vtredial(VtConn *z, char *addr)
+.PP
+.B
 int	vtversion(VtConn *z)
 .PP
 .B
diff -r a3522064f5dc sys/src/cmd/venti/copy.c
--- a/sys/src/cmd/venti/copy.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/cmd/venti/copy.c	Tue Sep 18 19:30:23 2018 -0500
@@ -122,7 +122,7 @@
 		break;
 
 	case VtDirType:
-		for(i=0; i<n/VtEntrySize; i++){
+		for(i=0; i*VtEntrySize<n; i++){
 			if(vtentryunpack(&e, buf, i) < 0){
 				fprint(2, "warning: could not unpack entry #%d in %V %d\n", i, score, type);
 				continue;
diff -r a3522064f5dc sys/src/cmd/venti/srv/arenas.c
--- a/sys/src/cmd/venti/srv/arenas.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/cmd/venti/srv/arenas.c	Tue Sep 18 19:30:23 2018 -0500
@@ -15,7 +15,8 @@
 
 enum
 {
-	AHashSize	= 512
+	AHashSize	= 512,
+	Emergency	= 0,		/* flag: performing emergency surgery */
 };
 
 static AHash	*ahash[AHashSize];
@@ -142,8 +143,11 @@
 	ap->narenas = amn.n;
 	ap->map = amn.map;
 	if(okamap(ap->map, ap->narenas, ap->arenabase, ap->size, "arena table") < 0){
-		freearenapart(ap, 0);
-		return nil;
+		if(!Emergency){
+			freearenapart(ap, 0);
+			return nil;
+		}
+		/* else keep on, for emergency use */
 	}
 
 	ap->arenas = MKNZ(Arena*, ap->narenas);
@@ -152,8 +156,14 @@
 		ap->arenas[i] = initarena(part, ap->map[i].start, ap->map[i].stop - ap->map[i].start, ap->blocksize);
 		if(ap->arenas[i] == nil){
 			seterr(ECorrupt, "%s: %r", ap->map[i].name);
-			freearenapart(ap, 1);
-			return nil;
+			if(!Emergency){
+				freearenapart(ap, 1);
+				return nil;
+			}else{
+				/* keep on, for emergency use */
+				ap->narenas = i;
+				break;
+			}
 		}
 		if(namecmp(ap->map[i].name, ap->arenas[i]->name) != 0){
 			seterr(ECorrupt, "arena name mismatches with expected name: %s vs. %s",
diff -r a3522064f5dc sys/src/cmd/venti/srv/buildindex.c
--- a/sys/src/cmd/venti/srv/buildindex.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/cmd/venti/srv/buildindex.c	Tue Sep 18 19:30:23 2018 -0500
@@ -813,7 +813,7 @@
 	}
 	if (nbuf == 0) {
 		fprint(2, "%s: brand-new index, no work to do\n", argv0);
-		exits(0);
+		threadexitsall(0);
 	}
 
 	/* size buffer to use extra memory */
diff -r a3522064f5dc sys/src/cmd/venti/srv/config.c
--- a/sys/src/cmd/venti/srv/config.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/cmd/venti/srv/config.c	Tue Sep 18 19:30:23 2018 -0500
@@ -177,6 +177,10 @@
 			}
 			config->vaddr = estrdup(flds[1]);
 		}else{
+			/*
+			 * this is insanely paranoid.  a single typo should not
+			 * prevent venti from starting.
+			 */
 			seterr(EAdmin, "illegal line '%s' in configuration file %s", line, file);
 			break;
 		}
diff -r a3522064f5dc sys/src/cmd/venti/srv/dat.h
--- a/sys/src/cmd/venti/srv/dat.h	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/cmd/venti/srv/dat.h	Tue Sep 18 19:30:23 2018 -0500
@@ -48,7 +48,7 @@
 	MaxIo			= 64*1024,	/* max size of a single read or write operation */
 	ICacheBits		= 16,		/* default bits for indexing icache */
 	MaxAMap			= 31*1024,	/* max. allowed arenas in an address mapping; must be < 32*1024 */
-	Unspecified		= ~0ul,
+	Unspecified		= TWID32,
 
 	/*
 	 * return codes from syncarena
diff -r a3522064f5dc sys/src/cmd/venti/srv/fixarenas.c
--- a/sys/src/cmd/venti/srv/fixarenas.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/cmd/venti/srv/fixarenas.c	Tue Sep 18 19:30:23 2018 -0500
@@ -130,12 +130,12 @@
 	int i, j, k, n;
 
 	if(offset >= partend){
-		memset(buf, 0xFB, sizeof buf);
+		memset(buf, 0xFB, len);
 		return buf;
 	}
 	
 	if(offset+len > partend){
-		memset(buf, 0xFB, sizeof buf);
+		memset(buf, 0xFB, len);
 		len = partend - offset;
 	}
 
diff -r a3522064f5dc sys/src/cmd/venti/srv/unwhack.c
--- a/sys/src/cmd/venti/srv/unwhack.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/cmd/venti/srv/unwhack.c	Tue Sep 18 19:30:23 2018 -0500
@@ -156,8 +156,7 @@
 		off++;
 
 		if(off > d - dst){
-			snprint(uw->err, WhackErrLen, "offset out of range: off=%d d=%zd len=%d nbits=%d",
-				off, d - dst, len, uwnbits);
+			snprint(uw->err, WhackErrLen, "offset out of range: off=%d d=%zd len=%d nbits=%d", off, d - dst, len, uwnbits);
 			return -1;
 		}
 		if(d + len > dmax){
diff -r a3522064f5dc sys/src/libventi/conn.c
--- a/sys/src/libventi/conn.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/libventi/conn.c	Tue Sep 18 19:30:23 2018 -0500
@@ -27,6 +27,28 @@
 	return z;
 }
 
+int
+vtreconn(VtConn *z, int infd, int outfd)
+{
+	NetConnInfo *nci;
+
+	z->state = VtStateAlloc;
+	if(z->infd >= 0)
+		close(z->infd);
+	z->infd = infd;
+	if(z->outfd >= 0)
+		close(z->outfd);
+	z->outfd = outfd;
+	nci = getnetconninfo(nil, infd);
+	if(nci == nil)
+		snprint(z->addr, sizeof z->addr, "/dev/fd/%d", infd);
+	else{
+		strecpy(z->addr, z->addr+sizeof z->addr, nci->raddr);
+		freenetconninfo(nci);
+	}
+	return 0;
+}
+
 void
 vtfreeconn(VtConn *z)
 {
diff -r a3522064f5dc sys/src/libventi/dial.c
--- a/sys/src/libventi/dial.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/libventi/dial.c	Tue Sep 18 19:30:23 2018 -0500
@@ -23,3 +23,21 @@
 		strecpy(z->addr, z->addr+sizeof z->addr, na);
 	return z;
 }
+
+int
+vtredial(VtConn *z, char *addr)
+{
+	char *na;
+	int fd;
+
+	if(addr == nil)
+		addr = getenv("venti");
+	if(addr == nil)
+		addr = "$venti";
+
+	na = netmkaddr(addr, "tcp", "venti");
+	if((fd = dial(na, nil, nil, nil)) < 0)
+		return fd;
+
+	return vtreconn(z, fd, fd);
+}
diff -r a3522064f5dc sys/src/libventi/file.c
--- a/sys/src/libventi/file.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/libventi/file.c	Tue Sep 18 19:30:23 2018 -0500
@@ -503,6 +503,7 @@
 	VtBlock *b;
 	int type;
 	uchar *score;
+	VtEntry oe;
 
 	switch(p->type){
 	case VtDataType:
@@ -530,6 +531,8 @@
 
 	if(vtglobaltolocal(b->score) != NilBlock)
 		return b;
+	
+	oe = *e;
 
 	/*
 	 * Copy on write.
@@ -597,6 +600,7 @@
 shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
 {
 	VtBlock *b, *nb, *ob, *rb;
+	VtEntry oe;
 
 	assert(ISLOCKED(r));
 	assert(depth <= VtPointerDepth);
@@ -604,6 +608,12 @@
 	rb = vtcacheglobal(r->c, e->score, e->type);
 	if(rb == nil)
 		return -1;
+	
+	/*
+	 * Walk down to the new root block.
+	 * We may stop early, but something is better than nothing.
+	 */
+	oe = *e;
 
 	ob = nil;
 	b = rb;
diff -r a3522064f5dc sys/src/libventi/mkfile
--- a/sys/src/libventi/mkfile	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/libventi/mkfile	Tue Sep 18 19:30:23 2018 -0500
@@ -24,6 +24,7 @@
 	scorefmt.$O\
 	send.$O\
 	server.$O\
+	sha1.$O\
 	srvhello.$O\
 	strdup.$O\
 	string.$O\
diff -r a3522064f5dc sys/src/libventi/rpc.c
--- a/sys/src/libventi/rpc.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/libventi/rpc.c	Tue Sep 18 19:30:23 2018 -0500
@@ -37,7 +37,6 @@
 	uchar tag, buf[2], *top;
 	Rwait *r, *rr;
 
- 
 	if(z == nil){
 		werrstr("not connected");
 		packetfree(p);

[-- Attachment #3: sha1.c --]
[-- Type: text/x-csrc, Size: 474 bytes --]

#include <u.h>
#include <libc.h>
#include <venti.h>
#include <libsec.h>

void
vtsha1(uchar score[VtScoreSize], uchar *p, int n)
{
	DigestState ds;

	memset(&ds, 0, sizeof ds);
	sha1(p, n, score, &ds);
}

int
vtsha1check(uchar score[VtScoreSize], uchar *p, int n)
{
	DigestState ds;
	uchar score2[VtScoreSize];

	memset(&ds, 0, sizeof ds);
	sha1(p, n, score2, &ds);
	if(memcmp(score, score2, VtScoreSize) != 0) {
		werrstr("vtsha1check failed");
		return -1;
	}
	return 0;
}

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[hiro]

this is why we use hg...

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[hiro]

my approach is the following:
i use multiple branches for forks. i make sure all forks also have my same tail.
this way hg itself would notice a merge conflict when you merge
commits from another branch while there have been changes in the
meantime in our branch.
then you can check git blame and the old commit messages and dates.
possible even without 3-way diff.

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[cinap_lenrek]

you could, for some parts. but not all. %z for example is 9front
specific (depends on our compiler and libc).

just go over what they changed and then *THINK* if these changes
would be of any use.

as far as i can see, the only relevant changes are the reconnect
stuff, the no NoArchive flag, and the wrapper arround sha1.

right now, value of all this racket is negative. theres no program
using the new functionality in 9front.

--
cinap

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[cinap_lenrek]

what are these changes for? VtEntry oe seems to be unused?

diff -r a3522064f5dc sys/src/libventi/file.c
--- a/sys/src/libventi/file.c	Wed Sep 19 01:11:49 2018 +0200
+++ b/sys/src/libventi/file.c	Tue Sep 18 19:30:23 2018 -0500
@@ -503,6 +503,7 @@
 	VtBlock *b;
 	int type;
 	uchar *score;
+	VtEntry oe;
 
 	switch(p->type){
 	case VtDataType:
@@ -530,6 +531,8 @@
 
 	if(vtglobaltolocal(b->score) != NilBlock)
 		return b;
+	
+	oe = *e;
 
 	/*
 	 * Copy on write.
@@ -597,6 +600,7 @@
 shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
 {
 	VtBlock *b, *nb, *ob, *rb;
+	VtEntry oe;
 
 	assert(ISLOCKED(r));
 	assert(depth <= VtPointerDepth);
@@ -604,6 +608,12 @@
 	rb = vtcacheglobal(r->c, e->score, e->type);
 	if(rb == nil)
 		return -1;
+	
+	/*
+	 * Walk down to the new root block.
+	 * We may stop early, but something is better than nothing.
+	 */
+	oe = *e;
 
 	ob = nil;
 	b = rb;

--
cinap

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[hiro]

would it be easier to bring 9legacy up to date with 9front instead? :)

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[cinap_lenrek]

ape/diff3 --help

--
cinap

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[cinap_lenrek]

maybe a tip. you can use hgfs and try a proper 3-way diff.
that way you do not have to rely on my memory.

--
cinap

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[cinap_lenrek]

this undoes a bunch of bugfixes.

- %z format was changed to %Z because %z is used for pointer diff (our 6c yiels vlong there)

-	dd -quiet 1 -bs 1024 -count 8 </dev/zero >> /tmp/venticonf.$pid || exit dd
+	dd -quiet 1 -count 2 </dev/zero >> /tmp/venticonf.$pid || exit dd

this is suspect, there was a bug there with devfs which doesnt allow unaligned
writes. please check if thats not broken.

+	sha1.$O\

missing the file?

--
cinap

Re: [9front] Patch to bring 9front venti libventi up to date with 9legacy

[Sean Hinchee]

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]

My bad, i was a bit confused by the %Z choice and felt odd about it
and this explanation makes sense.

I've attached an updated patch and sha1.c that doesn't revert the
fixes in %Z discrepancies.

As for the dd, I'm not sure about the best way to test this, I've done:

tenshi% dd -quiet 1 -count 2 </dev/zero >> /tmp/venticonf.$pid || exit dd
tenshi% cat /tmp/venticonf.819083
tenshi% ll /tmp/venticonf.819083
--rw-rw-rw- M 8668 seh seh 1024 Sep 18 17:48 venticonf.819083

Which looks right, I think?

Cheers,
Sean
On Mon, Sep 17, 2018 at 4:49 PM <cinap_lenrek@felloff.net> wrote:
>
> this undoes a bunch of bugfixes.
>
> - %z format was changed to %Z because %z is used for pointer diff (our 6c yiels vlong there)
>
> -       dd -quiet 1 -bs 1024 -count 8 </dev/zero >> /tmp/venticonf.$pid || exit dd
> +       dd -quiet 1 -count 2 </dev/zero >> /tmp/venticonf.$pid || exit dd
>
> this is suspect, there was a bug there with devfs which doesnt allow unaligned
> writes. please check if thats not broken.
>
> +       sha1.$O\
>
> missing the file?
>
> --
> cinap

[-- Attachment #2: ventiupdate2.diff --]
[-- Type: text/x-patch, Size: 8546 bytes --]

diff -r 3fe2d53fd3d8 sys/include/venti.h
--- a/sys/include/venti.h	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/include/venti.h	Tue Sep 18 18:21:05 2018 -0500
@@ -134,7 +134,8 @@
 	_VtEntryDir = 1<<1,		/* a directory */
 	_VtEntryDepthShift = 2,		/* shift for pointer depth */
 	_VtEntryDepthMask = 7<<2,	/* mask for pointer depth */
-	VtEntryLocal = 1<<5		/* for local storage only */
+	VtEntryLocal = 1<<5,		/* for local storage only */
+	VtEntryNoArchive = 1<<6		/* for local storage only */
 };
 enum
 {
@@ -334,7 +335,9 @@
 };
 
 VtConn*	vtconn(int infd, int outfd);
+int	vtreconn(VtConn*, int, int);
 VtConn*	vtdial(char*);
+int	vtredial(VtConn*, char*);
 void	vtfreeconn(VtConn*);
 int	vtsend(VtConn*, Packet*);
 Packet*	vtrecv(VtConn*);
@@ -378,6 +381,10 @@
 int	vtsync(VtConn*);
 int	vtping(VtConn*);
 
+/* sha1 */
+void	vtsha1(uchar score[VtScoreSize], uchar*, int);
+int	vtsha1check(uchar score[VtScoreSize], uchar*, int);
+
 /*
  * Data blocks and block cache.
  */
diff -r 3fe2d53fd3d8 sys/man/2/venti-conn
--- a/sys/man/2/venti-conn	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/man/2/venti-conn	Tue Sep 18 18:21:05 2018 -0500
@@ -28,9 +28,15 @@
 VtConn*	vtconn(int infd, int outfd)
 .PP
 .B
+int	vtreconn(VtConn *z, int infd, int outfd)
+.PP
+.B
 VtConn*	vtdial(char *addr)
 .PP
 .B
+int	vtredial(VtConn *z, char *addr)
+.PP
+.B
 int	vtversion(VtConn *z)
 .PP
 .B
diff -r 3fe2d53fd3d8 sys/src/cmd/venti/copy.c
--- a/sys/src/cmd/venti/copy.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/cmd/venti/copy.c	Tue Sep 18 18:21:05 2018 -0500
@@ -122,7 +122,7 @@
 		break;
 
 	case VtDirType:
-		for(i=0; i<n/VtEntrySize; i++){
+		for(i=0; i*VtEntrySize<n; i++){
 			if(vtentryunpack(&e, buf, i) < 0){
 				fprint(2, "warning: could not unpack entry #%d in %V %d\n", i, score, type);
 				continue;
diff -r 3fe2d53fd3d8 sys/src/cmd/venti/srv/arenas.c
--- a/sys/src/cmd/venti/srv/arenas.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/cmd/venti/srv/arenas.c	Tue Sep 18 18:21:05 2018 -0500
@@ -15,7 +15,8 @@
 
 enum
 {
-	AHashSize	= 512
+	AHashSize	= 512,
+	Emergency	= 0,		/* flag: performing emergency surgery */
 };
 
 static AHash	*ahash[AHashSize];
@@ -142,8 +143,11 @@
 	ap->narenas = amn.n;
 	ap->map = amn.map;
 	if(okamap(ap->map, ap->narenas, ap->arenabase, ap->size, "arena table") < 0){
-		freearenapart(ap, 0);
-		return nil;
+		if(!Emergency){
+			freearenapart(ap, 0);
+			return nil;
+		}
+		/* else keep on, for emergency use */
 	}
 
 	ap->arenas = MKNZ(Arena*, ap->narenas);
@@ -152,8 +156,14 @@
 		ap->arenas[i] = initarena(part, ap->map[i].start, ap->map[i].stop - ap->map[i].start, ap->blocksize);
 		if(ap->arenas[i] == nil){
 			seterr(ECorrupt, "%s: %r", ap->map[i].name);
-			freearenapart(ap, 1);
-			return nil;
+			if(!Emergency){
+				freearenapart(ap, 1);
+				return nil;
+			}else{
+				/* keep on, for emergency use */
+				ap->narenas = i;
+				break;
+			}
 		}
 		if(namecmp(ap->map[i].name, ap->arenas[i]->name) != 0){
 			seterr(ECorrupt, "arena name mismatches with expected name: %s vs. %s",
diff -r 3fe2d53fd3d8 sys/src/cmd/venti/srv/buildindex.c
--- a/sys/src/cmd/venti/srv/buildindex.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/cmd/venti/srv/buildindex.c	Tue Sep 18 18:21:05 2018 -0500
@@ -813,7 +813,7 @@
 	}
 	if (nbuf == 0) {
 		fprint(2, "%s: brand-new index, no work to do\n", argv0);
-		exits(0);
+		threadexitsall(0);
 	}
 
 	/* size buffer to use extra memory */
diff -r 3fe2d53fd3d8 sys/src/cmd/venti/srv/conf.rc
--- a/sys/src/cmd/venti/srv/conf.rc	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/cmd/venti/srv/conf.rc	Tue Sep 18 18:21:05 2018 -0500
@@ -49,7 +49,7 @@
 	}
 	dd -quiet 1 -bs 1024 -count 8 -if $disk -iseek 248 \
 		>/tmp/_venticonf.old || exit backup
-	dd -quiet 1 -bs 1024 -count 8 </dev/zero >> /tmp/venticonf.$pid || exit dd
+	dd -quiet 1 -count 2 </dev/zero >> /tmp/venticonf.$pid || exit dd
 	dd -quiet 1 -bs 1024 -count 8 -if /tmp/venticonf.$pid \
 		-of $disk -trunc 0 -oseek 248 || exit dd2
 	exit 0
diff -r 3fe2d53fd3d8 sys/src/cmd/venti/srv/config.c
--- a/sys/src/cmd/venti/srv/config.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/cmd/venti/srv/config.c	Tue Sep 18 18:21:05 2018 -0500
@@ -177,6 +177,10 @@
 			}
 			config->vaddr = estrdup(flds[1]);
 		}else{
+			/*
+			 * this is insanely paranoid.  a single typo should not
+			 * prevent venti from starting.
+			 */
 			seterr(EAdmin, "illegal line '%s' in configuration file %s", line, file);
 			break;
 		}
diff -r 3fe2d53fd3d8 sys/src/cmd/venti/srv/dat.h
--- a/sys/src/cmd/venti/srv/dat.h	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/cmd/venti/srv/dat.h	Tue Sep 18 18:21:05 2018 -0500
@@ -48,7 +48,7 @@
 	MaxIo			= 64*1024,	/* max size of a single read or write operation */
 	ICacheBits		= 16,		/* default bits for indexing icache */
 	MaxAMap			= 31*1024,	/* max. allowed arenas in an address mapping; must be < 32*1024 */
-	Unspecified		= ~0ul,
+	Unspecified		= TWID32,
 
 	/*
 	 * return codes from syncarena
diff -r 3fe2d53fd3d8 sys/src/cmd/venti/srv/fixarenas.c
--- a/sys/src/cmd/venti/srv/fixarenas.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/cmd/venti/srv/fixarenas.c	Tue Sep 18 18:21:05 2018 -0500
@@ -130,12 +130,12 @@
 	int i, j, k, n;
 
 	if(offset >= partend){
-		memset(buf, 0xFB, sizeof buf);
+		memset(buf, 0xFB, len);
 		return buf;
 	}
 	
 	if(offset+len > partend){
-		memset(buf, 0xFB, sizeof buf);
+		memset(buf, 0xFB, len);
 		len = partend - offset;
 	}
 
diff -r 3fe2d53fd3d8 sys/src/cmd/venti/srv/unwhack.c
--- a/sys/src/cmd/venti/srv/unwhack.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/cmd/venti/srv/unwhack.c	Tue Sep 18 18:21:05 2018 -0500
@@ -156,8 +156,7 @@
 		off++;
 
 		if(off > d - dst){
-			snprint(uw->err, WhackErrLen, "offset out of range: off=%d d=%zd len=%d nbits=%d",
-				off, d - dst, len, uwnbits);
+			snprint(uw->err, WhackErrLen, "offset out of range: off=%d d=%zd len=%d nbits=%d", off, d - dst, len, uwnbits);
 			return -1;
 		}
 		if(d + len > dmax){
diff -r 3fe2d53fd3d8 sys/src/libventi/conn.c
--- a/sys/src/libventi/conn.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/libventi/conn.c	Tue Sep 18 18:21:05 2018 -0500
@@ -27,6 +27,28 @@
 	return z;
 }
 
+int
+vtreconn(VtConn *z, int infd, int outfd)
+{
+	NetConnInfo *nci;
+
+	z->state = VtStateAlloc;
+	if(z->infd >= 0)
+		close(z->infd);
+	z->infd = infd;
+	if(z->outfd >= 0)
+		close(z->outfd);
+	z->outfd = outfd;
+	nci = getnetconninfo(nil, infd);
+	if(nci == nil)
+		snprint(z->addr, sizeof z->addr, "/dev/fd/%d", infd);
+	else{
+		strecpy(z->addr, z->addr+sizeof z->addr, nci->raddr);
+		freenetconninfo(nci);
+	}
+	return 0;
+}
+
 void
 vtfreeconn(VtConn *z)
 {
diff -r 3fe2d53fd3d8 sys/src/libventi/dial.c
--- a/sys/src/libventi/dial.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/libventi/dial.c	Tue Sep 18 18:21:05 2018 -0500
@@ -23,3 +23,21 @@
 		strecpy(z->addr, z->addr+sizeof z->addr, na);
 	return z;
 }
+
+int
+vtredial(VtConn *z, char *addr)
+{
+	char *na;
+	int fd;
+
+	if(addr == nil)
+		addr = getenv("venti");
+	if(addr == nil)
+		addr = "$venti";
+
+	na = netmkaddr(addr, "tcp", "venti");
+	if((fd = dial(na, nil, nil, nil)) < 0)
+		return fd;
+
+	return vtreconn(z, fd, fd);
+}
diff -r 3fe2d53fd3d8 sys/src/libventi/file.c
--- a/sys/src/libventi/file.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/libventi/file.c	Tue Sep 18 18:21:05 2018 -0500
@@ -503,6 +503,7 @@
 	VtBlock *b;
 	int type;
 	uchar *score;
+	VtEntry oe;
 
 	switch(p->type){
 	case VtDataType:
@@ -530,6 +531,8 @@
 
 	if(vtglobaltolocal(b->score) != NilBlock)
 		return b;
+	
+	oe = *e;
 
 	/*
 	 * Copy on write.
@@ -597,6 +600,7 @@
 shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
 {
 	VtBlock *b, *nb, *ob, *rb;
+	VtEntry oe;
 
 	assert(ISLOCKED(r));
 	assert(depth <= VtPointerDepth);
@@ -604,6 +608,12 @@
 	rb = vtcacheglobal(r->c, e->score, e->type);
 	if(rb == nil)
 		return -1;
+	
+	/*
+	 * Walk down to the new root block.
+	 * We may stop early, but something is better than nothing.
+	 */
+	oe = *e;
 
 	ob = nil;
 	b = rb;
diff -r 3fe2d53fd3d8 sys/src/libventi/mkfile
--- a/sys/src/libventi/mkfile	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/libventi/mkfile	Tue Sep 18 18:21:05 2018 -0500
@@ -24,6 +24,7 @@
 	scorefmt.$O\
 	send.$O\
 	server.$O\
+	sha1.$O\
 	srvhello.$O\
 	strdup.$O\
 	string.$O\
diff -r 3fe2d53fd3d8 sys/src/libventi/rpc.c
--- a/sys/src/libventi/rpc.c	Tue Sep 18 13:14:00 2018 -0700
+++ b/sys/src/libventi/rpc.c	Tue Sep 18 18:21:05 2018 -0500
@@ -37,7 +37,6 @@
 	uchar tag, buf[2], *top;
 	Rwait *r, *rr;
 
- 
 	if(z == nil){
 		werrstr("not connected");
 		packetfree(p);

[-- Attachment #3: sha1.c --]
[-- Type: text/x-csrc, Size: 474 bytes --]

#include <u.h>
#include <libc.h>
#include <venti.h>
#include <libsec.h>

void
vtsha1(uchar score[VtScoreSize], uchar *p, int n)
{
	DigestState ds;

	memset(&ds, 0, sizeof ds);
	sha1(p, n, score, &ds);
}

int
vtsha1check(uchar score[VtScoreSize], uchar *p, int n)
{
	DigestState ds;
	uchar score2[VtScoreSize];

	memset(&ds, 0, sizeof ds);
	sha1(p, n, score2, &ds);
	if(memcmp(score, score2, VtScoreSize) != 0) {
		werrstr("vtsha1check failed");
		return -1;
	}
	return 0;
}

[9front] Patch to bring 9front venti libventi up to date with 9legacy

[Sean Hinchee]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

All,

Attached is a patch to bring venti, libventi, and the affected manual
up to date with some changes in 9legacy.

This should not break anything existing as far as I can tell.

Cheers,
Sean

[-- Attachment #2: ventiupdate.diff --]
[-- Type: text/x-patch, Size: 8856 bytes --]

diff -r 6223c291c7b7 sys/include/venti.h
--- a/sys/include/venti.h	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/include/venti.h	Mon Sep 17 15:51:53 2018 -0500
@@ -134,7 +134,8 @@
 	_VtEntryDir = 1<<1,		/* a directory */
 	_VtEntryDepthShift = 2,		/* shift for pointer depth */
 	_VtEntryDepthMask = 7<<2,	/* mask for pointer depth */
-	VtEntryLocal = 1<<5		/* for local storage only */
+	VtEntryLocal = 1<<5,		/* for local storage only */
+	VtEntryNoArchive = 1<<6		/* for local storage only */
 };
 enum
 {
@@ -334,7 +335,9 @@
 };
 
 VtConn*	vtconn(int infd, int outfd);
+int	vtreconn(VtConn*, int, int);
 VtConn*	vtdial(char*);
+int	vtredial(VtConn*, char*);
 void	vtfreeconn(VtConn*);
 int	vtsend(VtConn*, Packet*);
 Packet*	vtrecv(VtConn*);
@@ -378,6 +381,10 @@
 int	vtsync(VtConn*);
 int	vtping(VtConn*);
 
+/* sha1 */
+void	vtsha1(uchar score[VtScoreSize], uchar*, int);
+int	vtsha1check(uchar score[VtScoreSize], uchar*, int);
+
 /*
  * Data blocks and block cache.
  */
diff -r 6223c291c7b7 sys/man/2/venti-conn
--- a/sys/man/2/venti-conn	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/man/2/venti-conn	Mon Sep 17 15:51:53 2018 -0500
@@ -28,9 +28,15 @@
 VtConn*	vtconn(int infd, int outfd)
 .PP
 .B
+int	vtreconn(VtConn *z, int infd, int outfd)
+.PP
+.B
 VtConn*	vtdial(char *addr)
 .PP
 .B
+int	vtredial(VtConn *z, char *addr)
+.PP
+.B
 int	vtversion(VtConn *z)
 .PP
 .B
diff -r 6223c291c7b7 sys/src/cmd/venti/copy.c
--- a/sys/src/cmd/venti/copy.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/cmd/venti/copy.c	Mon Sep 17 15:51:53 2018 -0500
@@ -122,7 +122,7 @@
 		break;
 
 	case VtDirType:
-		for(i=0; i<n/VtEntrySize; i++){
+		for(i=0; i*VtEntrySize<n; i++){
 			if(vtentryunpack(&e, buf, i) < 0){
 				fprint(2, "warning: could not unpack entry #%d in %V %d\n", i, score, type);
 				continue;
diff -r 6223c291c7b7 sys/src/cmd/venti/srv/arenas.c
--- a/sys/src/cmd/venti/srv/arenas.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/cmd/venti/srv/arenas.c	Mon Sep 17 15:51:53 2018 -0500
@@ -15,7 +15,8 @@
 
 enum
 {
-	AHashSize	= 512
+	AHashSize	= 512,
+	Emergency	= 0,		/* flag: performing emergency surgery */
 };
 
 static AHash	*ahash[AHashSize];
@@ -142,8 +143,11 @@
 	ap->narenas = amn.n;
 	ap->map = amn.map;
 	if(okamap(ap->map, ap->narenas, ap->arenabase, ap->size, "arena table") < 0){
-		freearenapart(ap, 0);
-		return nil;
+		if(!Emergency){
+			freearenapart(ap, 0);
+			return nil;
+		}
+		/* else keep on, for emergency use */
 	}
 
 	ap->arenas = MKNZ(Arena*, ap->narenas);
@@ -152,8 +156,14 @@
 		ap->arenas[i] = initarena(part, ap->map[i].start, ap->map[i].stop - ap->map[i].start, ap->blocksize);
 		if(ap->arenas[i] == nil){
 			seterr(ECorrupt, "%s: %r", ap->map[i].name);
-			freearenapart(ap, 1);
-			return nil;
+			if(!Emergency){
+				freearenapart(ap, 1);
+				return nil;
+			}else{
+				/* keep on, for emergency use */
+				ap->narenas = i;
+				break;
+			}
 		}
 		if(namecmp(ap->map[i].name, ap->arenas[i]->name) != 0){
 			seterr(ECorrupt, "arena name mismatches with expected name: %s vs. %s",
diff -r 6223c291c7b7 sys/src/cmd/venti/srv/buildindex.c
--- a/sys/src/cmd/venti/srv/buildindex.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/cmd/venti/srv/buildindex.c	Mon Sep 17 15:51:53 2018 -0500
@@ -813,7 +813,7 @@
 	}
 	if (nbuf == 0) {
 		fprint(2, "%s: brand-new index, no work to do\n", argv0);
-		exits(0);
+		threadexitsall(0);
 	}
 
 	/* size buffer to use extra memory */
diff -r 6223c291c7b7 sys/src/cmd/venti/srv/conf.rc
--- a/sys/src/cmd/venti/srv/conf.rc	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/cmd/venti/srv/conf.rc	Mon Sep 17 15:51:53 2018 -0500
@@ -49,7 +49,7 @@
 	}
 	dd -quiet 1 -bs 1024 -count 8 -if $disk -iseek 248 \
 		>/tmp/_venticonf.old || exit backup
-	dd -quiet 1 -bs 1024 -count 8 </dev/zero >> /tmp/venticonf.$pid || exit dd
+	dd -quiet 1 -count 2 </dev/zero >> /tmp/venticonf.$pid || exit dd
 	dd -quiet 1 -bs 1024 -count 8 -if /tmp/venticonf.$pid \
 		-of $disk -trunc 0 -oseek 248 || exit dd2
 	exit 0
diff -r 6223c291c7b7 sys/src/cmd/venti/srv/config.c
--- a/sys/src/cmd/venti/srv/config.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/cmd/venti/srv/config.c	Mon Sep 17 15:51:53 2018 -0500
@@ -177,6 +177,10 @@
 			}
 			config->vaddr = estrdup(flds[1]);
 		}else{
+			/*
+			 * this is insanely paranoid.  a single typo should not
+			 * prevent venti from starting.
+			 */
 			seterr(EAdmin, "illegal line '%s' in configuration file %s", line, file);
 			break;
 		}
diff -r 6223c291c7b7 sys/src/cmd/venti/srv/dat.h
--- a/sys/src/cmd/venti/srv/dat.h	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/cmd/venti/srv/dat.h	Mon Sep 17 15:51:53 2018 -0500
@@ -48,7 +48,7 @@
 	MaxIo			= 64*1024,	/* max size of a single read or write operation */
 	ICacheBits		= 16,		/* default bits for indexing icache */
 	MaxAMap			= 31*1024,	/* max. allowed arenas in an address mapping; must be < 32*1024 */
-	Unspecified		= ~0ul,
+	Unspecified		= TWID32,
 
 	/*
 	 * return codes from syncarena
diff -r 6223c291c7b7 sys/src/cmd/venti/srv/fixarenas.c
--- a/sys/src/cmd/venti/srv/fixarenas.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/cmd/venti/srv/fixarenas.c	Mon Sep 17 15:51:53 2018 -0500
@@ -61,7 +61,7 @@
  * Format number in simplest way that is okay with unittoull.
  */
 static int
-Zfmt(Fmt *fmt)
+zfmt(Fmt *fmt)
 {
 	vlong x;
 	
@@ -130,12 +130,12 @@
 	int i, j, k, n;
 
 	if(offset >= partend){
-		memset(buf, 0xFB, sizeof buf);
+		memset(buf, 0xFB, len);
 		return buf;
 	}
 	
 	if(offset+len > partend){
-		memset(buf, 0xFB, sizeof buf);
+		memset(buf, 0xFB, len);
 		len = partend - offset;
 	}
 
@@ -1894,7 +1894,7 @@
 	file = argv[0];
 	
 	ventifmtinstall();
-	fmtinstall('Z', Zfmt);
+	fmtinstall('z', zfmt);
 	fmtinstall('t', tfmt);
 	quotefmtinstall();
 	
diff -r 6223c291c7b7 sys/src/cmd/venti/srv/unwhack.c
--- a/sys/src/cmd/venti/srv/unwhack.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/cmd/venti/srv/unwhack.c	Mon Sep 17 15:51:53 2018 -0500
@@ -156,8 +156,7 @@
 		off++;
 
 		if(off > d - dst){
-			snprint(uw->err, WhackErrLen, "offset out of range: off=%d d=%zd len=%d nbits=%d",
-				off, d - dst, len, uwnbits);
+			snprint(uw->err, WhackErrLen, "offset out of range: off=%d d=%zd len=%d nbits=%d", off, d - dst, len, uwnbits);
 			return -1;
 		}
 		if(d + len > dmax){
diff -r 6223c291c7b7 sys/src/libventi/conn.c
--- a/sys/src/libventi/conn.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/libventi/conn.c	Mon Sep 17 15:51:53 2018 -0500
@@ -27,6 +27,28 @@
 	return z;
 }
 
+int
+vtreconn(VtConn *z, int infd, int outfd)
+{
+	NetConnInfo *nci;
+
+	z->state = VtStateAlloc;
+	if(z->infd >= 0)
+		close(z->infd);
+	z->infd = infd;
+	if(z->outfd >= 0)
+		close(z->outfd);
+	z->outfd = outfd;
+	nci = getnetconninfo(nil, infd);
+	if(nci == nil)
+		snprint(z->addr, sizeof z->addr, "/dev/fd/%d", infd);
+	else{
+		strecpy(z->addr, z->addr+sizeof z->addr, nci->raddr);
+		freenetconninfo(nci);
+	}
+	return 0;
+}
+
 void
 vtfreeconn(VtConn *z)
 {
diff -r 6223c291c7b7 sys/src/libventi/dial.c
--- a/sys/src/libventi/dial.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/libventi/dial.c	Mon Sep 17 15:51:53 2018 -0500
@@ -23,3 +23,21 @@
 		strecpy(z->addr, z->addr+sizeof z->addr, na);
 	return z;
 }
+
+int
+vtredial(VtConn *z, char *addr)
+{
+	char *na;
+	int fd;
+
+	if(addr == nil)
+		addr = getenv("venti");
+	if(addr == nil)
+		addr = "$venti";
+
+	na = netmkaddr(addr, "tcp", "venti");
+	if((fd = dial(na, nil, nil, nil)) < 0)
+		return fd;
+
+	return vtreconn(z, fd, fd);
+}
diff -r 6223c291c7b7 sys/src/libventi/file.c
--- a/sys/src/libventi/file.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/libventi/file.c	Mon Sep 17 15:51:53 2018 -0500
@@ -503,6 +503,7 @@
 	VtBlock *b;
 	int type;
 	uchar *score;
+	VtEntry oe;
 
 	switch(p->type){
 	case VtDataType:
@@ -530,6 +531,8 @@
 
 	if(vtglobaltolocal(b->score) != NilBlock)
 		return b;
+	
+	oe = *e;
 
 	/*
 	 * Copy on write.
@@ -597,6 +600,7 @@
 shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
 {
 	VtBlock *b, *nb, *ob, *rb;
+	VtEntry oe;
 
 	assert(ISLOCKED(r));
 	assert(depth <= VtPointerDepth);
@@ -604,6 +608,12 @@
 	rb = vtcacheglobal(r->c, e->score, e->type);
 	if(rb == nil)
 		return -1;
+	
+	/*
+	 * Walk down to the new root block.
+	 * We may stop early, but something is better than nothing.
+	 */
+	oe = *e;
 
 	ob = nil;
 	b = rb;
diff -r 6223c291c7b7 sys/src/libventi/mkfile
--- a/sys/src/libventi/mkfile	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/libventi/mkfile	Mon Sep 17 15:51:53 2018 -0500
@@ -24,6 +24,7 @@
 	scorefmt.$O\
 	send.$O\
 	server.$O\
+	sha1.$O\
 	srvhello.$O\
 	strdup.$O\
 	string.$O\
diff -r 6223c291c7b7 sys/src/libventi/rpc.c
--- a/sys/src/libventi/rpc.c	Mon Sep 17 18:09:33 2018 +0200
+++ b/sys/src/libventi/rpc.c	Mon Sep 17 15:51:53 2018 -0500
@@ -37,7 +37,6 @@
 	uchar tag, buf[2], *top;
 	Rwait *r, *rr;
 
- 
 	if(z == nil){
 		werrstr("not connected");
 		packetfree(p);