Browse Source

Plan 9 from Bell Labs 2007-08-11

David du Colombier 16 years ago
parent
commit
9c367980a6
7 changed files with 55 additions and 34 deletions
  1. 13 15
      dist/replica/_plan9.db
  2. 11 11
      dist/replica/plan9.db
  3. 11 0
      dist/replica/plan9.log
  4. 2 0
      sys/man/2/9pcmdbuf
  5. 1 1
      sys/man/3/sdaoe
  6. 15 5
      sys/src/9/port/devaoe.c
  7. 2 2
      sys/src/9/port/sdaoe.c

+ 13 - 15
dist/replica/_plan9.db

@@ -1,8 +1,8 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1181763625 313856
-386/9loaddebug - 775 sys sys 1186291382 417075
+386/9loaddebug - 775 sys sys 1186776564 435045
 386/9loadlite - 775 sys sys 1176519517 137148
-386/9loadlitedebug - 775 sys sys 1186291382 202587
+386/9loadlitedebug - 775 sys sys 1186776564 220555
 386/9pc - 775 sys sys 1186023393 1937795
 386/9pc.gz - 664 sys sys 1186023393 829787
 386/9pccpu - 775 sys sys 1186023409 1657423
@@ -342,10 +342,10 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1184529902 149014
 386/bin/ndb/csquery - 775 sys sys 1176488418 61652
-386/bin/ndb/dns - 775 sys sys 1186112229 293921
-386/bin/ndb/dnsdebug - 775 sys sys 1186112230 269375
+386/bin/ndb/dns - 775 sys sys 1186716659 294300
+386/bin/ndb/dnsdebug - 775 sys sys 1186716660 269466
 386/bin/ndb/dnsquery - 775 sys sys 1185334136 64350
-386/bin/ndb/dnstcp - 775 sys sys 1186112231 267228
+386/bin/ndb/dnstcp - 775 sys sys 1186716661 267315
 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
@@ -449,7 +449,7 @@
 386/bin/units - 775 sys sys 1168402357 75478
 386/bin/unlnfs - 775 sys sys 1168402357 71590
 386/bin/unmount - 775 sys sys 1148500700 36646
-386/bin/unzip - 775 sys sys 1168402357 90215
+386/bin/unzip - 775 sys sys 1186776392 91093
 386/bin/upas - 20000000775 sys sys 1016857390 0
 386/bin/upas/addhash - 775 sys sys 1178568309 70721
 386/bin/upas/aliasmail - 775 sys sys 1178568309 104105
@@ -509,7 +509,7 @@
 386/bin/venti/write - 775 sys sys 1176520521 102825
 386/bin/vncs - 775 sys sys 1179372111 471469
 386/bin/vncv - 775 sys sys 1179372113 518914
-386/bin/vt - 775 sys sys 1179372113 176626
+386/bin/vt - 775 sys sys 1186716661 176851
 386/bin/vtdump - 775 sys sys 1178568328 160252
 386/bin/wc - 775 sys sys 1148500701 41191
 386/bin/webcookies - 775 sys sys 1179372114 166178
@@ -7385,7 +7385,7 @@ sys/man/1/graph - 664 sys sys 1148227125 3061
 sys/man/1/grep - 664 sys sys 1139690020 2257
 sys/man/1/gs - 664 sys sys 1032054727 6906
 sys/man/1/gview - 664 sys sys 1136378273 4361
-sys/man/1/gzip - 664 sys sys 1157681393 3830
+sys/man/1/gzip - 664 sys sys 1186715466 3965
 sys/man/1/hget - 664 sys sys 1141313152 1482
 sys/man/1/history - 664 sys sys 1176744024 1706
 sys/man/1/hoc - 664 sys sys 1136378274 2357
@@ -7485,7 +7485,7 @@ sys/man/1/yesterday - 664 sys sys 1148760984 2640
 sys/man/2 - 20000000775 sys sys 1143130045 0
 sys/man/2/0intro - 664 sys sys 1115941566 11660
 sys/man/2/9p - 664 sys sys 1175867369 15852
-sys/man/2/9pcmdbuf - 664 sys sys 1165622380 2076
+sys/man/2/9pcmdbuf - 664 sys sys 1186721809 2162
 sys/man/2/9pfid - 664 sys sys 1106072437 3663
 sys/man/2/9pfile - 664 sys sys 1048637158 4408
 sys/man/2/INDEX - 664 sys sys 1183240469 20532
