commit a1882dc1d0eeb8eb15614b28d3c11a3697bcd185
from: rsc <devnull@localhost>
date: Thu Jun 17 19:17:04 2004 UTC

silly cache hack, also fix vtfilewritebefore not to be so aggressive.

commit - 7cb748941ecffdd66630ba463080cf44fcb62161
commit + a1882dc1d0eeb8eb15614b28d3c11a3697bcd185
blob - fb0be905a29d371a39eaf3e900e7b20a01b548f6
blob + 394641d40d4b6c3ce29ff035900a219db4fe9437
--- src/libventi/cache.c
+++ src/libventi/cache.c
@@ -39,6 +39,7 @@ struct VtCache
 	int		nblock;
 	uchar	*mem;	/* memory for all blocks and data */
 	int		mode;
+	int		(*write)(VtConn*, uchar[VtScoreSize], uint, uchar*, int);
 };
 
 static void cachecheck(VtCache*);
@@ -56,13 +57,13 @@ vtcachealloc(VtConn *z, int blocksize, ulong nblock, i
 	c->z = z;
 	c->blocksize = (blocksize + 127) & ~127;
 	c->nblock = nblock;
-
 	c->nhash = nblock;
 	c->hash = vtmallocz(nblock*sizeof(VtBlock*));
 	c->heap = vtmallocz(nblock*sizeof(VtBlock*));
 	c->block = vtmallocz(nblock*sizeof(VtBlock));
 	c->mem = vtmallocz(nblock*c->blocksize);
 	c->mode = mode;
+	c->write = vtwrite;
 
 	p = c->mem;
 	for(i=0; i<nblock; i++){
@@ -77,6 +78,19 @@ vtcachealloc(VtConn *z, int blocksize, ulong nblock, i
 	c->nheap = nblock;
 	cachecheck(c);
 	return c;
+}
+
+/*
+ * BUG This is here so that vbackup can override it and do some
+ * pipelining of writes.  Arguably vtwrite or vtwritepacket or the
+ * cache itself should be providing this functionality.
+ */
+void
+vtcachesetwrite(VtCache *c, int (*write)(VtConn*, uchar[VtScoreSize], uint, uchar*, int))
+{
+	if(write == nil)
+		write = vtwrite;
+	c->write = write;
 }
 
 void
@@ -405,6 +419,8 @@ vtcacheglobal(VtCache *c, uchar score[VtScoreSize], in
 
 	n = vtread(c->z, score, type, b->data, c->blocksize);
 	if(n < 0){
+		werrstr("vtread %V: %r", score);
+abort();
 		b->iostate = BioVentiError;
 		vtblockput(b);
 		return nil;
@@ -494,7 +510,7 @@ vtblockwrite(VtBlock *b)
 
 	c = b->c;
 	n = vtzerotruncate(b->type, b->data, c->blocksize);
-	if(vtwrite(c->z, score, b->type, b->data, n) < 0)
+	if(c->write(c->z, score, b->type, b->data, n) < 0)
 		return -1;
 
 	memmove(b->score, score, VtScoreSize);
blob - dac53a51497332a35e300cbf34d9820f84f2d788
blob + b2f5b15576b20873a275c858b008e9f7a4d34d34
--- src/libventi/file.c
+++ src/libventi/file.c
@@ -1222,10 +1222,13 @@ vtfileflushbefore(VtFile *r, u64int offset)
 			 * if the rest of the block is already flushed,
 			 * we can flush the whole block.
 			 */
-			ok = 1;
-			for(; j<ppb; j++)
-				if(vtglobaltolocal(b->data+j*VtScoreSize) != NilBlock)
-					ok = 0;
+			ok = 0;
+			if(index[i] != index1[i]){
+				ok = 1;
+				for(; j<ppb; j++)
+					if(vtglobaltolocal(b->data+j*VtScoreSize) != NilBlock)
+						ok = 0;
+			}
 		}
 		if(ok){
 			if(i == depth)