Browse Source

Plan 9 from Bell Labs 2007-07-04

David du Colombier 17 years ago
parent
commit
36de0b0d7f

+ 12 - 17
dist/replica/_plan9.db

@@ -246,7 +246,7 @@
 386/bin/fs/32vfs - 775 sys sys 1178568272 94157
 386/bin/fs/cpiofs - 775 sys sys 1178568273 92917
 386/bin/fs/tapfs - 775 sys sys 1178568273 95279
-386/bin/fs/tarfs - 775 sys sys 1178568273 94928
+386/bin/fs/tarfs - 775 sys sys 1183433212 96282
 386/bin/fs/tpfs - 775 sys sys 1178568274 92470
 386/bin/fs/v10fs - 775 sys sys 1178568274 94797
 386/bin/fs/v6fs - 775 sys sys 1178568274 93881
@@ -343,10 +343,10 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1182283129 149052
 386/bin/ndb/csquery - 775 sys sys 1176488418 61652
-386/bin/ndb/dns - 775 sys sys 1183233470 289845
-386/bin/ndb/dnsdebug - 775 sys sys 1183233471 264781
+386/bin/ndb/dns - 775 sys sys 1183492676 289937
+386/bin/ndb/dnsdebug - 775 sys sys 1183492677 264870
 386/bin/ndb/dnsquery - 775 sys sys 1174704818 64417
-386/bin/ndb/dnstcp - 775 sys sys 1183233472 263224
+386/bin/ndb/dnstcp - 775 sys sys 1183492678 263313
 386/bin/ndb/ipquery - 775 sys sys 1178568296 95524
 386/bin/ndb/mkdb - 775 sys sys 1168402340 64211
 386/bin/ndb/mkhash - 775 sys sys 1178568296 83312
@@ -424,7 +424,7 @@
 386/bin/swap - 775 sys sys 1168402350 62373
 386/bin/syscall - 775 sys sys 1178568305 73944
 386/bin/tail - 775 sys sys 1168402351 66406
-386/bin/tar - 775 sys sys 1169151814 94824
+386/bin/tar - 775 sys sys 1183433215 94751
 386/bin/tbl - 775 sys sys 1176520501 113420
 386/bin/tcs - 775 sys sys 1176520502 320129
 386/bin/tee - 775 sys sys 1148500692 38463
@@ -490,7 +490,7 @@
 386/bin/vacfs - 775 sys sys 1178568319 174693
 386/bin/venti - 20000000775 sys sys 947360466 0
 386/bin/venti/buildindex - 775 sys sys 1178568319 152954
-386/bin/venti/checkarenas - 775 sys sys 1178568320 157189
+386/bin/venti/checkarenas - 775 sys sys 1183492679 157174
 386/bin/venti/checkindex - 775 sys sys 1178568320 153837
 386/bin/venti/clumpstats - 775 sys sys 1178568321 143986
 386/bin/venti/conf - 775 sys sys 1056364399 1506
@@ -503,8 +503,8 @@
 386/bin/venti/rdarena - 775 sys sys 1178568323 125867
 386/bin/venti/read - 775 sys sys 1176520519 102876
 386/bin/venti/sync - 775 sys sys 1176520519 102021
-386/bin/venti/syncindex - 775 sys sys 1178568324 168246
-386/bin/venti/venti - 775 sys sys 1178568324 244939
+386/bin/venti/syncindex - 775 sys sys 1183492679 168231
+386/bin/venti/venti - 775 sys sys 1183492680 244924
 386/bin/venti/verifyarena - 775 sys sys 1178568325 102747
 386/bin/venti/wrarena - 775 sys sys 1178568325 174848
 386/bin/venti/write - 775 sys sys 1176520521 102825
@@ -12824,14 +12824,14 @@ sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1183184540 11853
 sys/src/cmd/ndb/cs.c - 664 sys sys 1182275681 33213
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1183406703 22445
-sys/src/cmd/ndb/dn.c - 664 sys sys 1183184500 35208
+sys/src/cmd/ndb/dn.c - 664 sys sys 1183448045 35283
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1178508075 3140
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1183185006 32437
 sys/src/cmd/ndb/dns.c - 664 sys sys 1183184469 16237
-sys/src/cmd/ndb/dns.h - 664 sys sys 1183184420 11241
+sys/src/cmd/ndb/dns.h - 664 sys sys 1183448016 11240
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1183184428 8754
-sys/src/cmd/ndb/dnserver.c - 664 sys sys 1175901160 4392
+sys/src/cmd/ndb/dnserver.c - 664 sys sys 1183447961 4402
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1174626126 2435
 sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1183184439 7440
 sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1183406741 5366