@@ -7660,7 +7660,7 @@ sys/man/3/proc - 664 sys sys 1138458595 12062
 sys/man/3/root - 664 sys sys 1046958450 632
 sys/man/3/rtc - 664 sys sys 954378857 667
 sys/man/3/sd - 664 sys sys 1176502187 5678
-sys/man/3/sdaoe - 664 sys sys 1186714215 1312
+sys/man/3/sdaoe - 664 sys sys 1186723542 1310
 sys/man/3/segment - 664 sys sys 1017423721 2378
 sys/man/3/srv - 664 sys sys 958419690 1470
 sys/man/3/ssl - 664 sys sys 1018386776 3413
@@ -8168,7 +8168,7 @@ sys/src/9/port/chan.c - 664 sys sys 1146151714 34773
 sys/src/9/port/cis.c - 664 sys sys 1099761153 9248
 sys/src/9/port/debugalloc.c - 664 sys sys 1014931171 10402
 sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
-sys/src/9/port/devaoe.c - 664 sys sys 1186714271 41116
+sys/src/9/port/devaoe.c - 664 sys sys 1186772629 41313
 sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
 sys/src/9/port/devbridge.c - 664 sys sys 1185994684 24171
 sys/src/9/port/devcap.c - 664 sys sys 1178886040 4141
@@ -8235,7 +8235,7 @@ sys/src/9/port/qlock.c - 664 sys sys 1178057654 3300
 sys/src/9/port/rdb.c - 664 sys sys 1184465938 1704
 sys/src/9/port/rebootcmd.c - 664 sys sys 1015278340 1561
 sys/src/9/port/sd.h - 664 sys sys 1186618553 2499
-sys/src/9/port/sdaoe.c - 664 sys sys 1186714271 9977
+sys/src/9/port/sdaoe.c - 664 sys sys 1186772635 9983
 sys/src/9/port/segment.c - 664 sys sys 1170456581 14052
 sys/src/9/port/semaphore.p - 664 sys sys 1143129797 2424
 sys/src/9/port/swap.c - 664 sys sys 1138028310 7019
@@ -12413,7 +12413,7 @@ sys/src/cmd/gzip/gunzip.c - 664 sys sys 1143759345 6037
 sys/src/cmd/gzip/gzip.c - 664 sys sys 1135487934 3655
 sys/src/cmd/gzip/gzip.h - 664 sys sys 954778718 1058
 sys/src/cmd/gzip/mkfile - 664 sys sys 1124884920 124
-sys/src/cmd/gzip/unzip.c - 664 sys sys 1143759338 13800
+sys/src/cmd/gzip/unzip.c - 664 sys sys 1186715467 14731
 sys/src/cmd/gzip/zip.c - 664 sys sys 1135487935 7063
 sys/src/cmd/gzip/zip.h - 664 sys sys 954778719 1428
 sys/src/cmd/hget.c - 664 sys sys 1161442159 25962
@@ -15852,5 +15852,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
-sys/man/1/gzip - 664 sys sys 1186715466 3965
-sys/src/cmd/gzip/unzip.c - 664 sys sys 1186715467 14731

+ 11 - 11
dist/replica/plan9.db

@@ -1,8 +1,8 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1181763625 313856
-386/9loaddebug - 775 sys sys 1186291382 417075
+386/9loaddebug - 775 sys sys 1186776564 435045
 386/9loadlite - 775 sys sys 1176519517 137148
-386/9loadlitedebug - 775 sys sys 1186291382 202587
+386/9loadlitedebug - 775 sys sys 1186776564 220555
 386/9pc - 775 sys sys 1186023393 1937795
 386/9pc.gz - 664 sys sys 1186023393 829787
 386/9pccpu - 775 sys sys 1186023409 1657423
@@ -342,10 +342,10 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1184529902 149014
 386/bin/ndb/csquery - 775 sys sys 1176488418 61652
-386/bin/ndb/dns - 775 sys sys 1186112229 293921
-386/bin/ndb/dnsdebug - 775 sys sys 1186112230 269375
+386/bin/ndb/dns - 775 sys sys 1186716659 294300
+386/bin/ndb/dnsdebug - 775 sys sys 1186716660 269466
 386/bin/ndb/dnsquery - 775 sys sys 1185334136 64350
-386/bin/ndb/dnstcp - 775 sys sys 1186112231 267228
+386/bin/ndb/dnstcp - 775 sys sys 1186716661 267315
 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
@@ -449,7 +449,7 @@
 386/bin/units - 775 sys sys 1168402357 75478
 386/bin/unlnfs - 775 sys sys 1168402357 71590
 386/bin/unmount - 775 sys sys 1148500700 36646
