Browse Source

Plan 9 from Bell Labs 2008-04-06

David du Colombier 12 years ago
parent
commit
db5900b75c

+ 4 - 5
dist/replica/_plan9.db

@@ -192,7 +192,7 @@
 386/bin/con - 775 sys sys 1203482824 78416
 386/bin/cp - 775 sys sys 1168402297 63454
 386/bin/cpp - 775 sys sys 1196742451 149149
-386/bin/cpu - 775 sys sys 1196742454 139159
+386/bin/cpu - 775 sys sys 1207366109 139143
 386/bin/crop - 775 sys sys 1168402298 116374
 386/bin/cwfs - 775 sys sys 1203713012 365874
 386/bin/date - 775 sys sys 1178568265 41845
@@ -5851,7 +5851,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1206647893 268958
+sys/games/lib/fortunes - 664 sys sys 1207370998 268981
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -8190,7 +8190,7 @@ sys/src/9/pc/sdmv50xx.c - 664 sys sys 1204232564 34031
 sys/src/9/pc/sdmylex.c - 664 sys sys 1189229947 28395
 sys/src/9/pc/sdscsi.c - 664 sys sys 1186618532 7957
 sys/src/9/pc/trap.c - 664 sys sys 1197062171 21897
-sys/src/9/pc/uartaxp.c - 664 sys sys 1166247784 18879
+sys/src/9/pc/uartaxp.c - 664 sys sys 1207419955 18931
 sys/src/9/pc/uartaxp.i - 664 sys sys 1155243528 111326
 sys/src/9/pc/uarti8250.c - 664 sys sys 1177676872 13957
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
@@ -12489,7 +12489,7 @@ sys/src/cmd/ip/dhcpclient.c - 664 sys sys 1178482836 11969
 sys/src/cmd/ip/dhcpd - 20000000775 sys sys 1063897571 0
 sys/src/cmd/ip/dhcpd/dat.h - 664 sys sys 1084471353 2522
 sys/src/cmd/ip/dhcpd/db.c - 664 sys sys 1143670612 7466
-sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1204179700 35269
+sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1207419933 35276
 sys/src/cmd/ip/dhcpd/dhcpleases.c - 664 sys sys 1204179691 796
 sys/src/cmd/ip/dhcpd/mkfile - 664 sys sys 1169162185 443
 sys/src/cmd/ip/dhcpd/ndb.c - 664 sys sys 1185920230 5799
@@ -15883,4 +15883,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/cpu - 775 sys sys 1207366109 139143

+ 3 - 3
dist/replica/plan9.db

@@ -5851,7 +5851,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1206647893 268958
+sys/games/lib/fortunes - 664 sys sys 1207370998 268981
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -8190,7 +8190,7 @@ sys/src/9/pc/sdmv50xx.c - 664 sys sys 1204232564 34031
 sys/src/9/pc/sdmylex.c - 664 sys sys 1189229947 28395
 sys/src/9/pc/sdscsi.c - 664 sys sys 1186618532 7957
 sys/src/9/pc/trap.c - 664 sys sys 1197062171 21897
-sys/src/9/pc/uartaxp.c - 664 sys sys 1166247784 18879
+sys/src/9/pc/uartaxp.c - 664 sys sys 1207419955 18931
 sys/src/9/pc/uartaxp.i - 664 sys sys 1155243528 111326
 sys/src/9/pc/uarti8250.c - 664 sys sys 1177676872 13957
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
@@ -12489,7 +12489,7 @@ sys/src/cmd/ip/dhcpclient.c - 664 sys sys 1178482836 11969
 sys/src/cmd/ip/dhcpd - 20000000775 sys sys 1063897571 0
 sys/src/cmd/ip/dhcpd/dat.h - 664 sys sys 1084471353 2522
 sys/src/cmd/ip/dhcpd/db.c - 664 sys sys 1143670612 7466
-sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1204179700 35269
+sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1207419933 35276
 sys/src/cmd/ip/dhcpd/dhcpleases.c - 664 sys sys 1204179691 796
 sys/src/cmd/ip/dhcpd/mkfile - 664 sys sys 1169162185 443
 sys/src/cmd/ip/dhcpd/ndb.c - 664 sys sys 1185920230 5799

+ 3 - 0
dist/replica/plan9.log

@@ -18965,3 +18965,6 @@
 1207348204 2 a rc/bin/dontkill - 775 sys sys 1207346989 293
 1207350004 0 c rc/bin/termrc - 775 sys sys 1207348859 2548
 1207366204 0 c 386/bin/cpu - 775 sys sys 1207366109 139143
+1207371605 0 c sys/games/lib/fortunes - 664 sys sys 1207370998 268981
+1207420204 0 c sys/src/9/pc/uartaxp.c - 664 sys sys 1207419955 18931
+1207420204 1 c sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1207419933 35276

+ 1 - 0
sys/games/lib/fortunes

@@ -4218,3 +4218,4 @@ Nothing is more hateful to wisdom than excessive cleverness - Seneca (according
 Perfection is achieved, not when there is nothing more to add, but when there is nothing left to take away. - Antoine de Saint-Exupery
   bucket = Buckets + pe; /* bucket = &(Buckets[pe]); */
 Those who can do, those who can't write and those who can't write make ezines. - Sape
+Command (m for help): 

+ 3 - 2
sys/src/9/pc/uartaxp.c

@@ -607,8 +607,9 @@ axpinterrupt(Ureg*, void* arg)
 	if(ics & 0x0810C000)
 		print("%s: unexpected interrupt %#ux\n", ctlr->name, ics);
 	if(!(ics & 0x00002000)) {
-		print("%s: non-doorbell interrupt\n", ctlr->name);
-		// ctlr->gcb->gcw2 = 0x0001;	/* set Gintack */
+		/* we get a steady stream of these on consoles */
+		// print("%s: non-doorbell interrupt\n", ctlr->name);
+		ctlr->gcb->gcw2 = 0x0001;	/* set Gintack */
 		return;
 	}
 

+ 4 - 4
sys/src/cmd/ip/dhcpd/dhcpd.c

@@ -64,7 +64,7 @@ int	mute, mutestat;
 int	minlease = MinLease;
 int	staticlease = StaticLease;
 
-ulong	start;
+uvlong	start;
 
 static int v6opts;
 
@@ -199,10 +199,10 @@ void	warning(int, char*, ...);
 void
 timestamp(char *tag)
 {
-	ulong t;
+	uvlong t;
 
 	t = nsec()/1000;
-	syslog(0, blog, "%s %lud", tag, t - start);
+	syslog(0, blog, "%s %lludµs", tag, t - start);
 }
 
 void
@@ -401,7 +401,7 @@ proto(Req *rp, int n)
 		dhcp(rp);
 	else
 		bootp(rp);
-timestamp("done");
+	timestamp("done");
 }
 
 static void