@@ -14374,7 +14374,7 @@ sys/src/cmd/venti/sortientry.c - 664 sys sys 1143759340 7436
 sys/src/cmd/venti/stats.c - 664 sys sys 1019678880 2099
 sys/src/cmd/venti/stdinc.h - 664 sys sys 1019678880 139
 sys/src/cmd/venti/sync.c - 664 sys sys 1036470213 674
-sys/src/cmd/venti/syncarena.c - 664 sys sys 1093980087 4198
+sys/src/cmd/venti/syncarena.c - 664 sys sys 1183441016 4206
 sys/src/cmd/venti/syncindex.c - 664 sys sys 1055707433 983
 sys/src/cmd/venti/syncindex0.c - 664 sys sys 1036470283 3044
 sys/src/cmd/venti/unittoull.c - 664 sys sys 1019678881 398
@@ -15844,8 +15844,3 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/fs/tarfs - 775 sys sys 1183433212 96282
-386/bin/ndb/dns - 775 sys sys 1183433213 289862
-386/bin/ndb/dnsdebug - 775 sys sys 1183433213 264795
-386/bin/ndb/dnstcp - 775 sys sys 1183433214 263238
-386/bin/tar - 775 sys sys 1183433215 94751

+ 10 - 10
dist/replica/plan9.db

@@ -343,10 +343,10 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1182283129 149052
 386/bin/ndb/csquery - 775 sys sys 1176488418 61652
-386/bin/ndb/dns - 775 sys sys 1183433213 289862
-386/bin/ndb/dnsdebug - 775 sys sys 1183433213 264795
+386/bin/ndb/dns - 775 sys sys 1183492676 289937
+386/bin/ndb/dnsdebug - 775 sys sys 1183492677 264870
 386/bin/ndb/dnsquery - 775 sys sys 1174704818 64417
-386/bin/ndb/dnstcp - 775 sys sys 1183433214 263238
+386/bin/ndb/dnstcp - 775 sys sys 1183492678 263313
 386/bin/ndb/ipquery - 775 sys sys 1178568296 95524
 386/bin/ndb/mkdb - 775 sys sys 1168402340 64211
 386/bin/ndb/mkhash - 775 sys sys 1178568296 83312
@@ -490,7 +490,7 @@
 386/bin/vacfs - 775 sys sys 1178568319 174693
 386/bin/venti - 20000000775 sys sys 947360466 0
 386/bin/venti/buildindex - 775 sys sys 1178568319 152954
-386/bin/venti/checkarenas - 775 sys sys 1178568320 157189
+386/bin/venti/checkarenas - 775 sys sys 1183492679 157174
 386/bin/venti/checkindex - 775 sys sys 1178568320 153837
 386/bin/venti/clumpstats - 775 sys sys 1178568321 143986
 386/bin/venti/conf - 775 sys sys 1056364399 1506
@@ -503,8 +503,8 @@
 386/bin/venti/rdarena - 775 sys sys 1178568323 125867
 386/bin/venti/read - 775 sys sys 1176520519 102876
 386/bin/venti/sync - 775 sys sys 1176520519 102021
-386/bin/venti/syncindex - 775 sys sys 1178568324 168246
-386/bin/venti/venti - 775 sys sys 1178568324 244939
+386/bin/venti/syncindex - 775 sys sys 1183492679 168231
+386/bin/venti/venti - 775 sys sys 1183492680 244924
 386/bin/venti/verifyarena - 775 sys sys 1178568325 102747
 386/bin/venti/wrarena - 775 sys sys 1178568325 174848
 386/bin/venti/write - 775 sys sys 1176520521 102825
@@ -12824,14 +12824,14 @@ sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1183184540 11853
 sys/src/cmd/ndb/cs.c - 664 sys sys 1182275681 33213
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1183406703 22445
-sys/src/cmd/ndb/dn.c - 664 sys sys 1183184500 35208
+sys/src/cmd/ndb/dn.c - 664 sys sys 1183448045 35283
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1178508075 3140
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1183185006 32437
 sys/src/cmd/ndb/dns.c - 664 sys sys 1183184469 16237
-sys/src/cmd/ndb/dns.h - 664 sys sys 1183184420 11241
+sys/src/cmd/ndb/dns.h - 664 sys sys 1183448016 11240
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1183184428 8754
-sys/src/cmd/ndb/dnserver.c - 664 sys sys 1175901160 4392
+sys/src/cmd/ndb/dnserver.c - 664 sys sys 1183447961 4402
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1174626126 2435
 sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1183184439 7440
 sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1183406741 5366