-386/bin/unzip - 775 sys sys 1168402357 90215
+386/bin/unzip - 775 sys sys 1186776392 91093
 386/bin/upas - 20000000775 sys sys 1016857390 0
 386/bin/upas/addhash - 775 sys sys 1178568309 70721
 386/bin/upas/aliasmail - 775 sys sys 1178568309 104105
@@ -509,7 +509,7 @@
 386/bin/venti/write - 775 sys sys 1176520521 102825
 386/bin/vncs - 775 sys sys 1179372111 471469
 386/bin/vncv - 775 sys sys 1179372113 518914
-386/bin/vt - 775 sys sys 1179372113 176626
+386/bin/vt - 775 sys sys 1186716661 176851
 386/bin/vtdump - 775 sys sys 1178568328 160252
 386/bin/wc - 775 sys sys 1148500701 41191
 386/bin/webcookies - 775 sys sys 1179372114 166178
@@ -7485,7 +7485,7 @@ sys/man/1/yesterday - 664 sys sys 1148760984 2640
 sys/man/2 - 20000000775 sys sys 1143130045 0
 sys/man/2/0intro - 664 sys sys 1115941566 11660
 sys/man/2/9p - 664 sys sys 1175867369 15852
-sys/man/2/9pcmdbuf - 664 sys sys 1165622380 2076
+sys/man/2/9pcmdbuf - 664 sys sys 1186721809 2162
 sys/man/2/9pfid - 664 sys sys 1106072437 3663
 sys/man/2/9pfile - 664 sys sys 1048637158 4408
 sys/man/2/INDEX - 664 sys sys 1183240469 20532
@@ -7660,7 +7660,7 @@ sys/man/3/proc - 664 sys sys 1138458595 12062
 sys/man/3/root - 664 sys sys 1046958450 632
 sys/man/3/rtc - 664 sys sys 954378857 667
 sys/man/3/sd - 664 sys sys 1176502187 5678
-sys/man/3/sdaoe - 664 sys sys 1186714215 1312
+sys/man/3/sdaoe - 664 sys sys 1186723542 1310
 sys/man/3/segment - 664 sys sys 1017423721 2378
 sys/man/3/srv - 664 sys sys 958419690 1470
 sys/man/3/ssl - 664 sys sys 1018386776 3413
@@ -8168,7 +8168,7 @@ sys/src/9/port/chan.c - 664 sys sys 1146151714 34773
 sys/src/9/port/cis.c - 664 sys sys 1099761153 9248
 sys/src/9/port/debugalloc.c - 664 sys sys 1014931171 10402
 sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
-sys/src/9/port/devaoe.c - 664 sys sys 1186714271 41116
+sys/src/9/port/devaoe.c - 664 sys sys 1186772629 41313
 sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
 sys/src/9/port/devbridge.c - 664 sys sys 1185994684 24171
 sys/src/9/port/devcap.c - 664 sys sys 1178886040 4141
@@ -8235,7 +8235,7 @@ sys/src/9/port/qlock.c - 664 sys sys 1178057654 3300
 sys/src/9/port/rdb.c - 664 sys sys 1184465938 1704
 sys/src/9/port/rebootcmd.c - 664 sys sys 1015278340 1561
 sys/src/9/port/sd.h - 664 sys sys 1186618553 2499
-sys/src/9/port/sdaoe.c - 664 sys sys 1186714271 9977
+sys/src/9/port/sdaoe.c - 664 sys sys 1186772635 9983
 sys/src/9/port/segment.c - 664 sys sys 1170456581 14052
 sys/src/9/port/semaphore.p - 664 sys sys 1143129797 2424
 sys/src/9/port/swap.c - 664 sys sys 1138028310 7019

+ 11 - 0
dist/replica/plan9.log

@@ -49928,3 +49928,14 @@
 1186714805 4 a sys/src/9/port/sdaoe.c - 664 sys sys 1186714271 9977
 1186716604 0 c sys/man/1/gzip - 664 sys sys 1186715466 3965
 1186716604 1 c sys/src/cmd/gzip/unzip.c - 664 sys sys 1186715467 14731
