Plan 9 from Bell Labs 2003-12-10

dist/replica/plan9.db

@@ -3309,7 +3309,7 @@ sys/doc/venti/venti.pdf - 755 sys sys 1020384352 139090
 sys/doc/venti/venti.ps - 664 sys sys 1019852320 2012620
 sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
-sys/games/lib/fortunes - 664 sys sys 1068558042 246774
+sys/games/lib/fortunes - 664 sys sys 1070982320 246889
 sys/include - 20000000775 sys sys 1016902416 0
 sys/include/9p.h - 664 sys sys 1044836327 4309
 sys/include/String.h - 664 sys sys 1055701304 1291
@@ -7526,7 +7526,7 @@ sys/src/cmd/fossil/archive.c - 664 sys sys 1061530723 9109
 sys/src/cmd/fossil/build - 664 sys sys 1042005505 449
 sys/src/cmd/fossil/buildsh - 775 sys sys 1042005505 561
 sys/src/cmd/fossil/bwatch.c - 664 sys sys 1042005505 6754
-sys/src/cmd/fossil/cache.c - 664 sys sys 1069683862 43183
+sys/src/cmd/fossil/cache.c - 664 sys sys 1071007936 43090
 sys/src/cmd/fossil/conf.rc - 775 sys sys 1055703747 1407
 sys/src/cmd/fossil/dat.h - 664 sys sys 1061530727 7851
 sys/src/cmd/fossil/deadlock - 775 sys sys 1042005506 413

dist/replica/plan9.log

@@ -12955,3 +12955,5 @@
 1070660725 2 c sys/src/ape/lib/draw/libc.h - 664 sys sys 1070660715 3456
 1070660725 3 c sys/src/libdraw/init.c - 664 sys sys 1070660683 9077
 1070911927 0 c dist/replica/network - 775 sys sys 1070911277 994
+1070983937 0 c sys/games/lib/fortunes - 664 sys sys 1070982320 246889
+1071009141 0 c sys/src/cmd/fossil/cache.c - 664 sys sys 1071007936 43090

sys/games/lib/fortunes

@@ -3992,3 +3992,4 @@ Hi.  My name is %{NAME%}%, I am 25 years of age.  I happen to see your profile o
 As complicated as the semantics of virtual inheritance may seem, its support within the compiler has proven even more complicated.  - Stanley Lippman, Inside the C++ Object Model
 Who needs hallucinatory drugs when we've got quantum physics?
 The essence of XML is this: the problem it solves is not hard, and it does not solve the problem well.  - Phil Wadler, POPL 2003
+tcp_extensions="YES".  really i wanted "MAYBE" or "GOODQUESTION" or "YOUTELLME" or "YOU'RETHECOMPUTER!"  - forsyth

sys/src/cmd/fossil/cache.c

@@ -350,7 +350,7 @@ cacheBumpBlock(Cache *c)
 
 	assert(b->heap == BadHeap);
 	assert(b->ref == 0);
-	assert(b->iostate == BioEmpty || b->iostate == BioLabel || b->iostate == BioClean);
+	assert(b->iostate != BioDirty && b->iostate != BioReading && b->iostate != BioWriting);
 	assert(b->prior == nil);
 	assert(b->uhead == nil);
 
@@ -435,7 +435,6 @@ _cacheLocalLookup(Cache *c, int part, u32int addr, u32int vers,
 			break;
 		case BioVentiError:
 		case BioReadError:
-			blockSetIOState(b, BioEmpty);
 			blockPut(b);
 			vtSetError(EIO);
 			return nil;
@@ -657,6 +656,7 @@ if(0)fprint(2, "cacheGlobal %V %d\n", score, type);
 		if(n < 0 || !vtSha1Check(score, b->data, n)){
 			blockSetIOState(b, BioVentiError);
 			blockPut(b);
+			vtSetError(EIO);
 			return nil;
 		}
 		vtZeroExtend(vtType[type], b->data, n, c->size);
@@ -668,7 +668,6 @@ if(0)fprint(2, "cacheGlobal %V %d\n", score, type);
 	case BioReadError:
 		blockPut(b);
 		vtSetError(EIO);
-		blockSetIOState(b, BioEmpty);
 		return nil;
 	}
 	/* NOT REACHED */
@@ -704,7 +703,6 @@ cacheAllocBlock(Cache *c, int type, u32int tag, u32int epoch, u32int epochLow)
 	for(;;){
 		if(++addr >= fl->end){
 			addr = 0;
-			fprint(2, "cacheAllocBlock wrap %d\n", fl->end);
 			if(++nwrap >= 2){
 				blockPut(b);
 				fl->last = 0;