@@ -14374,7 +14374,7 @@ sys/src/cmd/venti/sortientry.c - 664 sys sys 1143759340 7436
 sys/src/cmd/venti/stats.c - 664 sys sys 1019678880 2099
 sys/src/cmd/venti/stdinc.h - 664 sys sys 1019678880 139
 sys/src/cmd/venti/sync.c - 664 sys sys 1036470213 674
-sys/src/cmd/venti/syncarena.c - 664 sys sys 1093980087 4198
+sys/src/cmd/venti/syncarena.c - 664 sys sys 1183441016 4206
 sys/src/cmd/venti/syncindex.c - 664 sys sys 1055707433 983
 sys/src/cmd/venti/syncindex0.c - 664 sys sys 1036470283 3044
 sys/src/cmd/venti/unittoull.c - 664 sys sys 1019678881 398

+ 10 - 0
dist/replica/plan9.log

@@ -49421,3 +49421,13 @@
 1183433423 2 c 386/bin/ndb/dnsdebug - 775 sys sys 1183433213 264795
 1183433423 3 c 386/bin/ndb/dnstcp - 775 sys sys 1183433214 263238
 1183433423 4 c 386/bin/tar - 775 sys sys 1183433215 94751
+1183442423 0 c sys/src/cmd/venti/syncarena.c - 664 sys sys 1183441016 4206
+1183449622 0 c sys/src/cmd/ndb/dn.c - 664 sys sys 1183448045 35283
+1183449622 1 c sys/src/cmd/ndb/dns.h - 664 sys sys 1183448016 11240
+1183449622 2 c sys/src/cmd/ndb/dnserver.c - 664 sys sys 1183447961 4402
+1183492823 0 c 386/bin/venti/checkarenas - 775 sys sys 1183492679 157174
+1183492823 1 c 386/bin/venti/syncindex - 775 sys sys 1183492679 168231
+1183492823 2 c 386/bin/venti/venti - 775 sys sys 1183492680 244924
+1183492823 3 c 386/bin/ndb/dns - 775 sys sys 1183492676 289937
+1183492823 4 c 386/bin/ndb/dnsdebug - 775 sys sys 1183492677 264870
+1183492823 5 c 386/bin/ndb/dnstcp - 775 sys sys 1183492678 263313

+ 2 - 1
sys/src/cmd/ndb/dn.c

@@ -223,11 +223,12 @@ dndump(char *file)
 	qunlock(&stats);
 
 	lock(&dnlock);
+	fprint(fd, "\n# domain names %lud target %lud\n", dnvars.names, target);
 	for(i = 0; i < HTLEN; i++)
 		for(dp = ht[i]; dp; dp = dp->next){
 			fprint(fd, "%s\n", dp->name);
 			for(rp = dp->rr; rp; rp = rp->next)
-				fprint(fd, "	%R %c%c %lud/%lud\n",
+				fprint(fd, "\t%R %c%c %lud/%lud\n",
 					rp, rp->auth? 'A': 'U',
 					rp->db? 'D': 'N', rp->expire, rp->ttl);
 		}

+ 1 - 1
sys/src/cmd/ndb/dns.h

@@ -377,7 +377,7 @@ typedef struct {
 	ulong	qrecvdudp;
 	ulong	qsent;
 	/* reply times by count */
-	ulong	under10ths[10*10+2];	/* under n*0.1 seconds, n is index */
+	ulong	under10ths[3*10+2];	/* under n*0.1 seconds, n is index */
 	ulong	tmout;
 	ulong	tmoutcname;
 	ulong	tmoutv6;

+ 1 - 1
sys/src/cmd/ndb/dnserver.c

@@ -77,7 +77,7 @@ dnserver(DNSmsg *reqp, DNSmsg *repp, Request *req, uchar *srcip, int rcode)
 		}
 
 	/*
-	 *  get the answer if we can
+	 *  get the answer if we can, in *repp
 	 */
 	if(reqp->flags & Frecurse)
 		neg = doextquery(repp, req, Recurse);

+ 4 - 4
sys/src/cmd/venti/syncarena.c

@@ -95,11 +95,11 @@ syncArena(Arena *arena, u32int n, int zok, int fix)
 		}else if(!broken && !clumpInfoEq(&ci, &cl.info)){
 			if(clumpInfoEq(&ci, &zci)){
 				cierr |= SyncCIZero;
-				if(!zok){
-					fprint(2, "unwritten clump info for clump=%d ", clump);
-					fprint(2, "score=%V type=%d\n",
+				if(!zok)
+					fprint(2, "%s: unwritten clump info "
+					    "for clump=%d score=%V type=%d\n",
+						arena->name, clump,
 						cl.info.score, cl.info.type);
-				}
 			}else{
 				cierr |= SyncCIErr;
 				fprint(2, "bad clump info for clump=%d\n", clump);