+1186718403 0 c 386/bin/ndb/dns - 775 sys sys 1186716659 294300
+1186718403 1 c 386/bin/ndb/dnsdebug - 775 sys sys 1186716660 269466
+1186718403 2 c 386/bin/ndb/dnstcp - 775 sys sys 1186716661 267315
+1186718403 3 c 386/bin/vt - 775 sys sys 1186716661 176851
+1186722004 0 c sys/man/2/9pcmdbuf - 664 sys sys 1186721809 2162
+1186723804 0 c sys/man/3/sdaoe - 664 sys sys 1186723542 1310
+1186774205 0 c sys/src/9/port/devaoe.c - 664 sys sys 1186772629 41313
+1186774205 1 c sys/src/9/port/sdaoe.c - 664 sys sys 1186772635 9983
+1186777805 0 c 386/9loaddebug - 775 sys sys 1186776564 435045
+1186777805 1 c 386/9loadlitedebug - 775 sys sys 1186776564 220555
+1186777805 2 c 386/bin/unzip - 775 sys sys 1186776392 91093

+ 2 - 0
sys/man/2/9pcmdbuf

@@ -48,6 +48,8 @@ using
 It returns a
 .B Cmdbuf
 structure holding pointers to each field in the message.
+It is the caller's responsibility to
+free this structure when it is no longer needed.
 .PP
 .I Lookupcmd
 walks through the array

+ 1 - 1
sys/man/3/sdaoe

@@ -47,7 +47,7 @@ as
 as root over Ethernet interfaces 0 and 1,
 .IP
 .EX
-etherif=ether0 ether1
+aoeif=ether0 ether1
 aoedev=e!#æ/aoe/42.0
 .EE
 .SH SOURCE

+ 15 - 5
sys/src/9/port/devaoe.c

@@ -861,6 +861,7 @@ aoegen(Chan *c, char *, Dirtab *, int, int s, Dir *dp)
 	case Qctl:
 	case Qdata:
 	case Qconfig:
+	case Qident:
 		return unitgen(c, TYPE(c->qid), dp);
 	case Qdevlinkdir:
 		i = UNIT(c->qid);
@@ -1687,7 +1688,7 @@ getdev(long major, long minor, int n)
 	for(d = devs.d; d; d = d->next)
 		if(d->major == major && d->minor == minor)
 			break;
-	if (d) {
+	if (d == nil) {
 		d = newdev(major, minor, n);
 		d->next = devs.d;
 		devs.d = d;
@@ -1759,8 +1760,8 @@ getmtu(Chan *m)
 	int n, mtu;
 	char buf[36];
 
-	mtu = 8192;
-	if(waserror())
+	mtu = 1514;
+	if(m == nil || waserror())
 		return mtu;
 	n = devtab[m->type]->read(m, buf, sizeof buf - 1, 0);
 	if(n > 12){
@@ -2099,8 +2100,10 @@ netrdaoe(void *v)
 	if(autodiscover)
 		discover(0xffff, 0xff);
 	for (;;) {
-		if((nl->flag&Dup) == 0)
+		if((nl->flag & Dup) == 0)
 			ERROR("netlink is down");
+		if (nl->dc == nil)
+			panic("netrdaoe: nl->dc == nil");
 		b = devtab[nl->dc->type]->bread(nl->dc, 1<<16, 0);
 		if(b == nil)
 			ERROR("nil read from network");
@@ -2139,6 +2142,8 @@ getaddr(char *path, uchar *ea)
 		cclose(c);
 		nexterror();
 	}
+	if (c == nil)
+		panic("æ: getaddr: c == nil");
 	n = devtab[c->type]->read(c, buf, sizeof buf-1, 0);
 	poperror();
 	cclose(c);
@@ -2158,7 +2163,12 @@ netbind(char *path)
 	snprint(addr, sizeof addr, "%s!0x%x", path, Aoetype);
 	dc = chandial(addr, nil, nil, &cc);
 	snprint(addr, sizeof addr, "%s/mtu", path);
-	mtu = namec(addr, Aopen, OREAD, 0);
+	if(waserror())
+		mtu = nil;
+	else {
+		mtu = namec(addr, Aopen, OREAD, 0);
+		poperror();
+	}
 
 	if(waserror()){
 		cclose(dc);

+ 2 - 2
sys/src/9/port/sdaoe.c

@@ -379,7 +379,7 @@ pnpprobe(SDev *sd)
 
 	for(j = 0;; j += 200){
 		if(j > 8000){
-			print("pnpprobe: %s: %s\n", probef[i-1], up->errstr);
+			print("#æ: pnpprobe: %s: %s\n", probef[i-1], up->errstr);
 			return 0;
 		}
 		if(waserror()){
@@ -390,7 +390,7 @@ pnpprobe(SDev *sd)
 		poperror();
 		break;
 	}
-	print("æ: pnpprobe establishes %sin %dms\n", probef[i-1], j);
+	print("#æ: pnpprobe establishes %sin %dms\n", probef[i-1], j);
 	return sd->ctlr;
 }